commit e0076bd8c136c6a11e72a04e6043dda1519f4ce7
author Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 05 20:27:22 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 05 20:27:22 2023 +0000
tree 2788aa51543cd118517629605c3034201a6a4af4
parent f804389a5ded2fff00e5d1ab4b0e73fc66b063e8
parent 5955466946216b2b3157ff1e3ab490dcdb9dd7d2

Merge "merge-upstream/v6.1.32 from branch/tag: upstream/v6.1.32 into branch: cos-6.1" into cos-6.1

arch/arm64/configs/lakitu_defconfig

diff --git a/arch/arm64/configs/lakitu_defconfig b/arch/arm64/configs/lakitu_defconfig
index c896d1c..5848df9 100644
--- a/arch/arm64/configs/lakitu_defconfig
+++ b/arch/arm64/configs/lakitu_defconfig
@@ -3516,7 +3516,7 @@
 # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
 CONFIG_IMA_DEFAULT_HASH_SHA256=y
 CONFIG_IMA_DEFAULT_HASH="sha256"
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 # CONFIG_IMA_READ_POLICY is not set
 CONFIG_IMA_APPRAISE=y
 # CONFIG_IMA_ARCH_POLICY is not set

arch/x86/configs/lakitu_defconfig

diff --git a/arch/x86/configs/lakitu_defconfig b/arch/x86/configs/lakitu_defconfig
index ae33237..3e775bf 100644
--- a/arch/x86/configs/lakitu_defconfig
+++ b/arch/x86/configs/lakitu_defconfig
@@ -3561,7 +3561,7 @@
 # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
 CONFIG_IMA_DEFAULT_HASH_SHA256=y
 CONFIG_IMA_DEFAULT_HASH="sha256"
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 # CONFIG_IMA_READ_POLICY is not set
 CONFIG_IMA_APPRAISE=y
 # CONFIG_IMA_ARCH_POLICY is not set