summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/file.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-10 02:38:34 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-10 02:38:34 +0100
commit123a28d8b522b03dd97c1f791245924088616ac0 (patch)
treecda2f2b6ea4f4f31e0d23cb21b519ebf73cad82d /fs/gfs2/file.c
parentMerge branch 'parisc-4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentext2: Add locking for DAX faults (diff)
downloadlinux-123a28d8b522b03dd97c1f791245924088616ac0.tar.xz
linux-123a28d8b522b03dd97c1f791245924088616ac0.zip
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
Diffstat (limited to 'fs/gfs2/file.c')
0 files changed, 0 insertions, 0 deletions