From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel•org>, Theodore Ts'o <tytso@mit•edu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Eric Biggers <ebiggers@google•com>,
Bhumika Goyal <bhumirks@gmail•com>
Subject: linux-next: manual merge of the f2fs tree with the fscrypt tree
Date: Wed, 15 Feb 2017 09:51:04 +1100 [thread overview]
Message-ID: <20170215095104.26b14290@canb.auug.org.au> (raw)
Hi Jaegeuk,
Today's linux-next merge of the f2fs tree got a conflict in:
fs/f2fs/super.c
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.
--
Cheers,
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,
next reply other threads:[~2017-02-14 22:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-14 22:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-05-03 23:40 linux-next: manual merge of the f2fs tree with the fscrypt tree Stephen Rothwell
2018-01-14 22:17 Stephen Rothwell
2018-12-10 23:13 Stephen Rothwell
2019-01-02 0:26 ` Stephen Rothwell
2019-01-02 4:56 ` Chandan Rajendra
2020-05-21 0:30 Stephen Rothwell
2020-07-08 0:38 Stephen Rothwell
2020-08-09 8:44 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170215095104.26b14290@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bhumirks@gmail$(echo .)com \
--cc=ebiggers@google$(echo .)com \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox