diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-13 21:22:12 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-13 21:22:12 (GMT) |
commit | 1536340e7c67694b134cbbc07168e5a524e49d08 (patch) | |
tree | 3b39173df6a811e2d1a86a899046ade25ff13705 /include | |
parent | 99d263d4c5b2f541dfacb5391e22e8c91ea982a6 (diff) | |
parent | 13c42c2f43b19aab3195f2d357db00d1e885eaa8 (diff) | |
parent | 474e941bed9262f5fa2394f9a4a67e24499e5926 (diff) | |
download | linux-1536340e7c67694b134cbbc07168e5a524e49d08.tar.xz |
Merge branches 'locking-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull futex and timer fixes from Thomas Gleixner:
"A oneliner bugfix for the jinxed futex code:
- Drop hash bucket lock in the error exit path. I really could slap
myself for intruducing that bug while fixing all the other horror
in that code three month ago ...
and the timer department is not too proud about the following fixes:
- Deal with a long standing rounding bug in the timeval to jiffies
conversion. It's a real issue and this fix fell through the cracks
for quite some time.
- Another round of alarmtimer fixes. Finally this code gets used
more widely and the subtle issues hidden for quite some time are
noticed and fixed. Nothing really exciting, just the itty bitty
details which bite the serious users here and there"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
futex: Unlock hb->lock in futex_wait_requeue_pi() error path
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
alarmtimer: Lock k_itimer during timer callback
alarmtimer: Do not signal SIGEV_NONE timers
alarmtimer: Return relative times in timer_gettime
jiffies: Fix timeval conversion to jiffies