From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Apr 2015 17:56:12 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: firefly_0821_release~176^2~2038
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6a23b45f1d4b9961e9bf38bc9fb64dc154272abf;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./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
---

6a23b45f1d4b9961e9bf38bc9fb64dc154272abf