diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-03 09:58:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-03 09:58:20 -0700 |
| commit | 8d71844b5194fee6edd49e68c01445266f364572 (patch) | |
| tree | 637d8292cc2b6530d33b53ede66cdc771514acc7 /net/dns_resolver | |
| parent | Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm (diff) | |
| parent | timer: Fix lock inversion between hrtimer_bases.lock and scheduler locks (diff) | |
| download | linux-dev-8d71844b5194fee6edd49e68c01445266f364572.tar.xz linux-dev-8d71844b5194fee6edd49e68c01445266f364572.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"Two fixes in the timer area:
- a long-standing lock inversion due to a printk
- suspend-related hrtimer corruption in sched_clock"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timer: Fix lock inversion between hrtimer_bases.lock and scheduler locks
sched_clock: Avoid corrupting hrtimer tree during suspend
Diffstat (limited to 'net/dns_resolver')
0 files changed, 0 insertions, 0 deletions