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

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

No conflicts.

Adjacent changes:

net/netfilter/nft_set_rbtree.c
  fb7fb4016300 ("netfilter: nf_tables: clone set on flush only")
  3aea466a4399 ("netfilter: nft_set_rbtree: don't disable bh when acquiring tree lock")

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

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-common.h
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe.h
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

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

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac.h
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/ti/icssg/icssg_prueth.c
Simple merge

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

diff --cc drivers/net/wireless/ath/ath12k/mac.c
Simple merge

diff --cc drivers/net/wireless/ath/ath12k/wmi.c
Simple merge

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

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

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

diff --cc include/net/netfilter/nf_tables.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc net/unix/af_unix.c
Simple merge

diff --cc tools/testing/selftests/net/Makefile
Simple merge

diff --cc tools/testing/selftests/tc-testing/tdc_helper.py
Simple merge