timer fix
Linus,
Please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
# HEAD: 2f5841349df281ecf8f81cc82d869b8476f0db0b ntp/y2038: Remove incorrect time_t truncation
Fix integer truncation bug in __do_adjtimex().
Thanks,
Ingo
------------------>
Arnd Bergmann (1):
ntp/y2038: Remove incorrect time_t truncation
kernel/time/ntp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/ntp.c +1 -1
@@ -771,7 +771,7 @@ int __do_adjtimex(struct __kernel_timex *txc, const struct timespec64 *ts,/* fill PPS status fields */ pps_fill_timex (txc); - txc->time.tv_sec = (time_t )ts->tv_sec; + txc->time.tv_sec = ts->tv_sec; txc->time.tv_usec = ts->tv_nsec;if (!(time_status &STA_NANO )) txc->time.tv_usec = ts->tv_nsec /NSEC_PER_USEC ;
The pull request you sent on Sat, 16 Nov 2019 22:38:54 +0100:
The pull request you sent on Sat, 16 Nov 2019 22:38:54 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gittimers-urgent-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3278b3b6782c562079a3e0af0979968fd94d141c
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker