Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 29 Mar 2021 12:29:16 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Networking <netdev@vger.kernel.org>
Cc:     Jiri Olsa <jolsa@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Yonghong Song <yhs@fb.com>
Subject: linux-next: manual merge of the net-next tree with the bpf tree
Message-ID: <20210329122916.5921aad9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/n0RbQghcvDC=ieBcA8WQy2v";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/n0RbQghcvDC=ieBcA8WQy2v
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  include/linux/bpf.h

between commit:

  861de02e5f3f ("bpf: Take module reference for trampoline in module")

from the bpf tree and commit:

  69c087ba6225 ("bpf: Add bpf_for_each_map_elem() helper")

from the net-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 include/linux/bpf.h
index fdac0534ce79,39dce9d3c3a5..000000000000
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@@ -40,7 -40,7 +40,8 @@@ struct bpf_local_storage
  struct bpf_local_storage_map;
  struct kobject;
  struct mem_cgroup;
 +struct module;
+ struct bpf_func_state;
 =20
  extern struct idr btf_idr;
  extern spinlock_t btf_idr_lock;

--Sig_/n0RbQghcvDC=ieBcA8WQy2v
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmBhLWwACgkQAVBC80lX
0Gxtdgf+NOlt2Yc59onwnfYuBU7k+VWAgxK9UP1APSJRyUA8JwoUmUhOGu75Wbin
uUyCApb7Kmj1kkvWw9exigqwQwyrEKJHjWDGlnzKmozt4WjVjEWW61BaAyly54aT
IPUir2fox180Tx7BkFdM3SmUAO0CVtxoH64E8AnXCwuqnKGirgLof8jAZMxGgnaj
O0alMeVR90pU99R/s3OoNFB3FHwb4xsiNCXz/1eUcD1iN/tUOiI5urYsmgi/5HKw
jqIFQoa/9PXbGCgblD7oOUZGYxaFQv7AQkj4lBxw3IP/NDZU1DgrZN3YIkwiXwNM
3dSs3Y7iw0unzCSXidDYUaxDNrub9A==
=5+8n
-----END PGP SIGNATURE-----

--Sig_/n0RbQghcvDC=ieBcA8WQy2v--