]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-4.15/timer' into for-linus
authorJens Axboe <axboe@kernel.dk>
Wed, 15 Nov 2017 15:15:50 +0000 (08:15 -0700)
committerJens Axboe <axboe@kernel.dk>
Wed, 15 Nov 2017 15:15:50 +0000 (08:15 -0700)
commit861b549d10851014cbc36776ec014f98a298525e
tree96e986c6c8dd214af5eba61a1a26d70f2237d402
parente442104532fe78037b173f2973d4d2800007c4b4
parentfd7c419685c2efcb279b7c49fbf09c41c011dc76
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 38c591290415f922fb2efb6ee2b2f08cf38143e8
Author: Kees Cook <keescook@chromium.org>
Date:   Thu Sep 28 06:38:17 2017 -0700

    timer: Prepare to change timer callback argument type