From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 11 Dec 2021 12:56:30 +0000 (+0100)
Subject: Merge tag 'timers-v5.16-rc4' of https://git.linaro.org/people/daniel.lezcano/linux... 
X-Git-Tag: v6.6.17~8633^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa073d8b2a6308832de3cac18e7901ac60748e26;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'timers-v5.16-rc4' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull timer fixes from Daniel Lezcano:

  - Fix build error with clang and some kernel configuration on the
    arm64 architected timer by inlining the
    erratum_set_next_event_generic() function (Marc Zyngier)

  - Fix probe error on the dw_apb_timer_of driver by fixing the
    incorrect condition previously introduced (Alexey Sheplyakov)

Link: https://lore.kernel.org/r/429b796d-9395-4ca8-81f3-30911f80a9a9@linaro.org
---

aa073d8b2a6308832de3cac18e7901ac60748e26