lkml.org 
[lkml]   [2016]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the crypto tree with the f2fs tree
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

\
 
 \ /
  Last update: 2016-02-22 01:41    [W:0.207 / U:0.640 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site