Received-SPF: pass (google.com: domain of linux-kernel+bounces-178297-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 14 May 2024 13:42:34 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Luis Chamberlain <mcgrof@kernel.org>
Cc: "Paul E. McKenney" <paulmck@kernel.org>, 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: Re: linux-next: manual merge of the rcu tree with the modules tree
Message-ID: <20240514134234.5d9f033f@canb.auug.org.au>
In-Reply-To: <20240424134551.44531979@canb.auug.org.au>
References: <20240424134551.44531979@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/q2UE10_YxcKYRCT4MmR.d0l";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

On Wed, 24 Apr 2024 13:45:51 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the rcu tree got a conflict in:
>=20
>   arch/Kconfig
>=20
> between commit:
>=20
>   3f26835b6c72 ("kprobes: remove dependency on CONFIG_MODULES")
>=20
> from the modules tree and commit:
>=20
>   900da4d2a57c ("arch: Select new NEED_TASKS_RCU Kconfig option")
>=20
> from the rcu tree.
>=20
> 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
>=20
> 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

This is now a conflict between the modules tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/q2UE10_YxcKYRCT4MmR.d0l
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZC3aoACgkQAVBC80lX
0GyJ5Af/VhbBJc4muWXEw2wSQ8F7vJ3Zhqonb/TsXNCMyNjSRLKpvGvbEsC9RZS7
jFvZbuWtmnefihgWriN4Go6NN2UFgmiemHbYzDhuhWU/AttH8ny6g+eucqkiHMJg
EdqzGjxgPnnRO+VUSeuOPP98HQmxre6Fbi6MI9+QCR6a2Lt9nQUPlS5xRq+ZtmGa
8W0h7J2jX1tDgayBnOESMO7q4Nz+/mB5r27rBE/T2uoWiwc2Mqh81mHanlw96KKA
nE3yJW7D2WKkUyN0ITCxmBPECuc0Kz4iQIj0VBC257+s6Uvt24qLGeenRX34pZG2
wZq3SIn0twik5RP54VF10okoiJD9ZA==
=5sZ8
-----END PGP SIGNATURE-----

--Sig_/q2UE10_YxcKYRCT4MmR.d0l--