Hi all, On Wed, 19 May 2021 09:56:27 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the netfilter-next tree got a conflict in: > > net/netfilter/nft_set_pipapo.c > > between commit: > > f0b3d338064e ("netfilter: nft_set_pipapo_avx2: Add irq_fpu_usable() check, fallback to non-AVX2 version") > > from the net tree and commit: > > b1bc08f6474f ("netfilter: nf_tables: prefer direct calls for set lookups") > > from the netfilter-next tree. > > I fixed it up (I just used the latter) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. This merge also needs the following merge resolution patch: From: Stephen Rothwell Date: Wed, 19 May 2021 13:48:22 +1000 Subject: [PATCH] fix up for merge involving nft_pipapo_lookup() Signed-off-by: Stephen Rothwell --- net/netfilter/nft_set_pipapo.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/netfilter/nft_set_pipapo.h b/net/netfilter/nft_set_pipapo.h index d84afb8fa79a..25a75591583e 100644 --- a/net/netfilter/nft_set_pipapo.h +++ b/net/netfilter/nft_set_pipapo.h @@ -178,8 +178,6 @@ struct nft_pipapo_elem { int pipapo_refill(unsigned long *map, int len, int rules, unsigned long *dst, union nft_pipapo_map_bucket *mt, bool match_only); -bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, - const u32 *key, const struct nft_set_ext **ext); /** * pipapo_and_field_buckets_4bit() - Intersect 4-bit buckets -- 2.30.2 -- Cheers, Stephen Rothwell