From: Thomas Gleixner Date: Mon, 22 Feb 2021 09:59:13 +0000 (+0100) Subject: Merge tag 'timers-v5.11-rc5' of https://git.linaro.org/people/daniel.lezcano/linux... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8acb54abc1db4e1e3913359e4108e04e88ce4d92;p=linux.git Merge tag 'timers-v5.11-rc5' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent Pull clockevent fixes from Daniel Lezcano - Fix harmless warning with the ixp4xx when the TIMER_OF option is not selected (Arnd Bergmann) - Make sure channel clock supply is enabled on sh_cmt (Geert Uytterhoeven) - Fix compilation error when DEBUG is defined with the mxs_timer (Tom Rix) Link: https://lore.kernel.org/r/ae3bcda6-5180-639d-6246-d2dfd271c3e7@linaro.org --- 8acb54abc1db4e1e3913359e4108e04e88ce4d92