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:   Mon, 16 Jan 2023 12:28:41 +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: Re: linux-next: manual merge of the rcu tree with the tomoyo tree
Message-ID: <20230116122841.67cbc7fc@canb.auug.org.au>
In-Reply-To: <20230111111439.4c4745d2@canb.auug.org.au>
References: <20230111111439.4c4745d2@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Exd0zAR3QVCHs4ILx9Fy6VI";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Wed, 11 Jan 2023 11:14:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the rcu tree got a conflict in:
>=20
>   security/tomoyo/Kconfig
>=20
> between commit:
>=20
>   80f8be7af03f ("tomoyo: Omit use of bin2c")
>=20
> from the tomoyo tree and commit:
>=20
>   ed87f6865857 ("tomoyo: Remove "select SRCU"")
>=20
> from the rcu tree.

So the rcu tree commit is now duplicated in the tomoyo tree (but
slightly different due to the bin2c commit).

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPEqEkACgkQAVBC80lX
0Gx78wf/T/IlJR9wx9whzkc/tXn2OScn+S9ZFKoMzdhvF+p7gNBWddR50+Eze++g
t+AT8prQqroQpjLRuWvx9SgXo/nHppLvA7C4xqXxLzmH6JwOAFCyJOpoMa9ldPOM
6Ul7CrAjjtfwnOQKaC/5rbh1igxdtyCp4Q9D0o0cguDPvQPPvBUvyJZ6LOC0s22z
fafq7D+UlVgYKsEgn4RS9BhsY3bcxkwGWmqIuORo4Y1Km6xI7PCaDYV0WOdpdQO7
N7Glh6qjh/vcUJz7yHeJtVMzPM4n0fimrmalaj0+4qiq1/yGIr35Uta+Cp6M0JkU
bgL6KHL8Mqe6FU1gwK3U3Yh5txPbYg==
=kom3
-----END PGP SIGNATURE-----

--Sig_/Exd0zAR3QVCHs4ILx9Fy6VI--