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

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

Merge "defconfig: sdm670: Enable config flag for File based Encryption"

parents 7cb268dc 703d80aa

arch/arm64/configs/sdm670-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -571,6 +571,9 @@ CONFIG_EXT2_FS=y 
CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_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
@@ -602,13 +605,13 @@ CONFIG_CORESIGHT_CTI=y 
CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_CORESIGHT_DUMMY=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=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/arm64/configs/sdm670_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -589,6 +589,9 @@ CONFIG_EXT2_FS=y 
CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_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_FUSE_FS=y
@@ -666,13 +669,13 @@ CONFIG_CORESIGHT_EVENT=y 
CONFIG_CORESIGHT_TGU=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_CORESIGHT_DUMMY=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=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