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-x86_64-generic | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'config-x86_64-generic')

diff --git a/config-x86_64-generic b/config-x86_64-generic
index 82e99a062..0614913aa 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -117,7 +117,7 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 # CONFIG_MOVABLE_NODE is not set
 CONFIG_MEMORY_HOTPLUG=y
-# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 # CONFIG_ARCH_MEMORY_PROBE is not set
 CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set 
@@ -223,8 +223,12 @@ CONFIG_CMA_AREAS=7
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DEVICE=y
 CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
 CONFIG_ND_PFN=m
 
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+
 # Staging
 CONFIG_STAGING_RDMA=y
 CONFIG_INFINIBAND_HFI1=m
-- 
cgit