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

"tip-bot2 for Thomas Gleixner" <tip-bot2@xxxxxxxxxxxxx> · Sat, 11 Dec 2021 13:05:10 -0000

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

Commit-ID:     aa073d8b2a6308832de3cac18e7901ac60748e26
Gitweb:        https://git.kernel.org/tip/aa073d8b2a6308832de3cac18e7901ac60748e26
Author:        Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate:    Sat, 11 Dec 2021 13:56:30 +01:00
Committer:     Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Sat, 11 Dec 2021 13:56:30 +01:00

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