linux-next: manual merge of the execve tree with the vfs tree

[Stephen Rothwell]

Hi all,

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

  fs/binfmt_elf.c

between commit:

  9a938eba8d28 ("kill coredump_params->regs")

from the vfs tree and commit:

  8f6e3f9e5a0f ("binfmt: Fix whitespace issues")

from the execve tree.

I fixed it up (I just use the former where they conflicted, so may have
lost some white space fixups) 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

Attachment: pgp3yKD9P9PVY.pgp
Description: OpenPGP digital signature