[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20240712101711.272eda17@canb.auug.org.au>
Date: Fri, 12 Jul 2024 10:17:11 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alexei Starovoitov <alexei.starovoitov@...il.com>
Cc: Daniel Borkmann <daniel@...earbox.net>, Alexei Starovoitov
<ast@...nel.org>, Andrii Nakryiko <andrii@...nel.org>, David Miller
<davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni
<pabeni@...hat.com>, bpf <bpf@...r.kernel.org>, Networking
<netdev@...r.kernel.org>, Linux Kernel Mailing List
<linux-kernel@...r.kernel.org>, Linux Next Mailing List
<linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patch in the bpf-next tree
Hi Alexei,
On Thu, 11 Jul 2024 16:51:28 -0700 Alexei Starovoitov <alexei.starovoitov@...il.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
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists