diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-15 18:30:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-15 18:30:48 +0100 |
| commit | 511601bdbcacd3ab615564941409bf012435b23d (patch) | |
| tree | eff24a58e4be25f7f556cb5eeecca88ddfcaded4 /kernel/time | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| parent | genirq/PM: Restore system wake up from chained interrupts (diff) | |
| parent | timers: Use proper base migration in add_timer_on() (diff) | |
| download | linux-511601bdbcacd3ab615564941409bf012435b23d.tar.xz linux-511601bdbcacd3ab615564941409bf012435b23d.zip | |
Merge branches 'irq-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq and timer fixes from Thomas Gleixner:
- An irq regression fix to restore the wakeup behaviour of chained
interrupts.
- A timer fix for a long standing race versus timers scheduled on a
target cpu which got exposed by recent changes in the workqueue
implementation.
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq/PM: Restore system wake up from chained interrupts
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timers: Use proper base migration in add_timer_on()