From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Dec 2021 18:07:50 +0000 (-0800)
Subject: Merge tag 'timers-urgent-2021-12-12' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: iomap-folio-5.17e~28
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c7fc51268bc09c5f012f5e35e872f4e319f95f80;p=users%2Fwilly%2Flinux.git

Merge tag 'timers-urgent-2021-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "Two fixes for clock chip drivers:

   - A regression fix for the Designware APB timer. A recent change to
     the error checking code transformed the error condition wrongly so
     it turned into a fail if good condition.

   - Fix a clang build fail of the ARM architected timer driver"

* tag 'timers-urgent-2021-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/arm_arch_timer: Force inlining of erratum_set_next_event_generic()
  clocksource/drivers/dw_apb_timer_of: Fix probe failure
---

c7fc51268bc09c5f012f5e35e872f4e319f95f80