Merge git://git.kvack.org/~bcrl/aio-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Apr 2014 23:36:50 +0000 (16:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Apr 2014 23:36:50 +0000 (16:36 -0700)
commita63b747b41d6f6c9116fb2260381a3c96fe5dc02
tree22edfda79990a5b674646605ba6b723447032602
parent3123bca71993c2346a458875488863772c1d5dc4
parentfa8a53c39f3fdde98c9eace6a9b412143f0f6ed6
Merge git://git.kvack.org/~bcrl/aio-next

Pull aio ctx->ring_pages migration serialization fix from Ben LaHaise.

* git://git.kvack.org/~bcrl/aio-next:
  aio: v4 ensure access to ctx->ring_pages is correctly serialised for migration