timer fix
Linus,
Please pull the latest timers/urgent git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-2020-06-28
# HEAD: f097eb38f71391ff2cf078788bad5a00eb3bd96a timekeeping: Fix kerneldoc system_device_crosststamp & al
A single DocBook fix.
Thanks,
Ingo
------------------>
Kurt Kanzenbach (1):
timekeeping: Fix kerneldoc system_device_crosststamp & al
include/linux/timekeeping.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
include/linux/timekeeping.h +7 -7
@@ -222,9 +222,9 @@ extern bool timekeeping_rtc_skipresume(void);extern void timekeeping_inject_sleeptime64 (const struct timespec64 *delta); -/* +/** * struct system_time_snapshot - simultaneous raw/real time capture with -* counter value +* counter value * @cycles: Clocksource counter value to produce the system times * @real: Realtime system time * @raw: Monotonic raw system time
@@ -239,9 +239,9 @@ struct system_time_snapshot {u8 cs_was_changed_seq; }; -/* +/** * struct system_device_crosststamp - system/device cross-timestamp -* (syncronized capture) +* (synchronized capture) * @device: Device time * @sys_realtime: Realtime simultaneous with device time * @sys_monoraw: Monotonic raw simultaneous with device time
@@ -252,12 +252,12 @@ struct system_device_crosststamp {ktime_t sys_monoraw; }; -/* +/** * struct system_counterval_t - system counter value with the pointer to the -* corresponding clocksource +* corresponding clocksource * @cycles: System counter value * @cs: Clocksource corresponding to system counter value. Used by -* timekeeping code to verify comparibility of two cycle values +* timekeeping code to verify comparibility of two cycle values */ struct system_counterval_t {u64 cycles;
The pull request you sent on Sun, 28 Jun 2020 20:39:25 +0200:
The pull request you sent on Sun, 28 Jun 2020 20:39:25 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gittimers-urgent-2020-06-28
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/668f532da4808688f5162cec6a38875390e1a91d
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker