sugar/linux
1
0
Fork 0
Code Activity

Orangefs: merge to v4.5

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

Linux 4.5
This commit is contained in:
Mike Marshall
2016-03-14 15:39:42 -04:00
parent acfcbaf192 b562e44f50
commit ab6652524a
10618 changed files with 531671 additions and 239602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/Kconfig
View File

@@ -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"