diff options
author | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 14:22:14 -0500 |
---|---|---|
committer | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 14:22:14 -0500 |
commit | 5e1f3938f9e4ef539031d639879cb1cea870fab5 (patch) | |
tree | b262a7c002b05b7bc800a106d6ca6777dabe15bf /fs/Kconfig | |
parent | 1808f8cc6cb2842c53147eccfd5e88044d0d22a6 (diff) | |
parent | afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc (diff) | |
download | linux-stable-5e1f3938f9e4ef539031d639879cb1cea870fab5.tar.gz linux-stable-5e1f3938f9e4ef539031d639879cb1cea870fab5.tar.bz2 linux-stable-5e1f3938f9e4ef539031d639879cb1cea870fab5.zip |
Orangefs: merge with V4.4
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current
Linux 4.4
Diffstat (limited to 'fs/Kconfig')
-rw-r--r-- | fs/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 7d1bef1999af..916d8348705b 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -46,6 +46,12 @@ config FS_DAX or if unsure, say N. Saying Y will increase the size of the kernel by about 5kB. +config FS_DAX_PMD + bool + default FS_DAX + depends on FS_DAX + depends on BROKEN + endif # BLOCK # Posix ACL utility routines |