| commit | a311c480384c5aa9aaae195b89c3ec89c3b66379 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 14 19:43:27 2014 -0500 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 14 19:43:27 2014 -0500 |
| tree | 9e3f141bb7649278e0fe30e68d965f2243c32bb9 | |
| parent | 05064084e82d057f8d74590c51581650e060fbb8 [diff] | |
| parent | fa88b6f8803c87c4ced5aac11261ced7cedaa05e [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