Received-SPF: pass (google.com: domain of linux-kernel+bounces-122310-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Thu, 28 Mar 2024 12:55:00 +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>, Haiyue
 Wang <haiyue.wang@intel.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 bpf-next tree with the net tree
Message-ID: <20240328125500.2582492e@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Ss/gieERHw1WxJDgq1s66Ig";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Ss/gieERHw1WxJDgq1s66Ig
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:

  kernel/bpf/arena.c

between commit:

  ee498a38f317 ("bpf: Clarify bpf_arena comments.")

from the net tree and commit:

  45a683b2d815 ("bpf,arena: Use helper sizeof_field in struct accessors")

from the bpf-next tree.

I fixed it up (see below) 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

diff --cc kernel/bpf/arena.c
index 343c3456c8dd,af5cae640669..000000000000
--- a/kernel/bpf/arena.c
+++ b/kernel/bpf/arena.c
@@@ -37,8 -37,8 +37,8 @@@
   */
 =20
  /* number of bytes addressable by LDX/STX insn with 16-bit 'off' field */
- #define GUARD_SZ (1ull << sizeof(((struct bpf_insn *)0)->off) * 8)
+ #define GUARD_SZ (1ull << sizeof_field(struct bpf_insn, off) * 8)
 -#define KERN_VM_SZ ((1ull << 32) + GUARD_SZ)
 +#define KERN_VM_SZ (SZ_4G + GUARD_SZ)
 =20
  struct bpf_arena {
  	struct bpf_map map;

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYEzfQACgkQAVBC80lX
0GwTlAf+ODseBCg0yaiW+cSUeGlEO16EWDh/ubJdBthEL820EVsMhIyYOxXxg6zn
lfqimw2UtpyXTuY5pWbZ1++PDrU7u3ZI84PPCJrlcDEZ1jT2nk0B3Dv1NGuiX4s7
yuzJBAz1Gi11MTBjLnJGo1b0tuuiICL1jzrOmSWV8kaSi0x4QI7u1FpdZnpbeipr
QTEpYKjs7jk8BXOYbOKxlfGzg4UA6YP8Fhz/XUflBfa0fjsOm3vhR+a4L/OvUlmp
4pOYoKMW7GbwsH9KNsfccx6ZLWwV6oW7+3yAcaXYNKVySGQSLYOwkLqyLa7Vdpc8
EOOKPufZo14M9dWb1K7kHCz6kBYzLw==
=M0aJ
-----END PGP SIGNATURE-----

--Sig_/Ss/gieERHw1WxJDgq1s66Ig--