OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 2 Dec 2021 19:44:56 +0000 (11:44 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 2 Dec 2021 19:44:56 +0000 (11:44 -0800)
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
26 files changed:
1  2 
MAINTAINERS
drivers/net/dsa/rtl8365mb.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/health.c
drivers/net/ethernet/natsemi/xtsonic.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/usb/lan78xx.c
drivers/net/virtio_net.c
drivers/net/wireguard/queueing.h
include/linux/netdevice.h
include/linux/siphash.h
include/net/sock.h
net/core/dev.c
net/ipv6/ip6_offload.c
net/mctp/route.c
net/mpls/af_mpls.c
net/mpls/internal.h
net/netlink/af_netlink.c
net/tls/tls_sw.c
tools/testing/selftests/net/fcnal-test.sh

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