tree 9dc8cf4ef4b9795b82c4b5204f80475da482ccc5
parent 7d9e55feae5543b16ec9d433079c9db455929a67
parent a3ed0e4393d6885b4af7ce84b437dc696490a530
author Linus Torvalds <torvalds@linux-foundation.org> 1525017805 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1525017805 -0700

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "Two fixes from the timer departement:

   - Fix a long standing issue in the NOHZ tick code which causes RB
     tree corruption, delayed timers and other malfunctions. The cause
     for this is code which modifies the expiry time of an enqueued
     hrtimer.

   - Revert the CLOCK_MONOTONIC/CLOCK_BOOTTIME unification due to
     regression reports. Seems userspace _is_ relying on the documented
     behaviour despite our hope that it wont"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Revert: Unify CLOCK_MONOTONIC and CLOCK_BOOTTIME
  tick/sched: Do not mess with an enqueued hrtimer