From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Mar 2017 22:45:22 +0000 (-0800)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.11-rc2~29
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/8a9172356f747dc3734cc8043a44bbe158f44749

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

Pull timer fixes from Ingo Molnar:
 "This includes a fix for lockups caused by incorrect nsecs related
  cleanup, and a capabilities check fix for timerfd"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  jiffies: Revert bogus conversion of NSEC_PER_SEC to TICK_NSEC
  timerfd: Only check CAP_WAKE_ALARM when it is needed
---

8a9172356f747dc3734cc8043a44bbe158f44749