Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Wed, 5 Jan 2022 22:36:10 +0000 (14:36 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 5 Jan 2022 22:36:10 +0000 (14:36 -0800)
commitb9adba350a841e8233d3e4d8d3c8dede3fc88c46
tree2fbaa3fb25cf76d44a510e0c4f96c02622e268f9
parent4e4f325a0a55907b14f579e6b1a38c53755e3de2
parent75acfdb6fd922598a408a0d864486aeb167c1a97
Merge git://git./linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
13 files changed:
MAINTAINERS
drivers/net/ethernet/amazon/ena/ena_netdev.c
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/usb/r8152.c
include/net/sctp/sctp.h
net/ipv4/fib_semantics.c
net/ipv6/route.c
net/ipv6/seg6_local.c
net/ipv6/udp.c
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/sctp/socket.c
net/xdp/xsk.c