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

Date: Wed, 24 Apr 2024 13:45:51 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Paul E. McKenney" <paulmck@...nel.org>, Luis Chamberlain
 <mcgrof@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, "Mike Rapoport (IBM)"
 <rppt@...nel.org>, "Uladzislau Rezki (Sony)" <urezki@...il.com>
Subject: linux-next: manual merge of the rcu tree with the modules tree

Hi all,

Today's linux-next merge of the rcu tree got a conflict in:

  arch/Kconfig

between commit:

  3f26835b6c72 ("kprobes: remove dependency on CONFIG_MODULES")

from the modules tree and commit:

  900da4d2a57c ("arch: Select new NEED_TASKS_RCU Kconfig option")

from the rcu 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/Kconfig
index 0ce4df5afd95,93d5010dfc92..000000000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -52,10 -52,10 +52,10 @@@ config GENERIC_ENTR

  config KPROBES
  	bool "Kprobes"
 -	depends on MODULES
  	depends on HAVE_KPROBES
  	select KALLSYMS
 +	select EXECMEM
- 	select TASKS_RCU if PREEMPTION
+ 	select NEED_TASKS_RCU
  	help
  	  Kprobes allows you to trap at almost any kernel address and
  	  execute a callback function.  register_kprobe() establishes

Content of type "application/pgp-signature" skipped