commit | 123a28d8b522b03dd97c1f791245924088616ac0 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 09 17:38:34 2015 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 09 17:38:34 2015 -0800 |
tree | cda2f2b6ea4f4f31e0d23cb21b519ebf73cad82d | |
parent | 373ee21eecebc5c06786a803d99661a3657afcc7 [diff] | |
parent | 5726b27b09cc92452b543764899a07e7c8037edd [diff] |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs Pull ext2 fix from Jan Kara: "Fix for DAX on ext2" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: ext2: Add locking for DAX faults