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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20260209121513.38f12ea6@gandalf.local.home>
Date: Mon, 9 Feb 2026 12:15:13 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Mark Brown <broonie@...nel.org>, Masami Hiramatsu <mhiramat@...nel.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Yury Norov <ynorov@...dia.com>
Subject: Re: linux-next: manual merge of the ftrace tree with the
 mm-nonmm-stable tree

On Mon, 9 Feb 2026 08:58:10 -0800
Andrew Morton <akpm@...ux-foundation.org> 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