From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel•org>,
Frederic Weisbecker <frederic@kernel•org>,
Neeraj Upadhyay <neeraj.upadhyay@kernel•org>,
Boqun Feng <boqun.feng@gmail•com>,
Uladzislau Rezki <urezki@gmail•com>,
Steven Rostedt <rostedt@goodmis•org>,
Masami Hiramatsu <mhiramat@kernel•org>
Cc: 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 rcu tree with the ftrace tree
Date: Fri, 14 Nov 2025 13:52:26 +1100 [thread overview]
Message-ID: <20251114135226.64831207@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
kernel/trace/trace_syscalls.c
between commit:
a544d9a66bdf ("tracing: Have syscall trace events read user space string")
from the ftrace tree and commit:
35587dbc58dd ("tracing: Guard __DECLARE_TRACE() use of __DO_TRACE_CALL() with SRCU-fast")
from the rcu tree.
I fixed it up (Maybe - 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.
--
Cheers,
Stephen Rothwell
diff --cc kernel/trace/trace_syscalls.c
index e96d0063cbcf,3f699b198c56..000000000000
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@@ -878,6 -322,8 +890,7 @@@ static void ftrace_syscall_enter(void *
* buffer and per-cpu data require preemption to be disabled.
*/
might_fault();
+ preempt_rt_guard();
- guard(preempt_notrace)();
syscall_nr = trace_get_syscall_nr(current, regs);
if (syscall_nr < 0 || syscall_nr >= NR_syscalls)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-14 2:52 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-14 2:52 Stephen Rothwell [this message]
2025-11-14 12:42 ` linux-next: manual merge of the rcu tree with the ftrace tree Steven Rostedt
2025-11-14 13:35 ` Sebastian Andrzej Siewior
2025-11-14 15:46 ` Steven Rostedt
2025-11-14 16:00 ` Sebastian Andrzej Siewior
2025-11-14 16:22 ` Steven Rostedt
2025-11-14 16:33 ` Sebastian Andrzej Siewior
2025-11-14 16:48 ` Steven Rostedt
2025-11-14 17:02 ` Sebastian Andrzej Siewior
2025-11-14 17:11 ` Steven Rostedt
2025-11-14 17:00 ` Paul E. McKenney
2025-11-14 17:10 ` Sebastian Andrzej Siewior
2025-11-14 17:25 ` Paul E. McKenney
2025-11-14 17:40 ` Steven Rostedt
2025-11-14 17:41 ` Sebastian Andrzej Siewior
2025-11-14 18:26 ` Paul E. McKenney
2025-11-14 14:48 ` Frederic Weisbecker
2025-11-14 16:01 ` Steven Rostedt
2025-11-14 17:06 ` Paul E. McKenney
2025-11-14 18:58 ` Paul E. McKenney
2025-11-18 13:05 ` Frederic Weisbecker
2025-11-18 15:04 ` Paul E. McKenney
2025-12-02 0:57 ` Paul E. McKenney
2025-12-07 20:43 ` Paul E. McKenney
2025-12-08 0:17 ` Steven Rostedt
2025-12-08 4:21 ` Paul E. McKenney
2025-11-14 17:05 ` Paul E. McKenney
2025-11-14 18:31 ` Yonghong Song
2025-11-18 7:35 ` Sebastian Andrzej Siewior
2025-11-18 15:05 ` Paul E. McKenney
2025-11-30 18:49 ` Yonghong Song
2025-11-19 0:38 ` Paul E. McKenney
-- strict thread matches above, loose matches on Subject: below --
2025-11-06 1:24 Stephen Rothwell
2017-05-01 3:18 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=20251114135226.64831207@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=boqun.feng@gmail$(echo .)com \
--cc=frederic@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=neeraj.upadhyay@kernel$(echo .)org \
--cc=paulmck@kernel$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
--cc=urezki@gmail$(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