From cfaea7dc727cbea3f1150d2f8e9749a167519e32 Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@fedoraproject.org>
Date: Mon, 23 May 2016 11:41:00 -0700
Subject: Linux v4.6-8907-g7639dad

- trace, f2fs, btrfs, rtc, mailbox, akpm, staging, driver core, char, usb,
  tty, clk, net, devicetree, rdma, mfd, iio, powerpc, arm merges
---
 config-s390x | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config-s390x')

diff --git a/config-s390x b/config-s390x
index d1ed636d9..e6e2f85a9 100644
--- a/config-s390x
+++ b/config-s390x
@@ -183,6 +183,7 @@ CONFIG_VIRTIO_CONSOLE=y
 
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_CHSC_SCH=m
 
 # drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now"
-- 
cgit