Orangefs: merge to v4.5

Merge tag 'v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current

Linux 4.5

1 files changed, 12 insertions, 1 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 916d8348705b..922893f8ab4a 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -50,7 +50,8 @@ config FS_DAX_PMD
         bool
         default FS_DAX
         depends on FS_DAX
-        depends on BROKEN
+        depends on ZONE_DEVICE
+        depends on TRANSPARENT_HUGEPAGE
 
 endif # BLOCK
 
@@ -73,6 +74,16 @@ config FILE_LOCKING
           for filesystems like NFS and for the flock() system
           call. Disabling this option saves about 11k.
 
+config MANDATORY_FILE_LOCKING
+        bool "Enable Mandatory file locking"
+        depends on FILE_LOCKING
+        default y
+        help
+          This option enables files appropriately marked files on appropriely
+          mounted filesystems to support mandatory locking.
+
+          To the best of my knowledge this is dead code that no one cares about.
+
 source "fs/notify/Kconfig"
 
 source "fs/quota/Kconfig"