From: Steven Rostedt <rostedt@goodmis•org>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Mark Brown <broonie@kernel•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:06:55 -0500 [thread overview]
Message-ID: <20260209120655.2045ea9f@gandalf.local.home> (raw)
In-Reply-To: <20260209085810.9aa1e0c9e8cac00ba9585171@linux-foundation.org>
On Mon, 9 Feb 2026 08:58:10 -0800
Andrew Morton <akpm@linux-foundation•org> 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
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 [this message]
2026-02-09 17:07 ` Mark Brown
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=20260209120655.2045ea9f@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