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

Cross-merge networking fixes after downstream PR (net-7.0-rc6).

No conflicts, or adjacent changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/airoha/airoha_ppe.c
Simple merge

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

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

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
Simple merge

diff --cc drivers/net/team/team_core.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/tls/tls_sw.c
Simple merge

diff --cc tools/testing/selftests/net/fib_tests.sh
Simple merge