From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Jun 2014 00:43:27 +0000 (-0500)
Subject: Merge git://git.kvack.org/~bcrl/aio-next
X-Git-Tag: firefly_0821_release~176^2~3744
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a311c480384c5aa9aaae195b89c3ec89c3b66379;p=firefly-linux-kernel-4.4.55.git

Merge git://git.kvack.org/~bcrl/aio-next

Pull aio fix and cleanups from Ben LaHaise:
 "This consists of a couple of code cleanups plus a minor bug fix"

* git://git.kvack.org/~bcrl/aio-next:
  aio: cleanup: flatten kill_ioctx()
  aio: report error from io_destroy() when threads race in io_destroy()
  fs/aio.c: Remove ctx parameter in kiocb_cancel
---

a311c480384c5aa9aaae195b89c3ec89c3b66379