]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kvack.org/~bcrl/aio-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Nov 2013 16:42:14 +0000 (08:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Nov 2013 16:42:14 +0000 (08:42 -0800)
commit26b57b282ecb58f8c728725af09576a9255441b2
treec2a555e704cb71d56611c9ef7be03089d1ec03f4
parentb164e2aa92a6a055f142f864a6509ccdc22672a5
parent6ffd6fd5e9c9d196cd61ed2b5faafacf593125f2
Merge git://git.kvack.org/~bcrl/aio-next

Pull aio fixes from Benjamin LaHaise.

* git://git.kvack.org/~bcrl/aio-next:
  aio: nullify aio->ring_pages after freeing it
  aio: prevent double free in ioctx_alloc
  aio: Fix a trinity splat
fs/aio.c