]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'timers-v5.16-rc4' of https://git.linaro.org/people/daniel.lezcano/linux...
authorThomas Gleixner <tglx@linutronix.de>
Sat, 11 Dec 2021 12:56:30 +0000 (13:56 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 11 Dec 2021 12:56:30 +0000 (13:56 +0100)
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

Trivial merge