Received-SPF: pass (google.com: domain of linux-kernel+bounces-3004-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Mon, 18 Dec 2023 16:17:04 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>, David Miller <davem@davemloft.net>,
 Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>, Alexey Dobriyan
 <adobriyan@gmail.com>, FUJITA Tomonori <fujita.tomonori@gmail.com>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Trevor Gross <tmgross@umich.edu>
Subject: linux-next: manual merge of the execve tree with the net-next tree
Message-ID: <20231218161704.05c25766@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Sb5s7lOXLc2X.vewol.vAXH";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Sb5s7lOXLc2X.vewol.vAXH
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  MAINTAINERS

between commit:

  cbaa28f970a1 ("MAINTAINERS: add Rust PHY abstractions for ETHERNET PHY LI=
BRARY")

from the net-next tree and commit:

  0a8a952a75f2 ("ELF, MAINTAINERS: specifically mention ELF")

from the execve 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 MAINTAINERS
index 1f53b4c593dd,08278b9ede48..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7919,15 -7797,7 +7919,15 @@@ F:	include/uapi/linux/mdio.
  F:	include/uapi/linux/mii.h
  F:	net/core/of_net.c
 =20
 +ETHERNET PHY LIBRARY [RUST]
 +M:	FUJITA Tomonori <fujita.tomonori@gmail.com>
 +R:	Trevor Gross <tmgross@umich.edu>
 +L:	netdev@vger.kernel.org
 +L:	rust-for-linux@vger.kernel.org
 +S:	Maintained
 +F:	rust/kernel/net/phy.rs
 +
- EXEC & BINFMT API
+ EXEC & BINFMT API, ELF
  R:	Eric Biederman <ebiederm@xmission.com>
  R:	Kees Cook <keescook@chromium.org>
  L:	linux-mm@kvack.org

--Sig_/Sb5s7lOXLc2X.vewol.vAXH
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV/1dAACgkQAVBC80lX
0GywbAf/TOkJk8PIJfMxee5eFdEOj53IKYndCRs1kVkMhFjRf8x7pMknWGqxDXZe
AnY2cmCl4WUCybJbTVOJtt1qTRPYrqzxlqOq3DP+vrGvOWwkk9qoGgtk2v8Vr1hZ
0ErE2gFg4sQJw6HtASMgGILc+DBpFSHT/7pnsvanYA+jzydGRPT6N7GITiZNp5MR
tgkhuIr5Uo39Gs/O1YVaplg6vDcKOZW03faVTMT5vLhm0LxgWm7j/Ygh431tb6Ae
a816ZYP2Q61KBXeAEJt6yY6CPEOcR4OFEIYc8D+Q/3RkdG5UGXLUABlVERBNL7LB
4G6ohj2mzKevAWwNiMgFEBVBH9ctBQ==
=9Kgs
-----END PGP SIGNATURE-----

--Sig_/Sb5s7lOXLc2X.vewol.vAXH--