]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2014 05:19:10 +0000 (14:19 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2014 05:19:10 +0000 (14:19 +0900)
commit95d08585e093a9f07562b4a3984370b4d72f1a57
treed8b0c28796fd11b5eb67cab86ca4365dc6045fcd
parent3f017a4ca2de0a87767ab047b2bd2f3f11e87a9e
parent84ea7fe37908254c3bd90910921f6e1045c1747a
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
 "A single bug fix for a long standing issue:

   - Updating the expiry value of a relative timer _after_ letting the
     idle logic select a target cpu for the timer based on its stale
     expiry value is outright stupid.  Thanks to Viresh for spotting the
     brainfart"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  hrtimer: Set expiry time before switch_hrtimer_base()