Merge tag 'timers-urgent-2022-05-08' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 May 2022 18:18:11 +0000 (11:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 May 2022 18:18:11 +0000 (11:18 -0700)
commitea82593bad9a77f6f14c9701c13ff7368b22f027
tree6de4cd868d202f96c4372d1265099a462ae141fb
parent9692df0581eae29abcc925ca3c12babc6c194741
parent2c33d775ef4c25c0e1e1cc0fd5496d02f76bfa20
Merge tag 'timers-urgent-2022-05-08' of git://git./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
MAINTAINERS