* linux-next: duplicate patch in the ftrace-fixes tree
@ 2025-01-05 19:33 Stephen Rothwell
2025-01-05 20:45 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2025-01-05 19:33 UTC (permalink / raw)
To: Steven Rostedt, Masami Hiramatsu
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
Hi all,
The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):
ab9d98250259 ("ftrace: Fix function profiler's filtering functionality")
e99b3d0cb6cd ("fgraph: Add READ_ONCE() when accessing fgraph_array[]")
These are commits
789a8cff8d2d ("ftrace: Fix function profiler's filtering functionality")
d65474033740 ("fgraph: Add READ_ONCE() when accessing fgraph_array[]")
in Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: duplicate patch in the ftrace-fixes tree
2025-01-05 19:33 linux-next: duplicate patch in the ftrace-fixes tree Stephen Rothwell
@ 2025-01-05 20:45 ` Steven Rostedt
2025-01-05 21:20 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2025-01-05 20:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Masami Hiramatsu, Linux Kernel Mailing List,
Linux Next Mailing List
On Mon, 6 Jan 2025 06:33:13 +1100
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):
>
> ab9d98250259 ("ftrace: Fix function profiler's filtering functionality")
> e99b3d0cb6cd ("fgraph: Add READ_ONCE() when accessing fgraph_array[]")
>
> These are commits
>
> 789a8cff8d2d ("ftrace: Fix function profiler's filtering functionality")
> d65474033740 ("fgraph: Add READ_ONCE() when accessing fgraph_array[]")
>
> in Linus' tree.
>
Bah, I sent out a slight update to Linus, and ended up rebasing it on
v6.13-rc5. I'll rebase my ftrace/for-next on top of that one, test it, and
re-push it. Probably tomorrow.
Thanks,
-- Steve
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: duplicate patch in the ftrace-fixes tree
2025-01-05 20:45 ` Steven Rostedt
@ 2025-01-05 21:20 ` Steven Rostedt
0 siblings, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2025-01-05 21:20 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Masami Hiramatsu, Linux Kernel Mailing List,
Linux Next Mailing List
On Sun, 5 Jan 2025 15:45:23 -0500
Steven Rostedt <rostedt@goodmis.org> wrote:
> > The following commit is also in Linus Torvalds' tree as a different commit
> > (but the same patch):
> >
> > ab9d98250259 ("ftrace: Fix function profiler's filtering functionality")
> > e99b3d0cb6cd ("fgraph: Add READ_ONCE() when accessing fgraph_array[]")
> >
> > These are commits
> >
> > 789a8cff8d2d ("ftrace: Fix function profiler's filtering functionality")
> > d65474033740 ("fgraph: Add READ_ONCE() when accessing fgraph_array[]")
> >
> > in Linus' tree.
> >
>
> Bah, I sent out a slight update to Linus, and ended up rebasing it on
> v6.13-rc5. I'll rebase my ftrace/for-next on top of that one, test it, and
> re-push it. Probably tomorrow.
Ah, I didn't see that this was the "fixes" branch. I'll just go and update
that.
Thanks,
-- Steve
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-05 21:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-05 19:33 linux-next: duplicate patch in the ftrace-fixes tree Stephen Rothwell
2025-01-05 20:45 ` Steven Rostedt
2025-01-05 21:20 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox