[SRU][Bionic][Disco][Eoan][Patch 1/1] UBUNTU: [Config] Change Config Option CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE for s390x from yes to no

[frank.heimes at canonical.com]

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

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

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 43016a9..22ddb2b 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11165,12 +11165,12 @@ CONFIG_ARM64_PMEM                               policy<{'arm64': 'y'}>
 
 # Menu: Processor type and features >> Allow for memory hot-add
 CONFIG_MEMORY_HOTPLUG                           policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'y'}>
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_MEMORY_HOTREMOVE                         policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_DEFERRED_STRUCT_PAGE_INIT                policy<{'amd64': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_ZONE_DEVICE                              policy<{'amd64': 'y', 'ppc64el': 'y'}>
 #
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            mark<ENFORCED> note<LP:1709171>
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            mark<ENFORCED> note<LP:1709171 LP:1848492>
 
 # Menu: Processor type and features >> Architecture: arm
 CONFIG_HAVE_ARM_ARCH_TIMER                      policy<{'armhf': 'y'}>
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 00e4ce1..afbe49820 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -177,7 +177,7 @@ CONFIG_MD_MULTIPATH=y
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_MEMORY is not set
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_MFD_CORE=m
-- 
2.7.4