From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 23 Oct 2017 18:43:40 +0000 (-0700)
Subject: Merge tag 'v4.14-rc6' into next
X-Git-Tag: v4.15-rc1~117^2^2~28
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=91de76e661a266731fc2889a398ad1694df9d523;p=linux-block.git

Merge tag 'v4.14-rc6' into next

Merge with mainline to bring in the timer API changes.
---

91de76e661a266731fc2889a398ad1694df9d523