Hi all,

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

  fs/fuse/dir.c

between commits:

  712c587442f3 ("fuse: Return EPERM rather than ENOSYS from link()")
  150b838b03e8 ("fuse: optmize missing FUSE_LINK support")

from the fuse tree and commit:

  bac12649d4e5 ("fuse: return correct dentry for ->mkdir")

from the vfs-brauner 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/fuse/dir.c
index 83c56ce6ad20,516de1ae24dd..000000000000
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@@ -1134,19 -1137,13 +1140,19 @@@ static int fuse_link(struct dentry *ent
  	args.in_args[0].value = &inarg;
  	args.in_args[1].size = newent->d_name.len + 1;
  	args.in_args[1].value = newent->d_name.name;
- 	err = create_new_entry(&invalid_mnt_idmap, fm, &args, newdir, newent, inode->i_mode);
- 	if (!err)
+ 	de = create_new_entry(&invalid_mnt_idmap, fm, &args, newdir, newent, inode->i_mode);
+ 	if (!IS_ERR(de))
  		fuse_update_ctime_in_cache(inode);
- 	else if (err == -EINTR)
+ 	else if (PTR_ERR(de) == -EINTR)
  		fuse_invalidate_attr(inode);
  
- 	if (err == -ENOSYS)
++	if (PTR_ERR(de) == -ENOSYS)
 +		fm->fc->no_link = 1;
 +out:
 +	if (fm->fc->no_link)
 +		return -EPERM;
 +
- 	return err;
+ 	return PTR_ERR(de);
  }
  
  static void fuse_fillattr(struct mnt_idmap *idmap, struct inode *inode,