All of lore.kernel.org
 help / color / mirror / Atom feed
From: Florian Westphal <fw@strlen.de>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nf-next v2 0/5] netfilter: nft_set updates
Date: Wed, 23 Jul 2025 14:20:45 +0200	[thread overview]
Message-ID: <aIDTnU0QY0QdWzio@strlen.de> (raw)
In-Reply-To: <aIA3Y3OjzhZ_hQVD@calendula>

Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > The fourth patch is the main change, it removes the control-plane
> > only C implementation of the pipapo lookup algorithm.
> > 
> > The last patch allows the scratch maps to be backed by vmalloc.
> 
> This clashes with:
> 
>   netfilter: nft_set_pipapo: Use nested-BH locking for nft_pipapo_scratch
> 
> https://patchwork.ozlabs.org/project/netfilter-devel/list/?series=463248
>
> It seems you and Sebastian have been working on the same area at the
> same time.
> 
> Do you have a preference on how to proceed with this clash?

If the clash is only in last patch, then how about this:
You apply the first few patches plus Sebastians work, push this out
(main or testing branch is fine too) and I will rebase + resend?

Or, we can defer to 6.18, your call.

  reply	other threads:[~2025-07-23 12:20 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-09 17:05 [PATCH nf-next v2 0/5] netfilter: nft_set updates Florian Westphal
2025-07-09 17:05 ` [PATCH nf-next v2 1/5] netfilter: nft_set_pipapo: remove unused arguments Florian Westphal
2025-07-09 17:05 ` [PATCH nf-next v2 2/5] netfilter: nft_set: remove one argument from lookup and update functions Florian Westphal
2025-07-09 17:05 ` [PATCH nf-next v2 3/5] netfilter: nft_set: remove indirection from update API call Florian Westphal
2025-07-09 17:05 ` [PATCH nf-next v2 4/5] netfilter: nft_set_pipapo: merge pipapo_get/lookup Florian Westphal
2025-07-09 17:05 ` [PATCH nf-next v2 5/5] netfilter: nft_set_pipapo: prefer kvmalloc for scratch maps Florian Westphal
2025-07-23  1:14 ` [PATCH nf-next v2 0/5] netfilter: nft_set updates Pablo Neira Ayuso
2025-07-23 12:20   ` Florian Westphal [this message]
2025-07-24 12:47     ` Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=aIDTnU0QY0QdWzio@strlen.de \
    --to=fw@strlen.de \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.