diff options
| author | Linus Torvalds | 2015-11-15 09:30:48 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2015-11-15 09:30:48 -0800 |
| commit | 511601bdbcacd3ab615564941409bf012435b23d (patch) | |
| tree | eff24a58e4be25f7f556cb5eeecca88ddfcaded4 /kernel | |
| parent | b84da9fa47cf6e8dfd71d673a2f744ec1cac452c (diff) | |
| parent | 4717f133736dec10605da9e29e707144c8d486df (diff) | |
| parent | 22b886dd1018093920c4250dee2a9a3cb7cff7b8 (diff) | |
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()