Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 11 Jan 2023 11:14:39 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "Paul E. McKenney" <paulmck@kernel.org>,
        Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Masahiro Yamada <masahiroy@kernel.org>
Subject: linux-next: manual merge of the rcu tree with the tomoyo tree
Message-ID: <20230111111439.4c4745d2@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/58cR6x89EqNrDrHYPfwdeBy";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/58cR6x89EqNrDrHYPfwdeBy
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:

  security/tomoyo/Kconfig

between commit:

  80f8be7af03f ("tomoyo: Omit use of bin2c")

from the tomoyo tree and commit:

  ed87f6865857 ("tomoyo: Remove "select SRCU"")

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 security/tomoyo/Kconfig
index 772d2ab58fd1,a9796b400312..000000000000
--- a/security/tomoyo/Kconfig
+++ b/security/tomoyo/Kconfig
@@@ -6,7 -6,7 +6,6 @@@ config SECURITY_TOMOY
  	select SECURITYFS
  	select SECURITY_PATH
  	select SECURITY_NETWORK
- 	select SRCU
 -	select BUILD_BIN2C
  	default n
  	help
  	  This selects TOMOYO Linux, pathname-based access control.

--Sig_/58cR6x89EqNrDrHYPfwdeBy
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmO9/28ACgkQAVBC80lX
0Gx3sggAkXdU/iNkmS/dHW9wyw0PLnptDZMonH3ADofVFWCB9zqO4gKc1v8q7q8t
yE1jtvFEUyPWqXDijWImxTnONAIArOc9m6+75+GVFH39kTamQilDuGeKzVA+l0Hx
hpggw4JxX4Il2xhcZ5oRbTzFPB7bwrTFAXMUerSoan9+EbMHKCHkFDPWfun8sUQ/
ScPRl11EEKb4Pr/WXtwlHq2SQ0vOlmf19ZVoVp3swY9HHRN+mc55EYy22GbIrUcY
HeNuYmJDnBplwdlTthXNiJIJFiAzitI+cC/KAcGS6DAikBJTaQ6EAZnkU+MNi8Un
UyAc4ymsCbLMBrCDBQfkz9YZhcAj/A==
=sCwe
-----END PGP SIGNATURE-----

--Sig_/58cR6x89EqNrDrHYPfwdeBy--