Received-SPF: pass (google.com: domain of linux-kernel+bounces-32225-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, 22 Jan 2024 11:02:49 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>
Cc: Askar Safin <safinaskar@zohomail.com>, Linus Torvalds
 <torvalds@linux-foundation.org>, 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 execve tree with Linus' tree
Message-ID: <20240122110249.3209c0f6@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/hZ2aOPGhgsIABaJxhpcwnGd";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

  fs/exec.c

between commit:

  978ffcbf00d8 ("execve: open the executable file before doing anything els=
e")

from Linus' tree and commit:

  38132920f430 ("exec: remove useless comment")

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 fs/exec.c
index 8cdd5b2dd09c,d882a6128d4a..000000000000
--- a/fs/exec.c
+++ b/fs/exec.c
@@@ -1826,11 -1804,10 +1826,8 @@@ static int exec_binprm(struct linux_bin
  	return 0;
  }
 =20
- /*
-  * sys_execve() executes a new program.
-  */
 -static int bprm_execve(struct linux_binprm *bprm,
 -		       int fd, struct filename *filename, int flags)
 +static int bprm_execve(struct linux_binprm *bprm)
  {
 -	struct file *file;
  	int retval;
 =20
  	retval =3D prepare_bprm_creds(bprm);

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWtsKkACgkQAVBC80lX
0GxGawf/T4aY33IGdVvnk6ie/UbmubkUb9460FmPD/jk1ty08jJtiTJHBYYSchza
dOqvRMfViwWkFKLGayP9YB3QCPYUUCx9SEM+SkPjXDbsUUyxhf9MWQowXrQrxTW4
UPJp5Z8xyLRavx0KUZFCod1plQ7RmMUnwNbhbpBj3P3PxgQdUUoE+PiZf5R+IAvB
yq8n18xvppf0s2bUqk1yc8vldd8U697ulbULhmD27YxA72KopdbT5mDn5xNOPLKj
ygKZ9Vub41hIzskG0iM7qee5Q9izd/XQiLo+4VGEym67bdVo3+qI9D0POA+Gts02
bj4CkIR2aYLTAoLbuxsyQAfqeqd8Dg==
=VMX3
-----END PGP SIGNATURE-----

--Sig_/hZ2aOPGhgsIABaJxhpcwnGd--