| commit | 2500e287bca1beb313aa298f2d36be1257cbb483 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 07 15:51:11 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 07 15:51:11 2017 -0700 |
| tree | 21f6233475f07776e37d7dd6bc0a60842697ed68 | |
| parent | ae8ac6b7dbfd67f883050421fd195c153d02f5f3 [diff] | |
| parent | 2a8a98673c13cb2a61a6476153acf8344adfa992 [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