Messages in this thread | | | Date | Mon, 27 Feb 2012 16:23:41 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the tip tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in kernel/irq/manage.c between commit b4bc724e82e8 ("genirq: Handle pending irqs in irq_startup()") from the tip tree and commit "irqs: fix handling of pending IRQs at request time" from the akpm tree.
It looks like the former is a superset of the latter, so I dropped the latter. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |