From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>,
Jaegeuk Kim <jaegeuk@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the crypto tree with the f2fs tree
Date: Mon, 22 Feb 2016 11:25:47 +1100 [thread overview]
Message-ID: <20160222112547.0725e0d4@canb.auug.org.au> (raw)
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in:
fs/crypto/fname.c
fs/f2fs/crypto.c
fs/f2fs/crypto_fname.c
fs/f2fs/crypto_key.c
fs/f2fs/f2fs_crypto.h
between commits:
a72fe9cddb78 ("fs crypto: add fname.c to support filename encryption")
ace7045bd954 ("f2fs crypto: migrate into vfs's crypto engine")
from the f2fs tree and commit:
2731a944f651 ("f2fs: Use skcipher")
from the crypto tree.
I fixed it up (the f2fs tree deleted all the f2fs files and created
fs/crypto/fname.c so I did the same) and can carry the fix as necessary.
Someone should have a good look at these changes and try to come up with
a better solution.
--
Cheers,
Stephen Rothwell
reply other threads:[~2016-02-22 0:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20160222112547.0725e0d4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=herbert@gondor.apana.org.au \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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