linux-kernel - linux-next: manual merge of the crypto tree with the f2fs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20160222112547.0725e0d4@canb.auug.org.au>
Date:	Mon, 22 Feb 2016 11:25:47 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Herbert Xu <herbert@...dor.apana.org.au>,
	Jaegeuk Kim <jaegeuk@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-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