tree c4da6a57187fdbbd92b094bb4c5ad9330c36a07b
parent 609b07b72d3caaa8eed3a238886467946b78fa5e
parent fa3aa7a54fe6d3abf128f13cd4bbd40eaa48fed2
author Linus Torvalds <torvalds@linux-foundation.org> 1488926722 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1488926722 -0800

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