Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 May 2018 15:35:23 +0000 (05:35 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 May 2018 15:35:23 +0000 (05:35 -1000)
commitfe282c609d0a5da0607a21ffa9ef49849bd7524d
treec9a70af881d6b63c89612bf094a5461fcc18e746
parent03b5f0c138db46380fa51b36944167bca63eb572
parent7dba33c6346c337aac3f7cd188137d4a6d3d1f3a
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull clocksource fixes from Thomas Gleixner:
 "The recent addition of the early TSC clocksource breaks on machines
  which have an unstable TSC because in case that TSC is disabled, then
  the clocksource selection logic falls back to the early TSC which is
  obviously bogus.

  That also unearthed a few robustness issues in the clocksource
  derating code which are addressed as well"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: Rework stale comment
  clocksource: Consistent de-rate when marking unstable
  x86/tsc: Fix mark_tsc_unstable()
  clocksource: Initialize cs->wd_list
  clocksource: Allow clocksource_mark_unstable() on unregistered clocksources
  x86/tsc: Always unregister clocksource_tsc_early