From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 15 Nov 2017 15:15:50 +0000 (-0700)
Subject: Merge branch 'for-4.15/timer' into for-linus
X-Git-Tag: v4.15-rc1~70^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4358a844fc9f9db7e826b1dfd312af89f9e3c039;p=thirdparty%2Fkernel%2Flinux.git

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 686fef928bba6be13cabe639f154af7d72b63120
Author: Kees Cook <keescook@chromium.org>
Date:   Thu Sep 28 06:38:17 2017 -0700

    timer: Prepare to change timer callback argument type
---

4358a844fc9f9db7e826b1dfd312af89f9e3c039