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:   Fri, 23 Sep 2022 13:48:34 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "Paul E. McKenney" <paulmck@kernel.org>,
        Jonathan Corbet <corbet@lwn.net>
Cc:     Akhil Raj <lf32.dev@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the rcu tree with the jc_docs tree
Message-ID: <20220923134834.299646cd@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/3ryg6fuO7mJ+bI4n2LP8dIj";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/3ryg6fuO7mJ+bI4n2LP8dIj
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:

  Documentation/RCU/checklist.rst

between commit:

  712e1dea2e4f ("Delete duplicate words from kernel docs")

from the jc_docs tree and commit:

  1f0e704eea04 ("doc: Update checklist.txt")

from the rcu tree.

I fixed it up (I just used the latter since it removed the words removed
by the former) 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

--Sig_/3ryg6fuO7mJ+bI4n2LP8dIj
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMtLJIACgkQAVBC80lX
0Gxa7gf/S9zDyk7aEKTk9tiAUz9shJ3mMSjFgNYRG+8StWxCTGrf00kz7G75wNDE
WtUE+T8sDTBGJgm1DXNRE8smbWolRB1Jzg+75zCvGBPMVA5g/HomO1I9TE5/HI9w
BgMNXhDwRQeX1cgKO0TIr2wp6FUbxc/C2s0zVriz1i4rRuRcMrzAM32RuiRneDXp
4zUe/lwqq2FtrZ8mw+p6lMzF5vKVgObi8N5mxEzgKCSQfODyHUDx+y3ZQUFMTak6
oyYkzuh1l6W9p7mgxMWWp6+nQmPfU13HA40ND7m+uT2/oO7WZa6PImP6zhUZSGsJ
Gj9uquPKQvqKZ+0Ps8ng6cE6SxeQ8A==
=Kyfn
-----END PGP SIGNATURE-----

--Sig_/3ryg6fuO7mJ+bI4n2LP8dIj--