diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 14:45:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 14:45:22 -0800 |
| commit | 8a9172356f747dc3734cc8043a44bbe158f44749 (patch) | |
| tree | c4da6a57187fdbbd92b094bb4c5ad9330c36a07b /block/blk-mq-sysfs.c | |
| parent | 609b07b72d3caaa8eed3a238886467946b78fa5e (diff) | |
| parent | fa3aa7a54fe6d3abf128f13cd4bbd40eaa48fed2 (diff) | |
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
Diffstat (limited to 'block/blk-mq-sysfs.c')
0 files changed, 0 insertions, 0 deletions