Messages in this thread | ![/](/images/icornerl.gif) | | Date | Wed, 19 Aug 2009 16:07:58 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in kernel/irq/manage.c between commit 69ab849439b506cd8dd2879527fdb64d95dd5211 ("genirq: Wake up irq thread after action has been installed") from Linus' tree and commit 3c26caa7409ad5367b257de3d7943551d4a959ee ("genirq: Do not wakeup irq thread from __setup_irq() and set action->irq") from the tip tree.
I used the version from Linus' tree (as seems to have been done in tip:master). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | ![\](/images/icornerr.gif) |