linux-next: duplicate patch in the bpf-next tree

linux-next: duplicate patch in the bpf-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

Hi all,

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

  6f130e4d4a5f ("bpf: Fix order of args in call to bpf_map_kvcalloc")

This is commit

  af253aef183a ("bpf: fix order of args in call to bpf_map_kvcalloc")

in the net tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the bpf-next tree

[Alexei Starovoitov]

On Thu, Jul 11, 2024 at 3:36 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> The following commit is also in the net tree as a different commit
> (but the same patch):
>
>   6f130e4d4a5f ("bpf: Fix order of args in call to bpf_map_kvcalloc")
>
> This is commit
>
>   af253aef183a ("bpf: fix order of args in call to bpf_map_kvcalloc")
>
> in the net tree.

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.
Sigh.

Re: linux-next: duplicate patch in the bpf-next tree

[Stephen Rothwell]

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

linux-next: duplicate patch in the bpf-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

Hi all,

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

  1cbe8143fd2f ("bpf: kprobe: Remove unused declaring of bpf_kprobe_override")

This is commit

  0e8b53979ac8 ("bpf: kprobe: remove unused declaring of bpf_kprobe_override")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the bpf-next tree

[Alexei Starovoitov]

On Sun, Aug 11, 2024 at 2:28 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
>
>   1cbe8143fd2f ("bpf: kprobe: Remove unused declaring of bpf_kprobe_override")
>
> This is commit
>
>   0e8b53979ac8 ("bpf: kprobe: remove unused declaring of bpf_kprobe_override")
>
> in Linus' tree.

Masami,

What happened here?

Looks like the discussion was suggesting for Menglong to
send v2, which he did and the patch was clearly targeting bpf-next tree:
[PATCH bpf-next] bpf: kprobe:

Why did you silently apply it ?
No one knew that.
Menglong sent v2 and it was applied to bpf-next :(