From 42d2805cbe603c4665670101f6a676eb0dd07abe Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Wed, 25 May 2016 11:13:52 -0400
Subject: Linux v4.6-10203-g84787c572d40

- Enable CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE (rhbz 1339281)
- Fixup SB patchset to work with upstream changes
---
 config-powerpc64-generic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config-powerpc64-generic')

diff --git a/config-powerpc64-generic b/config-powerpc64-generic
index 32fa17ff9..af4bbb251 100644
--- a/config-powerpc64-generic
+++ b/config-powerpc64-generic
@@ -56,7 +56,7 @@ CONFIG_PPC_64K_PAGES=y
 CONFIG_PPC_SUBPAGE_PROT=y
 CONFIG_SCHED_SMT=y
 CONFIG_MEMORY_HOTPLUG=y
-# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
 
-- 
cgit