diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-08 11:18:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-08 11:18:11 -0700 |
commit | ea82593bad9a77f6f14c9701c13ff7368b22f027 (patch) | |
tree | 6de4cd868d202f96c4372d1265099a462ae141fb /net/can/isotp.c | |
parent | 9692df0581eae29abcc925ca3c12babc6c194741 (diff) | |
parent | 2c33d775ef4c25c0e1e1cc0fd5496d02f76bfa20 (diff) | |
download | linux-stable-ea82593bad9a77f6f14c9701c13ff7368b22f027.tar.gz linux-stable-ea82593bad9a77f6f14c9701c13ff7368b22f027.tar.bz2 linux-stable-ea82593bad9a77f6f14c9701c13ff7368b22f027.zip |
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
Diffstat (limited to 'net/can/isotp.c')
0 files changed, 0 insertions, 0 deletions