* linux-next: duplicate patch in the ftrace tree
@ 2023-10-18 3:18 Stephen Rothwell
2023-10-18 15:10 ` Masami Hiramatsu
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2023-10-18 3:18 UTC (permalink / raw)
To: Steven Rostedt, Masami Hiramatsu, Andrew Morton
Cc: Paul E. McKenney, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 350 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: duplicate patch in the ftrace tree
2023-10-18 3:18 linux-next: duplicate patch in the ftrace tree Stephen Rothwell
@ 2023-10-18 15:10 ` Masami Hiramatsu
2023-10-18 15:13 ` Andrew Morton
0 siblings, 1 reply; 5+ messages in thread
From: Masami Hiramatsu @ 2023-10-18 15:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Steven Rostedt, Andrew Morton, Paul E. McKenney,
Linux Kernel Mailing List, Linux Next Mailing List
On Wed, 18 Oct 2023 14:18:57 +1100
Stephen Rothwell <sfr@canb.auug.org.au> 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) <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: duplicate patch in the ftrace tree
2023-10-18 15:10 ` Masami Hiramatsu
@ 2023-10-18 15:13 ` Andrew Morton
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Morton @ 2023-10-18 15:13 UTC (permalink / raw)
To: Masami Hiramatsu
Cc: Stephen Rothwell, Steven Rostedt, Paul E. McKenney,
Linux Kernel Mailing List, Linux Next Mailing List
On Thu, 19 Oct 2023 00:10:38 +0900 Masami Hiramatsu (Google) <mhiramat@kernel.org> wrote:
> On Wed, 18 Oct 2023 14:18:57 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: duplicate patch in the ftrace tree
2023-09-04 21:50 Stephen Rothwell
@ 2023-09-04 22:36 ` Masami Hiramatsu
0 siblings, 0 replies; 5+ messages in thread
From: Masami Hiramatsu @ 2023-09-04 22:36 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Steven Rostedt, Linux Kernel Mailing List, Linux Next Mailing List
On Tue, 5 Sep 2023 07:50:33 +1000
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):
>
> bd96000ba862 ("Documentation: tracing: Update fprobe event example with BTF field")
Hmm, this is included in my topic branch. Anyway, let me rebase it on linus tree.
Thank you!
>
> This is commit
>
> a2439a4c9085 ("Documentation: tracing: Update fprobe event example with BTF field")
>
> in Linus' tree.
>
> --
> Cheers,
> Stephen Rothwell
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: duplicate patch in the ftrace tree
@ 2023-09-04 21:50 Stephen Rothwell
2023-09-04 22:36 ` Masami Hiramatsu
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2023-09-04 21:50 UTC (permalink / raw)
To: Steven Rostedt, Masami Hiramatsu
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
Hi all,
The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):
bd96000ba862 ("Documentation: tracing: Update fprobe event example with BTF field")
This is commit
a2439a4c9085 ("Documentation: tracing: Update fprobe event example with BTF field")
in Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-10-18 15:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-18 3:18 linux-next: duplicate patch in the ftrace tree Stephen Rothwell
2023-10-18 15:10 ` Masami Hiramatsu
2023-10-18 15:13 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2023-09-04 21:50 Stephen Rothwell
2023-09-04 22:36 ` Masami Hiramatsu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).