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

[Stephen Rothwell]

Hi all,

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

  fs/f2fs/xattr.c

between commit:

  8874ad7dae8d ("f2fs: fix to update i_ctime in __f2fs_setxattr()")

from the f2fs tree and commit:

  c62ebd3501cc ("f2fs: convert to ctime accessor functions")

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/f2fs/xattr.c
index 9cc1ca75b2da,4ae93e1df421..000000000000
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@@ -766,8 -767,7 +766,8 @@@ same
  		clear_inode_flag(inode, FI_ACL_MODE);
  	}
  
- 	inode->i_ctime = current_time(inode);
++	inode_set_ctime_current(inode);
 +	f2fs_mark_inode_dirty_sync(inode, true);
  exit:
  	kfree(base_addr);
  	return error;

Attachment: pgpDyLzAYoVoi.pgp
Description: OpenPGP digital signature