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:

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

Andrew,

Don't worry about it. When I submit my pull request I'll mention this
conflict and how to solve it.

-- Steve