Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/usb/r8152.c
Simple merge

diff --cc include/net/sctp/sctp.h
Simple merge

diff --cc net/ipv4/fib_semantics.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/seg6_local.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/xdp/xsk.c
Simple merge