From 9e441ded2c0f90043e8f19dcfee6d13eb5af89e4 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Fri, 7 Mar 2025 16:46:28 +0100 Subject: [PATCH] coreos-modules: move mana kmod to commonconfig (#2723) This change moves CONFIG_MICROSOFT_MANA=m from amd64_defconfig-6.6 to commonconfig-6.6 to support the MANA network driver on ARM64 instances, too. Signed-off-by: Thilo Fromm --- .../sys-kernel/coreos-modules/files/amd64_defconfig-6.6 | 1 - .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) 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 3351161e15..7ff0ac660f 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 @@ -82,7 +82,6 @@ CONFIG_MEMORY_FAILURE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_MEM_SOFT_DIRTY=y -CONFIG_MICROSOFT_MANA=m CONFIG_MMC_SDHCI_ACPI=m # CONFIG_MOUSE_PS2_LIFEBOOK is not set CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 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 f8a1905706..27561fdd1d 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 @@ -444,6 +444,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_SAS=m CONFIG_MEMCG=y CONFIG_MEMTEST=y +CONFIG_MICROSOFT_MANA=m CONFIG_MINIX_SUBPARTITION=y # CONFIG_MLX4_DEBUG is not set CONFIG_MLX4_EN=m