Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Jan 2017 20:00:37 +0000 (12:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Jan 2017 20:00:37 +0000 (12:00 -0800)
commita11ce3a4ac0ad78618cddb9ce16def7486f2707d
tree96f6f9b7f979dcfa94d036d7431fdd799b108638
parent79078c53baabee12dfefb0cfe00ca94cb2c35570
parent24b91e360ef521a2808771633d76ebc68bd5604b
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull NOHZ fix from Ingo Molnar:
 "This fixes an old NOHZ race where we incorrectly calculate the next
  timer interrupt in certain circumstances where hrtimers are pending,
  that can cause hard to reproduce stalled-values artifacts in
  /proc/stat"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  nohz: Fix collision between tick and other hrtimers