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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1808 bytes --]

Hi all,

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

  fs/fuse/inode.c

between commit:

  cabdb4fa2f66 ("fuse: use true,false for bool variable")

from the fuse tree and commit:

  76c50219b279 ("fuse: switch to use errorfc() et.al.")

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/inode.c
index 77fef29ebe4f,557611dc2d46..000000000000
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@@ -499,23 -494,23 +494,23 @@@ static int fuse_parse_param(struct fs_c
  
  	case OPT_ROOTMODE:
  		if (!fuse_valid_type(result.uint_32))
- 			return invalf(fc, "fuse: Invalid rootmode");
+ 			return invalfc(fc, "Invalid rootmode");
  		ctx->rootmode = result.uint_32;
 -		ctx->rootmode_present = 1;
 +		ctx->rootmode_present = true;
  		break;
  
  	case OPT_USER_ID:
  		ctx->user_id = make_kuid(fc->user_ns, result.uint_32);
  		if (!uid_valid(ctx->user_id))
- 			return invalf(fc, "fuse: Invalid user_id");
+ 			return invalfc(fc, "Invalid user_id");
 -		ctx->user_id_present = 1;
 +		ctx->user_id_present = true;
  		break;
  
  	case OPT_GROUP_ID:
  		ctx->group_id = make_kgid(fc->user_ns, result.uint_32);
  		if (!gid_valid(ctx->group_id))
- 			return invalf(fc, "fuse: Invalid group_id");
+ 			return invalfc(fc, "Invalid group_id");
 -		ctx->group_id_present = 1;
 +		ctx->group_id_present = true;
  		break;
  
  	case OPT_DEFAULT_PERMISSIONS:

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]