From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Feb 2021 22:11:36 +0000 (-0800)
Subject: Merge tag 'timers-urgent-2021-02-22' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~1682
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4aa364443d023fab08c9dd4fe6785e8b73f6eaeb;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'timers-urgent-2021-02-22' of git://git./linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "A small set of clockevent fixes which fell through the cracks before
  the 5.11 release:

   - Ensure a clock is enabled on sh_cmt

   - Trivial compile fail and compile warning fixes"

* tag 'timers-urgent-2021-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/mxs_timer: Add missing semicolon when DEBUG is defined
  clocksource/drivers/sh_cmt: Make sure channel clock supply is enabled
  clocksource/drivers/ixp4xx: Select TIMER_OF when needed
---

4aa364443d023fab08c9dd4fe6785e8b73f6eaeb