]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c77ee64 fdc6bae)
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)
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

1  2 
arch/Kconfig patch | diff1 | diff2 | blob | history
kernel/time/ntp.c patch | diff1 | diff2 | blob | history

diff --cc arch/Kconfig
Simple merge
diff --cc kernel/time/ntp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.