Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/usb/asix_common.c
	drivers/net/usb/sr9800.c
	drivers/net/usb/usbnet.c
	include/linux/usb/usbnet.h
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

The TCP conflicts were overlapping changes.  In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.

With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 23 insertions, 16 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c2016557b294..0f0e582e98f7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1186,7 +1186,7 @@ M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-mvebu/
-F:      drivers/rtc/armada38x-rtc
+F:      drivers/rtc/rtc-armada38x.c
 
 ARM/Marvell Berlin SoC support
 M:      Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@ -1362,6 +1362,7 @@ F:	drivers/i2c/busses/i2c-rk3x.c
 F:      drivers/*/*rockchip*
 F:      drivers/*/*/*rockchip*
 F:      sound/soc/rockchip/
+N:      rockchip
 
 ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
 M:      Kukjin Kim <kgene@kernel.org>
@@ -1675,8 +1676,8 @@ F:	drivers/misc/eeprom/at24.c
 F:      include/linux/platform_data/at24.h
 
 ATA OVER ETHERNET (AOE) DRIVER
-M:      "Ed L. Cashin" <ecashin@coraid.com>
-W:      http://support.coraid.com/support/linux
+M:      "Ed L. Cashin" <ed.cashin@acm.org>
+W:      http://www.openaoe.org/
 S:      Supported
 F:      Documentation/aoe/
 F:      drivers/block/aoe/
@@ -3252,6 +3253,13 @@ S:	Maintained
 F:      Documentation/hwmon/dme1737
 F:      drivers/hwmon/dme1737.c
 
+DMI/SMBIOS SUPPORT
+M:      Jean Delvare <jdelvare@suse.de>
+S:      Maintained
+F:      drivers/firmware/dmi-id.c
+F:      drivers/firmware/dmi_scan.c
+F:      include/linux/dmi.h
+
 DOCKING STATION DRIVER
 M:      Shaohua Li <shaohua.li@intel.com>
 L:      linux-acpi@vger.kernel.org
@@ -5128,22 +5136,21 @@ M:	Deepak Saxena <dsaxena@plexity.net>
 S:      Maintained
 F:      drivers/char/hw_random/ixp4xx-rng.c
 
-INTEL ETHERNET DRIVERS (e100/e1000/e1000e/fm10k/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
+INTEL ETHERNET DRIVERS
 M:      Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-M:      Jesse Brandeburg <jesse.brandeburg@intel.com>
-M:      Bruce Allan <bruce.w.allan@intel.com>
-M:      Carolyn Wyborny <carolyn.wyborny@intel.com>
-M:      Don Skidmore <donald.c.skidmore@intel.com>
-M:      Greg Rose <gregory.v.rose@intel.com>
-M:      Matthew Vick <matthew.vick@intel.com>
-M:      John Ronciak <john.ronciak@intel.com>
-M:      Mitch Williams <mitch.a.williams@intel.com>
-M:      Linux NICS <linux.nics@intel.com>
-L:      e1000-devel@lists.sourceforge.net
+R:      Jesse Brandeburg <jesse.brandeburg@intel.com>
+R:      Shannon Nelson <shannon.nelson@intel.com>
+R:      Carolyn Wyborny <carolyn.wyborny@intel.com>
+R:      Don Skidmore <donald.c.skidmore@intel.com>
+R:      Matthew Vick <matthew.vick@intel.com>
+R:      John Ronciak <john.ronciak@intel.com>
+R:      Mitch Williams <mitch.a.williams@intel.com>
+L:      intel-wired-lan@lists.osuosl.org
 W:      http://www.intel.com/support/feedback.htm
 W:      http://e1000.sourceforge.net/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
+Q:      http://patchwork.ozlabs.org/project/intel-wired-lan/list/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
 S:      Supported
 F:      Documentation/networking/e100.txt
 F:      Documentation/networking/e1000.txt