[UNSTABLE][PATCH v2] UBUNTU: [Config] Enable mtune z16

[Dimitri John Ledkov]

Set mtune to z16

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

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
---

 Changes since v1:
 - add annotation note on the tune key with bug number, and future
   advice.

 debian.master/config/annotations          | 5 ++++-
 debian.master/config/config.common.ubuntu | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index bde0eda6c6f0..aedf156bc50d 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -13581,6 +13581,7 @@ CONFIG_MARCH_ZEC12                              policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z13                                policy<{'s390x': 'y'}>
 CONFIG_MARCH_Z14                                policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z15                                policy<{'s390x': 'n'}>
+CONFIG_MARCH_Z16                                policy<{'s390x': 'n'}>
 
 # Menu: Processor type and features >> Support for extended (non-PC) x86 platforms >> Architecture: x86
 CONFIG_X86_NUMACHIP                             policy<{'amd64': 'y'}>
@@ -13650,7 +13651,9 @@ CONFIG_TUNE_Z196                                policy<{'s390x': 'n'}>
 CONFIG_TUNE_ZEC12                               policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z13                                 policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z14                                 policy<{'s390x': 'n'}>
-CONFIG_TUNE_Z15                                 policy<{'s390x': 'y'}>
+CONFIG_TUNE_Z15                                 policy<{'s390x': 'n'}>
+CONFIG_TUNE_Z16                                 policy<{'s390x': 'y'}>
+CONFIG_TUNE_Z16                                 note<LP: #1982833 in general, always pick the newest tune available>
 
 # Menu: Processor type and features >> Virtual address space size >> Architecture: arm64
 CONFIG_ARM64_VA_BITS_39                         policy<{'arm64-generic': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7ee9f98f2716..8b7fcfb3b19a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6137,8 +6137,8 @@ CONFIG_MAPPING_DIRTY_HELPERS=y
 CONFIG_MARCH_Z13=y
 # CONFIG_MARCH_Z14 is not set
 # CONFIG_MARCH_Z15 is not set
-CONFIG_MARCH_Z15_TUNE=y
 # CONFIG_MARCH_Z16 is not set
+CONFIG_MARCH_Z16_TUNE=y
 # CONFIG_MARCH_Z196 is not set
 # CONFIG_MARCH_ZEC12 is not set
 CONFIG_MARVELL_10G_PHY=m
@@ -11978,8 +11978,8 @@ CONFIG_TUNE_GENERIC=y
 # CONFIG_TUNE_Z10 is not set
 # CONFIG_TUNE_Z13 is not set
 # CONFIG_TUNE_Z14 is not set
-CONFIG_TUNE_Z15=y
-# CONFIG_TUNE_Z16 is not set
+# CONFIG_TUNE_Z15 is not set
+CONFIG_TUNE_Z16=y
 # CONFIG_TUNE_Z196 is not set
 # CONFIG_TUNE_ZEC12 is not set
 # CONFIG_TUN_VNET_CROSS_LE is not set
-- 
2.34.1