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

[Stephen Rothwell]

Hi all,

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

  include/uapi/linux/fuse.h

between commit:

  7d37539037c2 ("fuse: implement ->tmpfile()")

from Linus' tree and commit:

  22fb2e02a194 ("fuse: add "expire only" mode to FUSE_NOTIFY_INVAL_ENTRY")

from the fuse 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 include/uapi/linux/fuse.h
index 76ee8f9e024a,1688fdea550f..000000000000
--- a/include/uapi/linux/fuse.h
+++ b/include/uapi/linux/fuse.h
@@@ -196,7 -196,7 +196,8 @@@
   *  - add FUSE_HAS_INODE_DAX, FUSE_ATTR_DAX
   *
   *  7.37
 + *  - add FUSE_TMPFILE
+  *  - add FUSE_EXPIRE_ONLY flag to fuse_notify_inval_entry
   */
  
  #ifndef _LINUX_FUSE_H

Attachment: pgpeAEyb6kB6F.pgp
Description: OpenPGP digital signature