From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Sep 2017 22:51:11 +0000 (-0700)
Subject: Merge git://git.kvack.org/~bcrl/aio-next
X-Git-Tag: v4.14-rc1~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2500e287bca1beb313aa298f2d36be1257cbb483;p=people%2Farne_f%2Fkernel.git

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

Pull aio fix from Ben LaHaise:
 "Improve aio-nr counting on large SMP systems.

  It has been in linux-next for quite some time"

* git://git.kvack.org/~bcrl/aio-next:
  fs: aio: fix the increment of aio-nr and counting against aio-max-nr
---

2500e287bca1beb313aa298f2d36be1257cbb483