]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 01:46:12 +0000 (11:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 01:46:12 +0000 (11:46 +1000)
commit00efd15603d0d578fa6a2fe95779357014e3745a
tree31bc31e5a78e8375ace59049484d8efabf03aaa5
parentef758954ac5d0d82b6eb3ab16b0e65797fcb6a1a
parent270d47dc1fc4756a0158778084a236bc83c156d2
Merge remote-tracking branch 'net-next/master'

# Conflicts:
# drivers/net/virtio_net.c
# net/core/devlink.c
14 files changed:
MAINTAINERS
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c
drivers/net/ethernet/neterion/vxge/vxge-config.c
drivers/net/ethernet/smsc/smc91x.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/virtio_net.c
include/net/netfilter/nf_tables.h
net/9p/trans_virtio.c
net/core/devlink.c
net/core/netpoll.c
net/mptcp/subflow.c
net/netfilter/nfnetlink_cthelper.c
net/packet/af_packet.c