Cross-merge networking fixes after downstream PR (net-6.17-rc6). Conflicts: net/netfilter/nft_set_pipapo.c net/netfilter/nft_set_pipapo_avx2.c c4eaca2e ("netfilter: nft_set_pipapo: don't check genbit from packetpath lookups") 84c1da7b ("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>
Loading
Please sign in to comment