]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc33ed3 b31d374)
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)
commit80524956adb273ec4543b5e1852471e790d79dd2
tree9e3f141bb7649278e0fe30e68d965f2243c32bb9tree | snapshot
parentdc33ed3c21220cfb5e193d23faf96ba9d1c785b5commit | diff
parentb31d374416702aa52d8271df6e9c17871501dd14commit | 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
Linux Kernel Source Tree.