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

Conflicts:
	drivers/net/ethernet/cavium/Kconfig

The cavium conflict was overlapping dependency
changes.

Signed-off-by: David S. Miller <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/cavium/Kconfig
index 3584420878782aa72800072e28997d40280dccec,02e23e6f142487ddc8cc2a8d4e2c512cb7e6db62..9b35d142f47accfbaec039f0d8100fb45d68bbf8
--- 1/drivers/net/ethernet/cavium/Kconfig
--- 2/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@@ -36,9 -34,6 +34,8 @@@ config THUNDER_NIC_V
  config        THUNDER_NIC_BGX
        tristate "Thunder MAC interface driver (BGX)"
        depends on 64BIT
-       default ARCH_THUNDER
 +      select PHYLIB
 +      select MDIO_OCTEON
        ---help---
          This driver supports programming and controlling of MAC
          interface from NIC physical function driver.

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_cmds.h
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/rocker/rocker.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
Simple merge

diff --cc drivers/net/ethernet/ti/netcp_core.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc net/bluetooth/mgmt.c
Simple merge

diff --cc net/bridge/br_netlink.c
Simple merge

diff --cc net/core/pktgen.c
Simple merge

diff --cc net/dsa/slave.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/openvswitch/actions.c
Simple merge

diff --cc net/sched/act_mirred.c
Simple merge