]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
fs/aio.c patch | diff1 | diff2 | blob | history

diff --cc fs/aio.c
Simple merge
Linux kernel for KaRo TX COM modules