[linux] 02/07: vfs,nvdimm: Really enable FS_DAX

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit aea9926d19b0d66f506534b84ea631cf178e1a1f
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Feb 10 01:37:22 2016 +0000

    vfs,nvdimm: Really enable FS_DAX
---
 debian/changelog                   | 1 +
 debian/config/armel/config.marvell | 5 +++++
 debian/config/config               | 1 +
 3 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 321d472..7e81748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,7 @@ linux (4.4.1-1~exp1) UNRELEASED; urgency=medium
   * sound/firewire: Enable SND_FIREWIRE_DIGI00X, SND_FIREWIRE_TASCAM as modules
   * [x86] thermal: Enable INTEL_PCH_THERMAL, INTEL_SOC_DTS_THERMAL as modules
   * [x86] Enable INTEL_PMC_IPC as module
+  * vfs,nvdimm: Really enable FS_DAX
 
  -- Ian Campbell <ijc at debian.org>  Sat, 23 Jan 2016 08:23:05 +0000
 
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 8811ca0..22392dd 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -663,6 +663,11 @@ CONFIG_FB=m
 CONFIG_ORION_WATCHDOG=m
 
 ##
+## file: fs/Kconfig
+##
+# CONFIG_FS_DAX is not set
+
+##
 ## file: init/Kconfig
 ##
 #. Saves about 7K
diff --git a/debian/config/config b/debian/config/config
index 8e038eb..1be27ed 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4940,6 +4940,7 @@ CONFIG_XEN_MCE_LOG=y
 ##
 ## file: fs/Kconfig
 ##
+CONFIG_FS_DAX=y
 CONFIG_FILE_LOCKING=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git