Merge branch 'for-4.15/timer' into for-linus

Post initial pull timer related changes for block drivers. Not merged
with the first pull, since they were dependent on this commit in
mainline:

commit 686fef928b
Author: Kees Cook <keescook@chromium.org>
Date:   Thu Sep 28 06:38:17 2017 -0700

    timer: Prepare to change timer callback argument type
This commit is contained in:
Jens Axboe 2017-11-15 08:15:50 -07:00
commit 4358a844fc
10 changed files with 70 additions and 80 deletions