2023-10-18 03:19:21

by Stephen Rothwell

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

Hi all,

The following commits are also in the mm tree as a different commit
(but the same patch):

2db949178eca ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")

This is commit

d120336bf502 ("fs/proc: add boot loader arguments as comment to /proc/bootconfig")

in the mm tree.

--
Cheers,
Stephen Rothwell

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

2023-10-18 15:11:35

by Masami Hiramatsu

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

On Wed, 18 Oct 2023 14:18:57 +1100
Stephen Rothwell <[email protected]> wrote:

> Hi all,
>
> The following commits are also in the mm tree as a different commit
> (but the same patch):
>
> 2db949178eca ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")
>
> This is commit
>
> d120336bf502 ("fs/proc: add boot loader arguments as comment to /proc/bootconfig")

Hmm, sorry, I picked this patch on my bootconfig/for-next branch because
it depends on the bootconfig feature.

Thank you,

>
> in the mm tree.
>
> --
> Cheers,
> Stephen Rothwell


--
Masami Hiramatsu (Google) <[email protected]>

2023-10-18 15:14:10

by Andrew Morton

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

On Thu, 19 Oct 2023 00:10:38 +0900 Masami Hiramatsu (Google) <[email protected]> wrote:

> On Wed, 18 Oct 2023 14:18:57 +1100
> Stephen Rothwell <[email protected]> wrote:
>
> > Hi all,
> >
> > The following commits are also in the mm tree as a different commit
> > (but the same patch):
> >
> > 2db949178eca ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig")
> >
> > This is commit
> >
> > d120336bf502 ("fs/proc: add boot loader arguments as comment to /proc/bootconfig")
>
> Hmm, sorry, I picked this patch on my bootconfig/for-next branch because
> it depends on the bootconfig feature.
>

I dropped the copy from mm.git.