Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 May 2019 18:00:20 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 May 2019 18:00:20 +0000 (11:00 -0700)
commitb2c3dda6f8f06d825b9b6099f57b906c774141c0
tree72e6e6d21f7f26f1788a6f9e9920225c4430fed0
parentc77ee64f8a04166236666dfd540ff684d2daa1c0
parentfdc6bae940ee9eb869e493990540098b8c0fd6ab
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull time fixes from Ingo Molnar:
 "A TIA adjtimex interface extension, and a POSIX compliance ABI fix for
  timespec64 users"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ntp: Allow TAI-UTC offset to be set to zero
  y2038: Make CONFIG_64BIT_TIME unconditional
arch/Kconfig
kernel/time/ntp.c