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

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

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc drivers/net/can/usb/Kconfig
Simple merge

diff --cc drivers/net/can/usb/peak_usb/pcan_usb_fd.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge

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

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

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

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

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

diff --cc drivers/net/ethernet/qlogic/qed/qed_dcbx.c
Simple merge

diff --cc drivers/net/hyperv/hyperv_net.h
Simple merge

diff --cc drivers/net/hyperv/netvsc.c
Simple merge

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

diff --cc drivers/net/phy/micrel.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc net/packet/af_packet.c
Simple merge

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