linux-next: manual merge of the execve tree with Linus' tree

linux-next: manual merge of the execve tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1219 bytes --]

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 else")

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.

-- 
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;
  }
  
- /*
-  * 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;
  
  	retval = prepare_bprm_creds(bprm);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]