linux-kernel - Re: linux-next: manual merge of the rcu tree with the printk 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] [day] [month] [year] [list]

Message-ID: <ZrXeo7iG0bO-JeIS@pathway.suse.cz>
Date: Fri, 9 Aug 2024 11:17:23 +0200
From: Petr Mladek <pmladek@...e.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: "Paul E. McKenney" <paulmck@...nel.org>,
	Frederic Weisbecker <frederic@...nel.org>,
	Neeraj Upadhyay <neeraj.upadhyay@...nel.org>,
	Boqun Feng <boqun.feng@...il.com>,
	Uladzislau Rezki <urezki@...il.com>,
	John Ogness <john.ogness@...utronix.de>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Ryo Takakura <takakura@...inux.co.jp>
Subject: Re: linux-next: manual merge of the rcu tree with the printk tree

On Fri 2024-08-09 12:23:21, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   kernel/rcu/tree_exp.h
> 
> between commit:
> 
>   9a30ceb4d93e ("rcu: Mark emergency sections in rcu stalls")
> 
> from the printk tree and commits:
> 
>   34863005f96e ("rcu: Extract synchronize_rcu_expedited_stall() from synchronize_rcu_expedited_wait()")
>   c925e2f61399 ("rcu: Let dump_cpu_task() be used without preemption disabled")
> 
> from the rcu tree.
> 
> I fixed it up (I think - 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.

I have removed the conflicting commit from the printk tree for now.
The patchset has to be reworked. And the new version won't include
nbcon_cpu_emergency_flush().

Sigh, this conflict existed already before 6.11 merge window.
At that time, Paul decided the postpone the RCU change to make the life easier,
see https://lore.kernel.org/r/20240703131820.02eb8021@canb.auug.org.au

Unfortunately, Linus did not accept the printk changes during the
merge window for 6.11, see
https://lore.kernel.org/r/CAHk-=whU_woFnFN-3Jv2hNCmwLg_fkrT42AWwxm-=Ha5BmNX4w@mail.gmail.com

I am sorry for all inconveniences.

Best Regards,
Petr