linux-next: manual merge of the f2fs tree with the vfs-idmapping tree

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

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

Hi all,

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

  fs/f2fs/namei.c

between commit:

  f2d40141d5d9 ("fs: port inode_init_owner() to mnt_idmap")

from the vfs-idmapping tree and commit:

  8abe4be45132 ("f2fs: remove unneeded f2fs_cp_error() in f2fs_create_whiteout()")

from the f2fs 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/f2fs/namei.c
index d8e01bbbf27f,82923273f4bb..000000000000
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@@ -923,13 -923,10 +923,10 @@@ static int f2fs_tmpfile(struct mnt_idma
  	return finish_open_simple(file, err);
  }
  
 -static int f2fs_create_whiteout(struct user_namespace *mnt_userns,
 +static int f2fs_create_whiteout(struct mnt_idmap *idmap,
  				struct inode *dir, struct inode **whiteout)
  {
- 	if (unlikely(f2fs_cp_error(F2FS_I_SB(dir))))
- 		return -EIO;
- 
 -	return __f2fs_tmpfile(mnt_userns, dir, NULL,
 +	return __f2fs_tmpfile(idmap, dir, NULL,
  				S_IFCHR | WHITEOUT_MODE, true, whiteout);
  }
  

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