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

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

net/netfilter/nft_set_rbtree.c
  598adea720b97 ("netfilter: revert nft_set_rbtree: validate open interval overlap")
  3aea466a43998 ("netfilter: nft_set_rbtree: don't disable bh when acquiring tree lock")
https://lore.kernel.org/abgaQBpeGstdN4oq@sirena.org.uk

No adjacent changes.

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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.h
Simple merge

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

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

diff --cc drivers/net/wireless/virtual/mac80211_hwsim.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

diff --cc net/mpls/af_mpls.c
Simple merge

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

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

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

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

diff --cc net/netfilter/nft_set_rbtree.c
index e429053766545b2d84159ca981250d4c46ce72e1,fe8bd497d74a796e353f6e3fcb4f2fcad66d21de..b7501b2b873e991835abe794d07d81c6956ca1cd
--- 1/net/netfilter/nft_set_rbtree.c
--- 2/net/netfilter/nft_set_rbtree.c
+++ b/net/netfilter/nft_set_rbtree.c
@@@ -684,13 -639,9 +639,9 @@@ static int nft_rbtree_insert(const stru
  
                cond_resched();
  
 -              write_lock_bh(&priv->lock);
 +              write_lock(&priv->lock);
-               err = __nft_rbtree_insert(net, set, rbe, elem_priv, tstamp, last);
+               err = __nft_rbtree_insert(net, set, rbe, elem_priv, tstamp);
 -              write_unlock_bh(&priv->lock);
 +              write_unlock(&priv->lock);
- 
-               if (nft_rbtree_interval_end(rbe))
-                       priv->start_rbe_cookie = 0;
- 
        } while (err == -EAGAIN);
  
        return err;

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

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

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

diff --cc net/wireless/pmsr.c
Simple merge