Received-SPF: pass (google.com: domain of linux-kernel+bounces-2868-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 18 Dec 2023 10:29:52 +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>, David Miller
 <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni
 <pabeni@redhat.com>
Cc: bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>,
 Aleksander Lobakin <aleksander.lobakin@intel.com>, Larysa Zaremba
 <larysa.zaremba@intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Randy Dunlap <rdunlap@infradead.org>
Subject: linux-next: manual merge of the bpf-next tree with the net-next
 tree
Message-ID: <20231218102952.2428bd06@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/cDv_OgwexhiKmz_AYOhw3a5";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

  include/linux/skbuff.h

between commit:

  bf873a800ac3 ("net: skbuff: fix spelling errors")

from the net-next tree and commit:

  2ebe81c81435 ("net, xdp: Allow metadata > 32")

from the bpf-next tree.

I fixed it up (the latter removed a line that was updated by the former,
so I just removed it) 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_/cDv_OgwexhiKmz_AYOhw3a5
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV/hHAACgkQAVBC80lX
0GzFlwf+Kpf/rnj71gHs66yQd/EoHmcA/wPjDai4NGfF2YrGTXDCcwZaL2gEoCtk
I/QBDSVDAIddfwkGz1+UFQdl+saaBHcOHAyy8vxebve/6VLV2DveU+4nq7uz7sB4
C++FPLqkQQgsUb/+WdZ0LZsZyNGjWBpSFiOV78pCBmJ12VPZu813MBfx0rp8JhMj
d+Ri+BGECNJqDbyyZUcNj0SF2wlAzf8bk42KX6dGHrKvnuu7ncyslAqyepgKFLAh
/q2Xc7gqPbPddp3cqqLuPoyiCxIVK10CJF+DZUIF0421QrPfjwizb+SPwmuzHaR8
nLBkWO+Brrff0rLs8RlmZCu1F0tXZQ==
=h0WP
-----END PGP SIGNATURE-----

--Sig_/cDv_OgwexhiKmz_AYOhw3a5--