Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94ba7ce1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm8953: Enable config flag for File based Encryption"

parents 7e6e6ae1 8129f16f

arch/arm/configs/msm8953-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -595,6 +595,9 @@ CONFIG_SENSORS_SSC=y 
CONFIG_MSM_TZ_LOG=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y
@@ -625,13 +628,13 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

arch/arm/configs/msm8953_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -613,6 +613,9 @@ CONFIG_SENSORS_SSC=y 
CONFIG_MSM_TZ_LOG=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y
@@ -689,13 +692,13 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y