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

[Stephen Rothwell]

Hi all,

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

  fs/coredump.c

between commit:

  8a3cc755b138 ("coredump: don't bother with do_truncate()")

from the vfs tree and commit:

  643fe55a0679 ("open: handle idmapped mounts in do_truncate()")

from the pidfd tree.

I fixed it up (the former removes dump_truncate(), so I did that) 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: pgpHhFzcu9hyp.pgp
Description: OpenPGP digital signature