]> Git Repo - linux.git/commitdiff
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <[email protected]>
Tue, 7 Mar 2017 22:45:22 +0000 (14:45 -0800)
committerLinus Torvalds <[email protected]>
Tue, 7 Mar 2017 22:45:22 +0000 (14:45 -0800)
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


Trivial merge
This page took 0.056937 seconds and 4 git commands to generate.