git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae8ac6b 2a8a986)
Merge git://git.kvack.org/~bcrl/aio-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Sep 2017 22:51:11 +0000 (15:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Sep 2017 22:51:11 +0000 (15:51 -0700)
commit2500e287bca1beb313aa298f2d36be1257cbb483
tree21f6233475f07776e37d7dd6bc0a60842697ed68tree
parentae8ac6b7dbfd67f883050421fd195c153d02f5f3commit | diff
parent2a8a98673c13cb2a61a6476153acf8344adfa992commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.