Subject: Re: linux-next: manual merge of the ftrace tree with the mm-nonmm-stable tree

From: Mark Brown <[email-masked]>
Date: Mon, 9 Feb 2026 17:07:18 +0000

On Mon, Feb 09, 2026 at 08:58:10AM -0800, Andrew Morton wrote:
> On Mon, 9 Feb 2026 15:43:49 +0000 Mark Brown <[email-masked]> wrote:

> > between commit:
> > 
> >   86e685ff364394 ("tracing: remove size parameter in __trace_puts()")
> > 
> > from the mm-nonmm-stable tree and commits:
> > 
> >   27931ee8f45415 ("tracing: Move trace_printk functions out of trace.c and into trace_printk.c")
> >   0e730bc067e7a7 ("tracing: Move __trace_buffer_{un}lock_*() functions to trace.h")
> > 
> > from the ftrace tree.

> Yikes.

> How about I drop "tracing: remove size parameter in __trace_puts()" and
> "tracing: move tracing declarations from kernel.h to a dedicated
> header"?

FWIW that diffstat looked a lot worse than it was since it was one of
these git shows as an empty diff and I used diff -c instead which
usually looks more alarming - the change was trivial code motion
deleting code in the ftrace tree with the actual fixup being very small
but in a different file.  Was a bit weird that the parameter removal
didn't go via the ftrace tree though.