kernel/v5.15: Enable CONFIG_SECURITY_CONTAINER_MONITOR for 5.15 kernel.
BUG=b/234891442
TEST=presubmit, validation
RELEASE_NOTE=None
Signed-off-by: Meena Shanmugam<meenashanmugam@google.com>
Change-Id: I79377ee7b89a05a906ae70bc154b51d6f9f796b6
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/34360
Reviewed-by: Ken Hofsass <hofsass@google.com>
Reviewed-by: Oleksandr Tymoshenko <ovt@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/arch/x86/configs/lakitu_defconfig b/arch/x86/configs/lakitu_defconfig
index cd8ab4f..b15f181 100644
--- a/arch/x86/configs/lakitu_defconfig
+++ b/arch/x86/configs/lakitu_defconfig
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.45 Kernel Configuration
+# Linux/x86_64 5.15.51 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="Chromium OS 14.0_pre437112_p20211208-r9 clang version 14.0.0 (/var/tmp/portage/sys-devel/llvm-14.0_pre437112_p20211208-r9/work/llvm-14.0_pre437112_p20211208/clang 79d58b4d3017d159bf09a77398c9a116128de193)"
+CONFIG_CC_VERSION_TEXT="Chromium OS 14.0_pre445002_p20220217-r1 clang version 14.0.0 (/var/tmp/portage/sys-devel/llvm-14.0_pre445002_p20220217-r1/work/llvm-14.0_pre445002_p20220217/clang 18308e171b5b1dd99627a4d88c7d6c5ff21b8c96)"
CONFIG_GCC_VERSION=0
CONFIG_CC_IS_CLANG=y
CONFIG_CLANG_VERSION=140000
@@ -626,6 +626,7 @@
# Binary Emulations
#
CONFIG_IA32_EMULATION=y
+# CONFIG_X86_X32 is not set
CONFIG_COMPAT_32=y
CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
@@ -3358,6 +3359,8 @@
CONFIG_SECURITY_LOADPIN=y
CONFIG_SECURITY_LOADPIN_ENFORCE=y
CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_CONTAINER_MONITOR=y
+# CONFIG_SECURITY_CONTAINER_MONITOR_DEBUG is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_LOCKDOWN_LSM=y
# CONFIG_SECURITY_LOCKDOWN_LSM_EARLY is not set
@@ -3375,7 +3378,6 @@
CONFIG_IMA=y
CONFIG_IMA_MEASURE_PCR_IDX=10
CONFIG_IMA_LSM_RULES=y
-# CONFIG_IMA_TEMPLATE is not set
CONFIG_IMA_NG_TEMPLATE=y
# CONFIG_IMA_SIG_TEMPLATE is not set
CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
@@ -3675,6 +3677,7 @@
CONFIG_CRYPTO_LIB_SHA256=y
# end of Crypto library routines
+CONFIG_LIB_MEMNEQ=y
CONFIG_CRC_CCITT=y
CONFIG_CRC16=y
CONFIG_CRC_T10DIF=y
@@ -3791,8 +3794,6 @@
# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
CONFIG_DEBUG_INFO_DWARF4=y
CONFIG_DEBUG_INFO_BTF=y
-CONFIG_PAHOLE_HAS_SPLIT_BTF=y
-CONFIG_DEBUG_INFO_BTF_MODULES=y
# CONFIG_GDB_SCRIPTS is not set
CONFIG_FRAME_WARN=2048
# CONFIG_STRIP_ASM_SYMS is not set
