Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 13 Mar 2020 04:29:30 +0000 (21:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Mar 2020 05:34:48 +0000 (22:34 -0700)
commit1d343579312311aa9875b34d5a921f5e2ec69f0a
tree64b636b5557d92f5266187f035dac34862db86d5
parenta8eceea84a3a3504e42f6495cf462027c5d19cb0
parent0d81a3f29c0afb18ba2b1275dcccf21e0dd4da38
Merge git://git./linux/kernel/git/netdev/net

Minor overlapping changes, nothing serious.

Signed-off-by: David S. Miller <davem@davemloft.net>
46 files changed:
MAINTAINERS
drivers/base/core.c
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/dsa/sja1105/sja1105_main.c
drivers/net/ethernet/broadcom/bcmsysport.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
drivers/net/ethernet/mscc/ocelot.c
drivers/net/ethernet/pensando/ionic/ionic_lif.c
drivers/net/ethernet/sfc/efx.h
drivers/net/ethernet/sfc/efx_channels.c
drivers/net/ethernet/sfc/net_driver.h
drivers/net/ethernet/sfc/tx.c
drivers/net/phy/phy_device.c
drivers/net/phy/phylink.c
drivers/net/usb/r8152.c
drivers/net/wireless/mediatek/mt76/dma.c
drivers/s390/net/qeth_core.h
drivers/s390/net/qeth_core_main.c
drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c
include/linux/device.h
include/linux/inet_diag.h
include/linux/phy.h
net/core/devlink.c
net/core/sock.c
net/dsa/port.c
net/dsa/slave.c
net/ipv4/inet_connection_sock.c
net/ipv4/inet_diag.c
net/ipv4/raw_diag.c
net/ipv4/udp_diag.c
net/ipv6/addrconf.c
net/ipv6/seg6_iptunnel.c
net/mptcp/options.c
net/netlink/af_netlink.c
net/sctp/diag.c
net/smc/smc_ib.c
net/wireless/nl80211.c
tools/testing/selftests/tc-testing/config