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

Conflicts were simple overlapping changes in microchip
driver.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/phy/microchip.c
index ef5e160,a97ac8c..2d67937
--- 1/drivers/net/phy/microchip.c
--- 2/drivers/net/phy/microchip.c
+++ b/drivers/net/phy/microchip.c
@@@ -20,8 -20,7 +20,9 @@@
  #include <linux/ethtool.h>
  #include <linux/phy.h>
  #include <linux/microchipphy.h>
+ #include <linux/delay.h>
 +#include <linux/of.h>
 +#include <dt-bindings/net/microchip-lan78xx.h>
  
  #define DRIVER_AUTHOR "WOOJUNG HUH <woojung.huh@microchip.com>"
  #define DRIVER_DESC   "Microchip LAN88XX PHY driver"

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

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

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

diff --cc include/linux/microchipphy.h
index 8e4015e,8f9c903..8c40128
--- 1/include/linux/microchipphy.h
--- 2/include/linux/microchipphy.h
+++ b/include/linux/microchipphy.h
@@@ -70,7 -70,12 +70,15 @@@
  #define       LAN88XX_MMD3_CHIP_ID                    (32877)
  #define       LAN88XX_MMD3_CHIP_REV                   (32878)
  
 +/* Registers specific to the LAN7800/LAN7850 embedded phy */
 +#define LAN78XX_PHY_LED_MODE_SELECT           (0x1D)
 +
+ /* DSP registers */
+ #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG                (0x806A)
+ #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG_ZD_DLY_EN_     (0x2000)
+ #define LAN88XX_EXT_PAGE_ACCESS_TR            (0x52B5)
+ #define LAN88XX_EXT_PAGE_TR_CR                        16
+ #define LAN88XX_EXT_PAGE_TR_LOW_DATA          17
+ #define LAN88XX_EXT_PAGE_TR_HIGH_DATA         18
+ 
  #endif /* _MICROCHIPPHY_H */

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

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

diff --cc net/tipc/node.c
Simple merge

diff --cc tools/testing/selftests/net/Makefile
index 23e725f,8f1e13d..c3761c3
--- 1/tools/testing/selftests/net/Makefile
--- 2/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -5,10 -5,9 +5,10 @@@ CFLAGS =  -Wall -Wl,--no-as-needed -O2 
  CFLAGS += -I../../../../usr/include/
  
  TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh rtnetlink.sh
- TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh
+ TEST_PROGS += fib_tests.sh fib-onlink-tests.sh in_netns.sh pmtu.sh
  TEST_GEN_FILES =  socket
  TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy
 +TEST_GEN_FILES += tcp_mmap
  TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa
  TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict