[SRU][N:linux-gke][PATCH v2 1/1] UBUNTU: [Config] gke: Build multi-gen LRU but leave it disabled

[Ian Whitfield]

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

Multi-gen LRU was previously made unavailable to users due to a bug, but
this prevented users from opting in for their particular workload. This
change makes multi-gen LRU available in the kernel, but disabled by
default, so that users can choose to opt-in without changing default
behavior.

Signed-off-by: Ian Whitfield <ian.whitfield at canonical.com>
---
 debian.gke/config/annotations | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian.gke/config/annotations b/debian.gke/config/annotations
index 2bc2149ac73b..ed8f08978e28 100644
--- a/debian.gke/config/annotations
+++ b/debian.gke/config/annotations
@@ -32,11 +32,11 @@ CONFIG_KERNEL_ZSTD                              note<'LP: #1931725'>
 CONFIG_LOOPBACK_TARGET                          policy<{'amd64': 'm', 'arm64': 'm'}>
 CONFIG_LOOPBACK_TARGET                          note<'Specifically requested by GKE. Must ensure tcm_loop.ko is in default module list'>
 
-CONFIG_LRU_GEN                                  policy<{'amd64': 'n', 'arm64': 'n'}>
-CONFIG_LRU_GEN                                  note<'Requested by GKE, LP: #2084716'>
+CONFIG_LRU_GEN                                  policy<{'amd64': 'y', 'arm64': 'y'}>
+CONFIG_LRU_GEN                                  note<'LP: #2113905'>
 
-CONFIG_LRU_GEN_ENABLED                          policy<{'amd64': '-', 'arm64': '-'}>
-CONFIG_LRU_GEN_ENABLED                          note<'Requested by GKE, LP: #2084716'>
+CONFIG_LRU_GEN_ENABLED                          policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_LRU_GEN_ENABLED                          note<'LP: #2113905'>
 
 CONFIG_NETFILTER_NETLINK_LOG                    policy<{'amd64': 'y', 'arm64': 'y'}>
 CONFIG_NETFILTER_NETLINK_LOG                    note<'initial packaging'>
@@ -217,8 +217,6 @@ CONFIG_KERNEL_GZIP                              policy<{'amd64': 'n', 'arm64': '
 CONFIG_LEDS_AAEON                               policy<{'amd64': '-'}>
 CONFIG_LEDS_BCM63138                            policy<{'arm64': 'm'}>
 CONFIG_LIBCRC32C                                policy<{'amd64': 'y', 'arm64': 'y'}>
-CONFIG_LRU_GEN_STATS                            policy<{'amd64': '-', 'arm64': '-'}>
-CONFIG_LRU_GEN_WALKS_MMU                        policy<{'amd64': '-', 'arm64': '-'}>
 CONFIG_LSM                                      policy<{'amd64': '"landlock,lockdown,yama,integrity,apparmor,bpf"', 'arm64': '"landlock,lockdown,yama,integrity,apparmor,bpf"'}>
 CONFIG_MARVELL_GTI_WDT                          policy<{'arm64': 'm'}>
 CONFIG_MDIO_BCM_IPROC                           policy<{'arm64': 'n'}>
-- 
2.43.0