From 330ebdc579275e42c160df12cfcc027c41a2a1d5 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 15 Apr 2025 14:22:49 +0200 Subject: [PATCH] coreos-modules: Move MEMORY_HOT{PLUG,REMOVE} to common Dependency of ZONE_DEVICE. Signed-off-by: Jeremi Piotrowski --- .../sys-kernel/coreos-modules/files/amd64_defconfig-6.6 | 2 -- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 index 1d171bc519..af07e1a4fe 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 @@ -79,8 +79,6 @@ CONFIG_KVM=m CONFIG_KVM_AMD=m CONFIG_KVM_INTEL=m CONFIG_MEMORY_FAILURE=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTREMOVE=y CONFIG_MEM_SOFT_DIRTY=y CONFIG_MMC_SDHCI_ACPI=m # CONFIG_MOUSE_PS2_LIFEBOOK is not set diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index 1e0e7dd17f..bb489aafe2 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -460,6 +460,8 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_SAS=m CONFIG_MEMCG=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTREMOVE=y CONFIG_MEMTEST=y CONFIG_MICROSOFT_MANA=m CONFIG_MINIX_SUBPARTITION=y