From: Steven Rostedt <rostedt@goodmis•org>
To: Mark Brown <broonie@kernel•org>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Masami Hiramatsu <mhiramat@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Yury Norov <ynorov@nvidia•com>
Subject: Re: linux-next: manual merge of the ftrace tree with the mm-nonmm-stable tree
Date: Mon, 9 Feb 2026 12:14:05 -0500 [thread overview]
Message-ID: <20260209121405.3bbc2cb9@gandalf.local.home> (raw)
In-Reply-To: <aYoURlMX4UQJsekN@sirena.co.uk>
On Mon, 9 Feb 2026 17:07:18 +0000
Mark Brown <broonie@kernel•org> wrote:
> 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.
If you look at the change log of the commit in the mm tree, you'll see why
it went there:
This fixes a header recursion issue where using strlen() in the macro
calling __trace_puts() requires adding #include <linux/string.h> in order
to use strlen(). Removing the use of strlen() from the header fixes the
recursion issue.
The mm tree took code to move things around, and by moving the
trace_printk() into its own headers caused the build to fail!
I guess I could have taken the moving of the trace_printk() code in my
tree. But it was part of a series that did other moves so I didn't
recommend it.
-- Steve
next prev parent reply other threads:[~2026-02-09 17:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-09 15:43 linux-next: manual merge of the ftrace tree with the mm-nonmm-stable tree Mark Brown
2026-02-09 16:58 ` Andrew Morton
2026-02-09 17:06 ` Steven Rostedt
2026-02-09 17:07 ` Mark Brown
2026-02-09 17:14 ` Steven Rostedt [this message]
2026-02-09 17:15 ` Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2024-05-15 2:37 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260209121405.3bbc2cb9@gandalf.local.home \
--to=rostedt@goodmis$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=ynorov@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox