[tip: timers/urgent] Merge tag 'timers-v5.11-rc5' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

From: tip-bot2 for Thomas Gleixner
Date: Mon Feb 22 2021 - 05:10:06 EST


The following commit has been merged into the timers/urgent branch of tip:

Commit-ID: 8acb54abc1db4e1e3913359e4108e04e88ce4d92
Gitweb: https://git.kernel.org/tip/8acb54abc1db4e1e3913359e4108e04e88ce4d92
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Mon, 22 Feb 2021 10:59:13 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Mon, 22 Feb 2021 10:59:13 +01:00

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@xxxxxxxxxx
---