linux-kernel - Re: linux-next: manual merge of the rcu tree with the ftrace tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20251114110136.3d36deca@gandalf.local.home>
Date: Fri, 14 Nov 2025 11:01:36 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: Frederic Weisbecker <frederic@...nel.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>, "Paul E. McKenney"
 <paulmck@...nel.org>, Neeraj Upadhyay <neeraj.upadhyay@...nel.org>, Boqun
 Feng <boqun.feng@...il.com>, Uladzislau Rezki <urezki@...il.com>, Masami
 Hiramatsu <mhiramat@...nel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Sebastian Andrzej Siewior
 <bigeasy@...utronix.de>
Subject: Re: linux-next: manual merge of the rcu tree with the ftrace tree

On Fri, 14 Nov 2025 15:48:52 +0100
Frederic Weisbecker <frederic@...nel.org> wrote:

> > 
> > Paul, can you change it so that you *do not* touch this file?  
> 
> Ok, I've zapped the commit for now until we sort this out.

You can put it back. It's actually code I wrote to make sure this doesn't
conflict. The "preempt_rt_guard()" was supposed to be about "preempt_rt"
and I took it now as being "preempt" :-p

I need a vacation.

-- Steve