mirror of
https://github.com/torvalds/linux.git
synced 2025-11-30 23:16:01 +07:00
Cross-merge networking fixes after downstream PR (net-6.17-rc6). Conflicts: net/netfilter/nft_set_pipapo.c net/netfilter/nft_set_pipapo_avx2.cc4eaca2e10("netfilter: nft_set_pipapo: don't check genbit from packetpath lookups")84c1da7b38("netfilter: nft_set_pipapo: use avx2 algorithm for insertions too") Only trivial adjacent changes (in a doc and a Makefile). Signed-off-by: Jakub Kicinski <kuba@kernel.org>