github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Build fix for 7977ade69d.

Browse Source 
Bug: 116008047
Change-Id: I053866f49e1ec090fde9a6fbf19a34c5e4e6e8e3
Signed-off-by: Alistair Strachan <astrachan@google.com>
[AmitP: Updated commit message for correct SHA1 hash]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
This commit is contained in:
Alistair Strachan 2018-10-22 19:15:22 -07:00 committed by Amit Pundir
parent 4b20ec3e75
commit 00428ff5a2
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/crypto/keyinfo.c
View File

@ -153,7 +153,6 @@ static struct fscrypt_mode {
int keysize;
bool logged_impl_name;
} available_modes[] = {
<<<<<<< HEAD
[FS_ENCRYPTION_MODE_AES_256_XTS] = {
.friendly_name = "AES-256-XTS",
.cipher_str = "xts(aes)",