projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0506408 fa88b6f)
Merge git://git.kvack.org/~bcrl/aio-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Jun 2014 00:43:27 +0000 (19:43 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Jun 2014 00:43:27 +0000 (19:43 -0500)
commita311c480384c5aa9aaae195b89c3ec89c3b66379
tree9e3f141bb7649278e0fe30e68d965f2243c32bb9tree | snapshot (tar.gz zip)
parent05064084e82d057f8d74590c51581650e060fbb8commit | diff
parentfa88b6f8803c87c4ced5aac11261ced7cedaa05ecommit | diff
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
fs/aio.c diff1 | diff2 | blob | history