evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build fix for 076c36fce1.

Browse source 
Bug: 116008047
Change-Id: I053866f49e1ec090fde9a6fbf19a34c5e4e6e8e3
Signed-off-by: Alistair Strachan <astrachan@google.com>
This commit is contained in:
Alistair Strachan 2018-10-22 19:15:22 -07:00
parent ced713fdd6
commit fd73fe9853
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; int keysize;
bool logged_impl_name; bool logged_impl_name;
} available_modes[] = { } available_modes[] = {
<<<<<<< HEAD
[FS_ENCRYPTION_MODE_AES_256_XTS] = { [FS_ENCRYPTION_MODE_AES_256_XTS] = {
.friendly_name = "AES-256-XTS", .friendly_name = "AES-256-XTS",
.cipher_str = "xts(aes)", .cipher_str = "xts(aes)",