]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Feb 2020 02:31:39 +0000 (18:31 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Feb 2020 02:31:39 +0000 (18:31 -0800)
commit85391364eedb20544fabcad2f15b83b18772bdb7
treea7dc22fa7481300c92c0a33b54a32cb9ee551b5f
parent3879d063bb4ddf19f1c93bc78952faeaa7a4b387
parent0c01a09f19e37907cb8a7d964081a8d2ebe8b0bd
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

The mptcp conflict was overlapping additions.

The SMC conflict was an additional and removal happening at the same
time.

Signed-off-by: David S. Miller <davem@davemloft.net>
23 files changed:
drivers/net/dsa/bcm_sf2.c
drivers/net/ethernet/broadcom/genet/bcmmii.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlxsw/pci_hw.h
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/phy/mscc.c
drivers/net/phy/phy-c45.c
drivers/net/phy/phy_device.c
drivers/s390/net/qeth_core_main.c
net/core/dev.c
net/core/devlink.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/mptcp/protocol.c
net/smc/smc_core.c
net/smc/smc_core.h
net/smc/smc_ib.c
net/unix/af_unix.c
net/vmw_vsock/virtio_transport_common.c
net/wireless/nl80211.c
net/wireless/reg.c