[SRU][N:linux-nvidia-6.14][PATCH] UBUNTU: [Config] enable MEMCG_V1 and CPUSETS_V1 on Noble 6.14+

[Krister Johansen]

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

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

There is still plently of workloads that require v1 support. The 6.8
kernel still supports v1. Re-enable v1 support on linux-nvidia-6.14 too.

Set CONFIG_CPUSETS_V1 and CONFIG_MEMCG_V1 to y.

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

diff --git a/debian.nvidia-6.14/config/annotations b/debian.nvidia-6.14/config/annotations
index 7ba15b778d3d6..c0ea70b255ee6 100644
--- a/debian.nvidia-6.14/config/annotations
+++ b/debian.nvidia-6.14/config/annotations
@@ -87,6 +87,9 @@ CONFIG_CORESIGHT_TPDM                           note<'Required for Grace enablem
 CONFIG_CORESIGHT_TRBE                           policy<{'arm64': 'm'}>
 CONFIG_CORESIGHT_TRBE                           note<'Required for Grace enablement'>
 
+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 Noble kernels 6.12+ -- LP: #2122368'>
+
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND            policy<{'arm64': 'n'}>
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND            note<'LP: #2028576: Perf governor required for NVIDIA workloads'>
 
@@ -132,6 +135,9 @@ CONFIG_LEDS_AAEON                               note<'Disable all Ubuntu ODM dri
 CONFIG_MANA_INFINIBAND                          policy<{'amd64': 'm', 'arm64': 'm'}>
 CONFIG_MANA_INFINIBAND                          note<'LP: #2084598'>
 
+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 Noble kernels 6.12+ -- LP: #2122368'>
+
 CONFIG_MFD_AAEON                                policy<{'amd64': '-'}>
 CONFIG_MFD_AAEON                                note<'Disable all Ubuntu ODM drivers'>
 
-- 
2.43.0