| commit | 6a23b45f1d4b9961e9bf38bc9fb64dc154272abf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Apr 12 10:56:12 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Apr 12 10:56:12 2015 -0700 |
| tree | fc4ae9cc3a3306743137fea42c463c01090b0e4c | |
| parent | 54d8ccc30270586f869bfb46ff8a8ca330c8aa23 [diff] | |
| parent | 64b4e2526d1cf6e6a4db6213d6e2b6e6ab59479a [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull vfs and fs fixes from Al Viro: "Several AIO and OCFS2 fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: ocfs2: _really_ sync the right range ocfs2_file_write_iter: keep return value and current position update in sync [regression] ocfs2: do *not* increment ->ki_pos twice ioctx_alloc(): fix vma (and file) leak on failure fix mremap() vs. ioctx_kill() race