From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Aug 2014 14:56:27 +0000 (-0600)
Subject: Merge git://git.kvack.org/~bcrl/aio-next
X-Git-Tag: v3.17-rc1~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=da06df548e2b82848bcc32342234d0f04340a41c;p=users%2Fjedix%2Flinux-maple.git

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

Pull aio updates from Ben LaHaise.

* git://git.kvack.org/~bcrl/aio-next:
  aio: use iovec array rather than the single one
  aio: fix some comments
  aio: use the macro rather than the inline magic number
  aio: remove the needless registration of ring file's private_data
  aio: remove no longer needed preempt_disable()
  aio: kill the misleading rcu read locks in ioctx_add_table() and kill_ioctx()
  aio: change exit_aio() to load mm->ioctx_table once and avoid rcu_read_lock()
---

da06df548e2b82848bcc32342234d0f04340a41c