From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steven Rostedt <rostedt@goodmis•org>,
Masami Hiramatsu <mhiramat@kernel•org>
Cc: Andrii Nakryiko <andrii@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the ftrace tree with Linus' tree
Date: Fri, 27 Sep 2024 11:36:20 +1000 [thread overview]
Message-ID: <20240927113620.7a673f55@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 785 bytes --]
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in:
kernel/trace/trace_uprobe.c
between commit:
10cdb82aa77f ("uprobes: turn trace_uprobe's nhit counter to be per-CPU one")
from Linus' tree and commit:
ca088d067ebd ("uprobes: make trace_uprobe->nhit counter a per-CPU one")
from the ftrace tree.
I fixed it up (I just used the version from Linus' tree) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-09-27 1:36 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-27 1:36 Stephen Rothwell [this message]
2024-09-27 18:13 ` linux-next: manual merge of the ftrace tree with Linus' tree Andrii Nakryiko
2024-09-27 18:20 ` Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2025-01-08 2:32 Stephen Rothwell
2025-01-08 3:23 ` Steven Rostedt
2024-10-21 2:26 Stephen Rothwell
2024-10-22 2:22 ` Steven Rostedt
2023-08-28 1:59 Stephen Rothwell
2023-04-11 2:46 Stephen Rothwell
2023-04-11 3:01 ` Steven Rostedt
2021-10-28 5:31 Stephen Rothwell
2021-10-28 13:14 ` Steven Rostedt
2021-09-15 0:44 Stephen Rothwell
2021-09-15 0:47 ` Steven Rostedt
2021-02-15 4:03 Stephen Rothwell
2020-12-08 5:02 Stephen Rothwell
2020-12-14 20:37 ` Stephen Rothwell
2020-12-14 21:33 ` Steven Rostedt
2019-05-16 1:05 Stephen Rothwell
2019-05-16 1:53 ` Steven Rostedt
2019-05-16 3:32 ` Stephen Rothwell
2019-05-16 1:00 Stephen Rothwell
2018-08-15 4:04 Stephen Rothwell
2015-11-05 2:51 Stephen Rothwell
2015-11-05 3:20 ` Steven Rostedt
2013-07-10 3:51 Stephen Rothwell
2013-04-22 5:55 Stephen Rothwell
2013-04-09 6:30 Stephen Rothwell
2013-03-18 2:00 Stephen Rothwell
2013-03-18 13:26 ` Steven Rostedt
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=20240927113620.7a673f55@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrii@kernel$(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 \
/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