]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 12 Mar 2026 19:53:34 +0000 (12:53 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 19 Mar 2026 21:16:00 +0000 (14:16 -0700)
commitedab1ca5ec6fffecbf340e26956ce73e502901d5
treed1cec843415f5b36a31d50e4f164d0d9a2a2fadb
parent9ac76f3d0bb2940db3a9684d596b9c8f301ef315
parenta1d9d8e833781c44ab688708804ce35f20f3cbbd
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>
29 files changed:
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/ethernet/airoha/airoha_eth.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/broadcom/bnxt/bnxt.h
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/microsoft/mana/hw_channel.c
drivers/net/wireless/virtual/mac80211_hwsim.c
include/net/mac80211.h
include/net/netfilter/nf_tables.h
include/net/sch_generic.h
net/ipv4/icmp.c
net/mac80211/cfg.c
net/mac80211/chan.c
net/mac80211/debugfs.c
net/mac80211/mesh.c
net/mac80211/sta_info.c
net/mac80211/tdls.c
net/mac80211/tx.c
net/mpls/af_mpls.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_tables_api.c
net/netfilter/nft_ct.c
net/netfilter/nft_dynset.c
net/netfilter/nft_set_rbtree.c
net/netfilter/xt_time.c
net/sched/sch_generic.c
net/unix/af_unix.c
net/wireless/pmsr.c