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

Commit 5edf0c41 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

defconfig: sdm845: Remove config flag for File based Encryption 



This is temporary due to hard conflicts against android-4.9.84.

Changeset below is reverted, hence removal must be reflected
into defconfigs also.

  c23efa56 security: pfk: Error code was overwritten
  7b939265 Enable HW File Based Encryption on ext4 file system

Change-Id: I02210fe8c672f7431b4641bc2a413746792c6028
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent fe5289af

arch/arm64/configs/sdm670-perf_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -573,8 +573,6 @@ 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
@@ -606,7 +604,6 @@ 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

arch/arm64/configs/sdm670_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -592,8 +592,6 @@ 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
@@ -671,7 +669,6 @@ 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

arch/arm64/configs/sdm845-perf_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -572,8 +572,6 @@ 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_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_QUOTA=y
@@ -607,7 +605,6 @@ 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

arch/arm64/configs/sdm845_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -590,8 +590,6 @@ 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_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_QUOTA=y
@@ -673,7 +671,6 @@ 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