diff options
| -rw-r--r-- | fs/crypto/keyinfo.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index b13e968273a4..3cbe0eff8767 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -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)", |