From: Jakub Kicinski Date: Thu, 12 Mar 2026 19:53:34 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edab1ca5ec6fffecbf340e26956ce73e502901d5;p=thirdparty%2Fkernel%2Flinux.git 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 --- edab1ca5ec6fffecbf340e26956ce73e502901d5 diff --cc net/netfilter/nft_set_rbtree.c index e429053766545,fe8bd497d74a7..b7501b2b873e9 --- a/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;