linux-next: manual merge of the f2fs tree with the fscrypt tree

From: Stephen Rothwell
Date: Tue Feb 14 2017 - 17:51:13 EST

Hi Jaegeuk,

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


between commit:

a5d431eff2e0 ("fscrypt: make fscrypt_operations.key_prefix a string")

from the fscrypt tree and commit:

aacf533a90a7 ("f2fs: super: constify fscrypt_operations structure")

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.

Stephen Rothwell

diff --cc fs/f2fs/super.c
index 503c3b7fa053,8a02d747fa97..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -1170,9 -1207,9 +1201,9 @@@ static unsigned f2fs_max_namelen(struc
inode->i_sb->s_blocksize : F2FS_NAME_LEN;

- static struct fscrypt_operations f2fs_cryptops = {
+ static const struct fscrypt_operations f2fs_cryptops = {
+ .key_prefix = "f2fs:",
.get_context = f2fs_get_context,
- .key_prefix = f2fs_key_prefix,
.set_context = f2fs_set_context,
.is_encrypted = f2fs_encrypted_inode,
.empty_dir = f2fs_empty_dir,