Date:   Thu, 18 Nov 2021 10:13:39 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Networking <netdev@vger.kernel.org>,
        Jonathan Corbet <corbet@lwn.net>
Cc:     Dave Tucker <dave@dtucker.co.uk>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Subject: linux-next: manual merge of the bpf-next tree with the jc_docs tree
Message-ID: <20211118101339.6ec37e14@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5L9+vwtChqc/S0w0YGdhq+U";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/5L9+vwtChqc/S0w0YGdhq+U
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  Documentation/bpf/index.rst

between commit:

  1c1c3c7d08d8 ("libbpf: update index.rst reference")

from the jc_docs tree and commit:

  5931d9a3d052 ("bpf, docs: Fix ordering of bpf documentation")

from the bpf-next tree.

I fixed it up (the latter removed the line updated by the former, so I
just the latter) 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_/5L9+vwtChqc/S0w0YGdhq+U
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmGVjKMACgkQAVBC80lX
0Gwb5wf/RINYTn/Oo4Zx3IplVB4jA9W3DvOmx/IsW7H+nZcOKCH+86QD751fkQcl
PsNI+kLXimzNiW7HujBnAw4j6gSUL+Tjs6+p/Xv6GaZxZZyg1jagM/uwSaL/6rUQ
1dFDebvs7UtBWNt4GFqxuQOqr01lFy6wVrM45YwgEC2q/VKCkafU1VXZyIbwFp0X
5ana/9jSucDqfTCfcFHW4Js0pi3wZZzOrWvLJfNIxwzXVICXc2fBCoz7rMoK+S4J
/fVId/XZSPcx8ode+bVlEJdr/pxVXOj/+HrBDPff4myAV5PI5ojshznMplnFim+p
BSbKZJ0Jt2kIM9SjoLsL6sLFQmYuuA==
=XdIC
-----END PGP SIGNATURE-----

--Sig_/5L9+vwtChqc/S0w0YGdhq+U--