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

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

Merge "defconfig: msm8937: Enable FBE config flag for f2fs"

parents 3a550e35 25eae00a

arch/arm/configs/msm8937-perf_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -598,6 +598,7 @@ CONFIG_EXT4_FS=y 
CONFIG_EXT4_FS_SECURITY=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y
@@ -631,13 +632,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/msm8937_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ CONFIG_EXT4_FS=y 
CONFIG_EXT4_FS_SECURITY=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y
@@ -699,13 +700,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