[SRU][N:hwe-6.14][PATCH v2 1/1] UBUNTU: [Config] enable MEMCG_V1 and CPUSETS_V1 on Noble HWE

[Krister Johansen]

BugLink: https://bugs.launchpad.net/bugs/2122368

Re-enable cgroup v1 support for Noble HWE. Starting in 6.12, cgroup v1
support was placed behind CONFIG_CPUSETS_V1 and CONFIG_MEMCG_V1 which
defaults to n.

There are still plently of workloads that require v1 support. The 6.8
kernel still supports v1. Re-enable v1 support on 6.14 HWE.

Set CONFIG_CPUSETS_V1 and CONFIG_MEMCG_V1 to y.

Signed-off-by: Krister Johansen <kjlx at templeofstupid.com>
---
 debian.hwe-6.14/config/annotations | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian.hwe-6.14/config/annotations b/debian.hwe-6.14/config/annotations
index 2b0fd039949d..09e1acdce9ce 100644
--- a/debian.hwe-6.14/config/annotations
+++ b/debian.hwe-6.14/config/annotations
@@ -5,6 +5,12 @@
 
 include "../../debian.master/config/annotations"
 
+CONFIG_CPUSETS_V1                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
+CONFIG_CPUSETS_V1                               note<'Leave cpuset v1 enabled on HWE kernels 6.12+ -- LP: #2122368'>
+
+CONFIG_MEMCG_V1                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
+CONFIG_MEMCG_V1                                 note<'Leave memcg v1 enabled on HWE kernels 6.12+ -- LP: #2122368'>
+
 
 # ---- Annotations without notes ----
 
-- 
2.43.0