Messages in this thread | | | Date | Wed, 19 Aug 2009 12:37:55 +0200 | From | Ingo Molnar <> | Subject | Re: linux-next: manual merge of the tip tree with Linus' tree |
| |
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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).
Yeah - that's the right resolution - thanks Stephen.
Ingo
| |