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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.

1 files changed, 136 insertions, 0 deletions

diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
new file mode 100644
index 000000000000..5a689af516e9
--- /dev/null
+++ b/drivers/net/ethernet/smsc/Kconfig
@@ -0,0 +1,136 @@
+#
+# Western Digital/SMC network device configuration
+#
+
+config NET_VENDOR_SMSC
+        bool "SMC (SMSC)/Western Digital devices"
+        default y
+        depends on ARM || ISA || MAC || ARM || MIPS || M32R || SUPERH || \
+                BLACKFIN || MN10300 || COLDFIRE || PCI || PCMCIA
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about SMC/Western Digital cards. If you say Y, you will
+          be asked for your specific card in the following questions.
+
+if NET_VENDOR_SMSC
+
+config SMC9194
+        tristate "SMC 9194 support"
+        depends on (ISA || MAC && BROKEN)
+        select CRC32
+        ---help---
+          This is support for the SMC9xxx based Ethernet cards. Choose this
+          option if you have a DELL laptop with the docking station, or
+          another SMC9192/9194 based chipset.  Say Y if you want it compiled
+          into the kernel, and read the file
+          <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
+          available from <http://www.tldp.org/docs.html#howto>.
+
+          To compile this driver as a module, choose M here. The module
+          will be called smc9194.
+
+config SMC91X
+        tristate "SMC 91C9x/91C1xxx support"
+        select CRC32
+        select NET_CORE
+        select MII
+        depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \
+                    MN10300 || COLDFIRE)
+        ---help---
+          This is a driver for SMC's 91x series of Ethernet chipsets,
+          including the SMC91C94 and the SMC91C111. Say Y if you want it
+          compiled into the kernel, and read the file
+          <file:Documentation/networking/smc9.txt>  and the Ethernet-HOWTO,
+          available from  <http://www.tldp.org/docs.html#howto>.
+
+          This driver is also available as a module ( = code which can be
+          inserted in and removed from the running kernel whenever you want).
+          The module will be called smc91x.  If you want to compile it as a
+          module, say M here and read <file:Documentation/kbuild/modules.txt>.
+
+config PCMCIA_SMC91C92
+        tristate "SMC 91Cxx PCMCIA support"
+        depends on PCMCIA
+        select CRC32
+        select NET_CORE
+        select MII
+        ---help---
+          Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA
+          (PC-card) Ethernet or Fast Ethernet card to your computer.
+
+          To compile this driver as a module, choose M here: the module will be
+          called smc91c92_cs.  If unsure, say N.
+
+config EPIC100
+        tristate "SMC EtherPower II"
+        depends on PCI
+        select CRC32
+        select NET_CORE
+        select MII
+        ---help---
+          This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
+          which is based on the SMC83c17x (EPIC/100).
+          More specific information and updates are available from
+          <http://www.scyld.com/network/epic100.html>.
+
+config SMC911X
+        tristate "SMSC LAN911[5678] support"
+        select CRC32
+        select NET_CORE
+        select MII
+        depends on (ARM || SUPERH || MN10300)
+        ---help---
+          This is a driver for SMSC's LAN911x series of Ethernet chipsets
+          including the new LAN9115, LAN9116, LAN9117, and LAN9118.
+          Say Y if you want it compiled into the kernel,
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+
+          This driver is also available as a module. The module will be
+          called smc911x.  If you want to compile it as a module, say M
+          here and read <file:Documentation/kbuild/modules.txt>
+
+config SMSC911X
+        tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
+        depends on (ARM || SUPERH || BLACKFIN || MIPS || MN10300)
+        select CRC32
+        select NET_CORE
+        select MII
+        select PHYLIB
+        ---help---
+          Say Y here if you want support for SMSC LAN911x and LAN921x families
+          of ethernet controllers.
+
+          To compile this driver as a module, choose M here. The module
+          will be called smsc911x.
+
+config SMSC911X_ARCH_HOOKS
+        def_bool n
+        depends on SMSC911X
+        ---help---
+          If the arch enables this, it allows the arch to implement various
+          hooks for more comprehensive interrupt control and also to override
+          the source of the MAC address.
+
+config SMSC9420
+        tristate "SMSC LAN9420 PCI ethernet adapter support"
+        depends on PCI
+        select CRC32
+        select PHYLIB
+        select SMSC_PHY
+        ---help---
+          This is a driver for SMSC's LAN9420 PCI ethernet adapter.
+          Say Y if you want it compiled into the kernel,
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+
+          This driver is also available as a module. The module will be
+          called smsc9420.  If you want to compile it as a module, say M
+          here and read <file:Documentation/kbuild/modules.txt>
+
+endif # NET_VENDOR_SMSC