From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Simon Horman <horms@verge.net.au>,
NetFilter <netfilter-devel@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patches in the ipvs-next tree
Date: Wed, 16 Oct 2024 09:23:27 +0200 [thread overview]
Message-ID: <Zw9p7_31EESN64RQ@calendula> (raw)
In-Reply-To: <20241016115741.785992f1@canb.auug.org.au>
On Wed, Oct 16, 2024 at 11:57:41AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in the netfilter-next tree as different
> commits (but the same patches):
>
> 3478b99fc515 ("netfilter: nf_tables: prefer nft_trans_elem_alloc helper")
> 73e467915aab ("netfilter: nf_tables: replace deprecated strncpy with strscpy_pad")
> 0398cffb7459 ("netfilter: nf_tables: Fix percpu address space issues in nf_tables_api.c")
> cb3d289366b0 ("netfilter: Make legacy configs user selectable")
>
> These are commits
>
> 08e52cccae11 ("netfilter: nf_tables: prefer nft_trans_elem_alloc helper")
> 544dded8cb63 ("netfilter: nf_tables: replace deprecated strncpy with strscpy_pad")
> 0741f5559354 ("netfilter: nf_tables: Fix percpu address space issues in nf_tables_api.c")
> 6c959fd5e173 ("netfilter: Make legacy configs user selectable")
>
> in the netfilter-next tree.
>
> These have already caused an unnecessary conflict due to further commits
> in the ipvs-next tree. Maybe you could share a stable branch?
That was the result of a rebase, moving forward I will keep PR in a
separated branch until they are merged upstream to avoid this
situation.
next prev parent reply other threads:[~2024-10-16 7:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-16 0:57 linux-next: duplicate patches in the ipvs-next tree Stephen Rothwell
2024-10-16 7:23 ` Pablo Neira Ayuso [this message]
2024-10-16 17:08 ` Simon Horman
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=Zw9p7_31EESN64RQ@calendula \
--to=pablo@netfilter.org \
--cc=horms@verge.net.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.