From d8d95b92f514be8543e77c8fd90b1708a0111c9b Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@fedoraproject.org>
Date: Fri, 23 Oct 2015 11:39:20 -0700
Subject: [PATCH] Enable CONFIG_FS_DAX (rhbz 1274844)

---
 config-generic | 3 ++-
 kernel.spec    | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config-generic b/config-generic
index 0f339eb2d..933fdb641 100644
--- a/config-generic
+++ b/config-generic
@@ -392,6 +392,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_BLK_DEV_RAM_DAX=y
 
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -4364,7 +4365,7 @@ CONFIG_AUTOFS4_FS=y
 # CONFIG_EXOFS_FS is not set
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_NILFS2_FS=m
-# CONFIG_FS_DAX is not set
+CONFIG_FS_DAX=y
 # CONFIG_LOGFS is not set
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
diff --git a/kernel.spec b/kernel.spec
index 0e05441da..51c0591bd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2032,6 +2032,9 @@ fi
 #
 # 
 %changelog
+* Fri Oct 23 2015 Laura Abbott <labbott@redhat.com>
+- Enable CONFIG_FS_DAX (rhbz 1274844)
+
 * Fri Oct 23 2015 Laura Abbott <labbott@redhat.com> - 4.3.0-0.rc6.git3.1
 - Linux v4.3-rc6-232-g0386729