From 0c938d43a944989a09ae6ba48af53cb0837ddf32 Mon Sep 17 00:00:00 2001
From: Kernel Build Daemon <kbuild@suse.de>
Date: May 09 2023 10:20:41 +0000
Subject: Merge branch 'master-vanilla-configs' into linux-next


---

diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 65fa6b1..d521244 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -12417,7 +12417,7 @@ CONFIG_IMA_DEFAULT_HASH="sha256"
 # CONFIG_IMA_WRITE_POLICY is not set
 CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_APPRAISE=y
-CONFIG_IMA_ARCH_POLICY=y
+# CONFIG_IMA_ARCH_POLICY is not set
 # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 CONFIG_IMA_APPRAISE_MODSIG=y
@@ -12427,7 +12427,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 # CONFIG_IMA_LOAD_X509 is not set
 CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
 CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
-CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 # CONFIG_IMA_DISABLE_HTABLE is not set
 CONFIG_EVM=y
 CONFIG_EVM_ATTR_FSUUID=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 9e0b150..8250d60 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -10365,7 +10365,7 @@ CONFIG_IMA_DEFAULT_HASH="sha256"
 # CONFIG_IMA_WRITE_POLICY is not set
 CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_APPRAISE=y
-CONFIG_IMA_ARCH_POLICY=y
+# CONFIG_IMA_ARCH_POLICY is not set
 # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 CONFIG_IMA_APPRAISE_MODSIG=y
@@ -10375,7 +10375,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 # CONFIG_IMA_LOAD_X509 is not set
 CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
 CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
-CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 # CONFIG_IMA_DISABLE_HTABLE is not set
 CONFIG_EVM=y
 CONFIG_EVM_ATTR_FSUUID=y