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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/microchip/lan966x/lan966x_main.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

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

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/sched/cls_api.c
Simple merge

diff --cc net/sched/cls_flower.c
Simple merge

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

diff --cc net/sunrpc/svcsock.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
Simple merge