From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.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 08:58:10 -0800 [thread overview]
Message-ID: <20260209085810.9aa1e0c9e8cac00ba9585171@linux-foundation.org> (raw)
In-Reply-To: <aYoAtbc4L0N-g6C-@sirena.co.uk>
On Mon, 9 Feb 2026 15:43:49 +0000 Mark Brown <broonie@kernel.org> wrote:
> Today's linux-next merge of the ftrace tree got a conflict in:
>
> kernel/trace/trace.c
>
> 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.
>
> 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"?
next prev parent reply other threads:[~2026-02-09 16:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-09 15:43 Mark Brown
2026-02-09 16:58 ` Andrew Morton [this message]
2026-02-09 17:06 ` Steven Rostedt
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=20260209085810.9aa1e0c9e8cac00ba9585171@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
--cc=ynorov@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®