From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Jan 2017 20:00:37 +0000 (-0800)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-4.10.0-19.21~1820
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a11ce3a4ac0ad78618cddb9ce16def7486f2707d;p=mirror_ubuntu-artful-kernel.git

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

a11ce3a4ac0ad78618cddb9ce16def7486f2707d