Hi all,

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

  fs/fuse/dir.c

between commit:

  e24b7a3b70ae ("fuse: make args->in_args[0] to be always the header")

from the fuse tree and commit:

  d6726de37cbf ("fuse_dentry_revalidate(): use stable parent inode and name passed by caller")

from the vfs 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 be693a8a1010,3019bc1d9f9d..000000000000
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@@ -175,10 -175,11 +175,12 @@@ static void fuse_lookup_init(struct fus
  	memset(outarg, 0, sizeof(struct fuse_entry_out));
  	args->opcode = FUSE_LOOKUP;
  	args->nodeid = nodeid;
--	args->in_numargs = 2;
 -	args->in_args[0].size = name->len;
 -	args->in_args[0].value = name->name;
 -	args->in_args[1].size = 1;
 -	args->in_args[1].value = "";
++	args->in_numargs = 3;
 +	fuse_set_zero_arg0(args);
- 	args->in_args[1].size = name->len + 1;
++	args->in_args[1].size = name->len;
 +	args->in_args[1].value = name->name;
++	args->in_args[2].size = 1;
++	args->in_args[2].value = "";
  	args->out_numargs = 1;
  	args->out_args[0].size = sizeof(struct fuse_entry_out);
  	args->out_args[0].value = outarg;