diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-15 16:03:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-15 16:03:01 +0200 |
| commit | bb33db7a076f4719dc68c235e187dd4bfb16b621 (patch) | |
| tree | 495a618502af9a6a0df4dd8d410a850e744af60b /kernel | |
| parent | Linux 3.9-rc7 (diff) | |
| parent | hrtimer: Don't reinitialize a cpu_base lock on CPU_UP (diff) | |
| parent | irqchip: gic: fix irq_trigger return (diff) | |
| parent | kthread: Prevent unpark race which puts threads on the wrong cpu (diff) | |
| download | linux-bb33db7a076f4719dc68c235e187dd4bfb16b621.tar.xz linux-bb33db7a076f4719dc68c235e187dd4bfb16b621.zip | |
Merge branches 'timers-urgent-for-linus', 'irq-urgent-for-linus' and 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull {timer,irq,core} fixes from Thomas Gleixner:
- timer: bug fix for a cpu hotplug race.
- irq: single bugfix for a wrong return value, which prevents the
calling function to invoke the software fallback.
- core: bugfix which plugs two race confitions which can cause hotplug
per cpu threads to end up on the wrong cpu.
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hrtimer: Don't reinitialize a cpu_base lock on CPU_UP
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: gic: fix irq_trigger return
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
kthread: Prevent unpark race which puts threads on the wrong cpu