From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
bpf <bpf@vger.kernel.org>, Networking <netdev@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 patch in the bpf-next tree
Date: Fri, 12 Jul 2024 10:17:11 +1000 [thread overview]
Message-ID: <20240712101711.272eda17@canb.auug.org.au> (raw)
In-Reply-To: <CAADnVQKVC4NGsEU0X3XJmmCot40Vvik-9KNFU07F=VBF-4UVRQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 681 bytes --]
Hi Alexei,
On Thu, 11 Jul 2024 16:51:28 -0700 Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote:
>
> Argh.
> So the fix was applied to bpf-next back in May and the same people
> come back to complain in July that it's somehow still broken and must be
> fixed in Linus's tree.
> So the new patch was applied to bpf and pulled to net
> and on the way to Linus now.
>
> We will ffwd bpf-next in a day or so, if git cannot handle it,
> we will revert from bpf-next.
Don't bother, it is not causing any conflicts. Occasional duplicates
like this are not really a problem. I report them just in case they
were done in error.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-07-12 0:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-11 22:36 linux-next: duplicate patch in the bpf-next tree Stephen Rothwell
2024-07-11 23:51 ` Alexei Starovoitov
2024-07-12 0:17 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-11 21:28 Stephen Rothwell
2024-08-12 19:48 ` Alexei Starovoitov
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=20240712101711.272eda17@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alexei.starovoitov@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox