diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-12 19:56:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-12 19:56:12 +0200 |
| commit | 6a23b45f1d4b9961e9bf38bc9fb64dc154272abf (patch) | |
| tree | fc4ae9cc3a3306743137fea42c463c01090b0e4c /security/apparmor/domain.c | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent... (diff) | |
| parent | ocfs2: _really_ sync the right range (diff) | |
| download | linux-6a23b45f1d4b9961e9bf38bc9fb64dc154272abf.tar.xz linux-6a23b45f1d4b9961e9bf38bc9fb64dc154272abf.zip | |
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
Diffstat (limited to 'security/apparmor/domain.c')
0 files changed, 0 insertions, 0 deletions