From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 May 2022 18:18:11 +0000 (-0700)
Subject: Merge tag 'timers-urgent-2022-05-08' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.18-rc6~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea82593bad9a77f6f14c9701c13ff7368b22f027;p=thirdparty%2Fkernel%2Flinux.git

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

Pull timer fix from Thomas Gleixner:
 "A fix and an email address update:

   - Mark the NMI safe time accessors notrace to prevent tracer
     recursion when they are selected as trace clocks.

   - John Stultz has a new email address"

* tag 'timers-urgent-2022-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Mark NMI safe time accessors as notrace
  MAINTAINERS: Update email address for John Stultz
---

ea82593bad9a77f6f14c9701c13ff7368b22f027