Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Sep 2018 13:55:27 +0000 (06:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Sep 2018 13:55:27 +0000 (06:55 -0700)
commit3567994a05ba6490f6055650fbb892c926ae7fca
tree5d3b5a3ad69f68f21cc1c977e588b8a6ef28d35a
parent225ad3cfec4c0ad1971b3c00f379986a3eb6ab07
parente2c631ba75a7e727e8db0a9d30a06bfd434adb3a
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timekeeping fixes from Thomas Gleixner:
 "Two fixes for timekeeping:

   - Revert to the previous kthread based update, which is unfortunately
     required due to lock ordering issues. The removal caused boot
     failures on old Core2 machines. Add a proper comment why the thread
     needs to stay to prevent accidental removal in the future.

   - Fix a silly typo in a function declaration"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: Revert "Remove kthread"
  timekeeping: Fix declaration of read_persistent_wall_and_boot_offset()