Received-SPF: pass (google.com: domain of linux-kernel+bounces-156233-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Wed, 24 Apr 2024 13:45:51 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel.org>, Luis Chamberlain
 <mcgrof@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, "Mike Rapoport (IBM)"
 <rppt@kernel.org>, "Uladzislau Rezki (Sony)" <urezki@gmail.com>
Subject: linux-next: manual merge of the rcu tree with the modules tree
Message-ID: <20240424134551.44531979@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/=s271tOq0qvWSVNq73D9bg0";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/=s271tOq0qvWSVNq73D9bg0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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
 =20
  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

--Sig_/=s271tOq0qvWSVNq73D9bg0
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYogG8ACgkQAVBC80lX
0GyMQQgAofxbv9h7HzukOk6AEY7+11fAkec8OxbeFBBYWkMek2D0batnoe1fJl8v
BGc6EswaKuPbnAAjPrW9fzgh6joylgDJzOv771p2Jk8KAHFAw9AKDLZEgw4CHLhU
ig36LlzGlh61IqGav3+1mYrLNQa1489uNq1u6V45eGq98ZN71Ekj3EXpIo/cymG8
IozEegtYkO0DyGoI5qsObyP7wIiyMUm0GvyQmYDN2yGyfOzEfyJWU95B5meKwC3J
sg40l7F+K3L8ybi98bzhrbx+7ppoLNgLw8Uw1sco/LBpZcs+gN3oDNPa0+NjIfbk
SUT4yAPD927gj9TEVcJzn+rhQ6eASA==
=oaCN
-----END PGP SIGNATURE-----

--Sig_/=s271tOq0qvWSVNq73D9bg0--