public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Simon Horman <horms@verge•net.au>,
	Pablo Neira Ayuso <pablo@netfilter•org>
Cc: 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: linux-next: duplicate patches in the ipvs-next tree
Date: Wed, 16 Oct 2024 11:57:41 +1100	[thread overview]
Message-ID: <20241016115741.785992f1@canb.auug.org.au> (raw)

[-- 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 --]

             reply	other threads:[~2024-10-16  0:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-16  0:57 Stephen Rothwell [this message]
2024-10-16  7:23 ` linux-next: duplicate patches in the ipvs-next tree Pablo Neira Ayuso
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=20241016115741.785992f1@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=horms@verge$(echo .)net.au \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=netfilter-devel@vger$(echo .)kernel.org \
    --cc=pablo@netfilter$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox