Received-SPF: pass (google.com: domain of linux-kernel+bounces-36263-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 24 Jan 2024 12:16:05 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Borkmann <daniel@iogearbox.net>, Alexei Starovoitov
 <ast@kernel.org>, Andrii Nakryiko <andrii@kernel.org>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Nathan Chancellor <nathan@kernel.org>
Subject: linux-next: manual merge of the bpf-next tree with the mm tree
Message-ID: <20240124121605.1c4cc5bc@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/bcC3kCdxM15K5zgImia09FZ";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/bcC3kCdxM15K5zgImia09FZ
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:

  tools/testing/selftests/bpf/README.rst

between commit:

  0d57063bef1b ("selftests/bpf: update LLVM Phabricator links")

from the mm-nonmm-unstable branch of the mm tree and commit:

  f067074bafd5 ("selftests/bpf: Update LLVM Phabricator links")

from the bpf-next tree.

I fixed it up (the latter has one more digit in a SHA1 in a URL, so
I used that) 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_/bcC3kCdxM15K5zgImia09FZ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWwZNUACgkQAVBC80lX
0GyyUQf/d5uTmSG4zpZtl0z6FSlZCyVLnwvSa5t84gqsWZCuk1cq+lMpzA0ue/iL
NMOcXYIvG5/vQuEqpG+PrFgfUnml//o+kSF6Nxlt+wLWtmAFKx2ZNu5jZgpNeobw
Pjm8MC3a9rGwia18M2FOdsEhmJkxYY/aecL6m0mf5mzO66hComaT06uLgxwnM47v
hQh61L+/7nZGnsVnNnNpO76wNhzSovyY+rc2AdlhnSImADQ/u6OhG2rdRYJRd7aU
Tyj4igaSDU1aUqwSW/asV40HhVdqdQF65teBEWrNi/ixS2y8W8/Kz9i1LsBZJ7iU
Eqm+If5a/YttmwLJU3STXSyEx7djfA==
=a589
-----END PGP SIGNATURE-----

--Sig_/bcC3kCdxM15K5zgImia09FZ--