2023-02-22 21:39:40

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: duplicate patch in the bpf tree

Hi all,

The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):

345d24a91c79 ("bpf: Include missing nospec.h to avoid build error.")

This is commit

f3dd0c53370e ("bpf: add missing header file include")

in Linus' tree.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (488.00 B)
OpenPGP digital signature

2023-02-22 21:44:08

by Linus Torvalds

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the bpf tree

On Wed, Feb 22, 2023 at 1:39 PM Stephen Rothwell <[email protected]> wrote:
>
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):

Yup, that was very intentional to keep the fallout of the problem on
random architectures minimal.

Linus

2023-02-22 21:46:34

by Alexei Starovoitov

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the bpf tree

On Wed, Feb 22, 2023 at 1:39 PM Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
>
> 345d24a91c79 ("bpf: Include missing nospec.h to avoid build error.")
>
> This is commit
>
> f3dd0c53370e ("bpf: add missing header file include")
>
> in Linus' tree.

Yes. I just dropped it from bpf tree.

FYI we also added it to BPF CI's special folder for patches
that CI applies before it runs.
So it's no longer an issue for BPF CI though commit f3dd0c53370e
didn't make it into bpf trees yet.
All good.