timer fixes
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: fdc6bae940ee9eb869e493990540098b8c0fd6ab ntp: Allow TAI-UTC offset to be set to zero
A TIA adjtimex interface extension, and a POSIX compliance ABI fix for timespec64 users.
Thanks,
Ingo
------------------>
Arnd Bergmann (1):
y2038: Make CONFIG_64BIT_TIME unconditional
Miroslav Lichvar (1):
ntp: Allow TAI-UTC offset to be set to zero
arch/Kconfig | 2 +- kernel/time/ntp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/Kconfig +1 -1
@@ -764,7 +764,7 @@ config COMPAT_OLD_SIGACTION bool config 64BIT_TIME - def_bool ARCH_HAS_64BIT_TIME + def_bool y help This should be selected by all architectures that need to support new system calls with a 64-bit time_t. This is relevant on all 32-bit
kernel/time/ntp.c +1 -1
@@ -690,7 +690,7 @@ static inline void process_adjtimex_modes(const struct __kernel_timex *txc, time_constant =max (time_constant,0l ); } -if (txc->modes &ADJ_TAI && txc->constant >0 ) +if (txc->modes &ADJ_TAI && txc->constant >=0 ) *time_tai = txc->constant;if (txc->modes &ADJ_OFFSET )
The pull request you sent on Thu, 16 May 2019 18:09:25 +0200:
The pull request you sent on Thu, 16 May 2019 18:09:25 +0200:
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/b2c3dda6f8f06d825b9b6099f57b906c774141c0
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker