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

[Steven Rostedt]

On Mon, 9 Feb 2026 08:58:10 -0800
Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:

> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.  
> 
> Yikes.
> 
> How about I drop "tracing: remove size parameter in __trace_puts()" and
> "tracing: move tracing declarations from kernel.h to a dedicated
> header"?

It should be a trivial merge conflict. I only moved the code from trace.c
into trace_printk.c. I made no other changes to it.

Basically, the commit in your tree would be the same, it would just be
applied to kernel/trace/trace_printk.c instead of kernel/trace/trace.c.

Both changes are similar in the fact they are cleanups in where code lives.

Or would you prefer if I take that change and rebase it on top of my tree?

-- Steve