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

Commit fed0967f 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 3c0a43c7 a8bc5748

arch/arm64/configs/msm8937-perf_defconfig

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

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA=y
@@ -622,12 +625,12 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_TWOFISH=y

arch/arm64/configs/msm8937_defconfig

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

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA=y
@@ -688,12 +691,12 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_TWOFISH=y

arch/arm64/configs/msm8953-perf_defconfig

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

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA=y
@@ -635,12 +638,12 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_TWOFISH=y

arch/arm64/configs/msm8953_defconfig

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

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA=y
@@ -702,12 +705,12 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_TWOFISH=y