From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Dec 2013 19:03:49 +0000 (-0800)
Subject: Merge git://git.kvack.org/~bcrl/aio-next
X-Git-Tag: v3.13-rc5~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8472b4bb1aaa421b10f2cc40f70097e67f971ae;p=pandora-kernel.git

Merge git://git.kvack.org/~bcrl/aio-next

Pull AIO leak fixes from Ben LaHaise:
 "I've put these two patches plus Linus's change through a round of
  tests, and it passes millions of iterations of the aio numa
  migratepage test, as well as a number of repetitions of a few simple
  read and write tests.

  The first patch fixes the memory leak Kent introduced, while the
  second patch makes aio_migratepage() much more paranoid and robust"

* git://git.kvack.org/~bcrl/aio-next:
  aio/migratepages: make aio migrate pages sane
  aio: fix kioctx leak introduced by "aio: Fix a trinity splat"
---

a8472b4bb1aaa421b10f2cc40f70097e67f971ae