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

[Stephen Rothwell]

Hi all,

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

  fs/fuse/inode.c

between commit:

  1458e5e9f99a ("fuse: extract fuse_fill_super_common()")

from the fuse tree and commit:

  2ad9ab0f7429 ("vfs: Convert fuse to use the new mount API")
  48ceb15f98c8 ("vfs: Move the subtype parameter into fuse")

from the vfs tree.

This is too much to work out, so I have effectively reverted the 2 vfs
tree commits.

I fixed it up (see above) 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: pgpdbC6BdCmLN.pgp
Description: OpenPGP digital signature