From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Sep 2018 13:55:27 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~8033
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3567994a05ba6490f6055650fbb892c926ae7fca;p=mirror_ubuntu-kernels.git

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/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()
---

3567994a05ba6490f6055650fbb892c926ae7fca