diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 23:45:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 23:45:22 +0100 |
| commit | 8a9172356f747dc3734cc8043a44bbe158f44749 (patch) | |
| tree | c4da6a57187fdbbd92b094bb4c5ad9330c36a07b /fs/proc/generic.c | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | jiffies: Revert bogus conversion of NSEC_PER_SEC to TICK_NSEC (diff) | |
| download | linux-8a9172356f747dc3734cc8043a44bbe158f44749.tar.xz linux-8a9172356f747dc3734cc8043a44bbe158f44749.zip | |
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 'fs/proc/generic.c')
0 files changed, 0 insertions, 0 deletions