From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 May 2021 16:42:13 +0000 (-0700)
Subject: Merge tag 'timers-urgent-2021-05-16' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~1110
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8ce3648158d7bc9e5035d5a1db02c892905babbf;p=mirror_ubuntu-kernels.git

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

Pull timer fixes from Thomas Gleixner:
 "Two fixes for timers:

   - Use the ALARM feature check in the alarmtimer core code insted of
     the old method of checking for the set_alarm() callback.

     Drivers can have that callback set but the feature bit cleared. If
     such a RTC device is selected then alarms wont work.

   - Use a proper define to let the preprocessor check whether Hyper-V
     VDSO clocksource should be active.

     The code used a constant in an enum with #ifdef, which evaluates to
     always false and disabled the clocksource for VDSO"

* tag 'timers-urgent-2021-05-16' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/hyper-v: Re-enable VDSO_CLOCKMODE_HVCLOCK on X86
  alarmtimer: Check RTC features instead of ops
---

8ce3648158d7bc9e5035d5a1db02c892905babbf