* linux-next: duplicate patches in the ipvs-next tree
@ 2024-10-16 0:57 Stephen Rothwell
2024-10-16 7:23 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2024-10-16 0:57 UTC (permalink / raw)
To: Simon Horman, Pablo Neira Ayuso
Cc: NetFilter, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 992 bytes --]
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?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: duplicate patches in the ipvs-next tree
2024-10-16 0:57 linux-next: duplicate patches in the ipvs-next tree Stephen Rothwell
@ 2024-10-16 7:23 ` Pablo Neira Ayuso
2024-10-16 17:08 ` Simon Horman
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2024-10-16 7:23 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Simon Horman, NetFilter, Linux Kernel Mailing List,
Linux Next Mailing List
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.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: duplicate patches in the ipvs-next tree
2024-10-16 7:23 ` Pablo Neira Ayuso
@ 2024-10-16 17:08 ` Simon Horman
0 siblings, 0 replies; 3+ messages in thread
From: Simon Horman @ 2024-10-16 17:08 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Stephen Rothwell, NetFilter, Linux Kernel Mailing List,
Linux Next Mailing List
On Wed, Oct 16, 2024 at 09:23:27AM +0200, Pablo Neira Ayuso wrote:
> 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.
Hi,
I have force-pushed ipvs-next so it now matches netfilter-next.
I expect that should resolve this problem.
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-16 17:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-16 0:57 linux-next: duplicate patches in the ipvs-next tree Stephen Rothwell
2024-10-16 7:23 ` Pablo Neira Ayuso
2024-10-16 17:08 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).