From: Mark Brown <broonie@kernel•org>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Steven Rostedt <rostedt@goodmis•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 17:07:18 +0000 [thread overview]
Message-ID: <aYoURlMX4UQJsekN@sirena.co.uk> (raw)
In-Reply-To: <20260209085810.9aa1e0c9e8cac00ba9585171@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
On Mon, Feb 09, 2026 at 08:58:10AM -0800, Andrew Morton wrote:
> On Mon, 9 Feb 2026 15:43:49 +0000 Mark Brown <broonie@kernel•org> 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2026-02-09 17:07 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 [this message]
2026-02-09 17:14 ` Steven Rostedt
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=aYoURlMX4UQJsekN@sirena.co.uk \
--to=broonie@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=rostedt@goodmis$(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