[SRU][Zesty][PATCH 1/1] UBUNTU: [Config] CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=n for ppc64el

[Joseph Salisbury]

From: Seth Forshee <seth.forshee at canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1709171

Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
(cherry picked from artful commit 8f189e08c9a0719aa1e615fcb5380ecb9bf12e7f)
Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 +
 debian.master/config/annotations                   | 4 +++-
 debian.master/config/config.common.ubuntu          | 1 -
 debian.master/config/i386/config.common.i386       | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 +
 debian.master/config/s390x/config.common.s390x     | 1 +
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index f8efb58..59f2e88 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -184,6 +184,7 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMSTICK=m
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_MFD_CORE=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f2d3a99..f469357 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10236,10 +10236,12 @@ CONFIG_NUMA                                     note<LP:1543165 LP:1557690>
 
 # 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': 'y', 's390x': 'y'}>
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'y'}>
 CONFIG_MEMORY_HOTREMOVE                         policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_DEFERRED_STRUCT_PAGE_INIT                policy<{'amd64': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_ZONE_DEVICE                              policy<{'amd64': 'y'}>
+#
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            mark<ENFORCED> note<LP:1709171>
 
 # Menu: Processor type and features >> Architecture: arm
 CONFIG_HAVE_ARM_ARCH_TIMER                      policy<{'armhf': 'y'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3df7273..d2a4357 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4773,7 +4773,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MEMORY_ISOLATION=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 4efc75a..a2f8510 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -181,6 +181,7 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMSTICK=m
 CONFIG_MFD_CORE=y
 CONFIG_MFD_JANZ_CMODIO=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 95c05e6..91f8100 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -185,6 +185,7 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEM_SOFT_DIRTY is not set
 CONFIG_MFD_CORE=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 6312b6e..6626c85 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -164,6 +164,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_MEMSTICK is not set
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_MFD_CORE=m
-- 
2.7.4