From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Jun 2018 18:01:28 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: microblaze-v4.18-rc3~136
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=325e14f97e0c92735d10d9922cbb73ad521de4c4;p=linux-2.6-microblaze.git

Merge branch 'fixes' of git://git./linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro.

 - fix io_destroy()/aio_complete() race

 - the vfs_open() change to get rid of open_check_o_direct() boilerplate
   was nice, but buggy. Al has a patch avoiding a revert, but that's
   definitely not a last-day fodder, so for now revert it is...

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  Revert "fs: fold open_check_o_direct into do_dentry_open"
  fix io_destroy()/aio_complete() race
---

325e14f97e0c92735d10d9922cbb73ad521de4c4