From f780b373a37f19fe8126dbe07f80c507b5d15e9b Mon Sep 17 00:00:00 2001 From: Christian Baumann Date: Fri, 19 Sep 2025 17:11:31 +0200 Subject: [PATCH 1/2] sys-kernel/coreos-modules: enable CONFIG_MEMCG_V1 Signed-off-by: Christian Baumann Signed-off-by: James Le Cuirot --- .../sys-kernel/coreos-modules/files/commonconfig-6.12 | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 index 61fc923249..efc937e08b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 @@ -467,6 +467,7 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_SAS=m CONFIG_MEMCG=y +CONFIG_MEMCG_V1=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_MEMTEST=y From db77f16924f98bc934082f09bee13ddf765cc587 Mon Sep 17 00:00:00 2001 From: Christian Baumann Date: Fri, 19 Sep 2025 17:13:21 +0200 Subject: [PATCH 2/2] Add changelog entry Signed-off-by: Christian Baumann Signed-off-by: James Le Cuirot --- changelog/bugfixes/2025-09-19-kernel-config-memcg-v1.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/bugfixes/2025-09-19-kernel-config-memcg-v1.md diff --git a/changelog/bugfixes/2025-09-19-kernel-config-memcg-v1.md b/changelog/bugfixes/2025-09-19-kernel-config-memcg-v1.md new file mode 100644 index 0000000000..88fbb6e55c --- /dev/null +++ b/changelog/bugfixes/2025-09-19-kernel-config-memcg-v1.md @@ -0,0 +1 @@ +- Enabled `CONFIG_MEMCG_V1` to mitigate cgroupsv1 removal (e.g JVM) ([Flatcar#1884](https://github.com/flatcar/Flatcar/issues/1884))