[F][PATCH 7/7] UBUNTU: [Config] Introducing s390x specific kernel config option CONFIG_ZLIB_DFLTCC

[frank.heimes at canonical.com]

From: Frank Heimes <frank.heimes at canonical.com>

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

This kernel option especially enables zlib deflate improvements based on s390x hardware compression.
The new config option is enabled by default (for s390x).

Signed-off-by: Frank Heimes <frank.heimes at canonical.com>
---
 debian.master/config/annotations               | 3 +++
 debian.master/config/config.common.ubuntu      | 1 +
 debian.master/config/s390x/config.common.s390x | 1 +
 3 files changed, 5 insertions(+)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e70e9f2705c2..8a13e9343b65 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10953,6 +10953,9 @@ CONFIG_GLOB_SELFTEST                            policy<{'amd64': 'n', 'arm64': '
 CONFIG_IRQ_POLL                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_PARMAN                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_STRING_SELFTEST                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_ZLIB_DFLTCC                              policy<{'s390x': 'y'}>
+#
+CONFIG_ZLIB_DFLTCC                              mark<ENFORCED> note<LP:1830208>
 
 # Menu: Library routines >> CRC32 implementation
 CONFIG_CRC32_SLICEBY8                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 19530e384f53..8c84693627f0 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -11527,6 +11527,7 @@ CONFIG_ZD1211RW=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_ZFCP=m
 CONFIG_ZISOFS=y
+CONFIG_ZLIB_DFLTCC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DEVICE=y
 CONFIG_ZONE_DMA=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 1fa06833dc42..2db9a3565c44 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -578,3 +578,4 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
 # CONFIG_YELLOWFIN is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
 CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DFLTCC=Y
-- 
2.25.0