Messages in this thread | | | Date | Fri, 23 Mar 2012 14:32:37 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the mfd tree with Linus' tree |
| |
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in drivers/mfd/twl-core.c between commits 5769089ac725 ("mfd: twl-core.c: Fix the number of interrupts managed by twl4030"), 75294957be1d ("irq_domain: Remove 'new' irq_domain in favour of the ppc one") and 964dba283439 ("devicetree: Add empty of_platform_populate() for ! CONFIG_OF_ADDRESS (sparc)") from Linus' tree and commits 9e1786202704 ("mfd: Make twl-core not depend on pdata->irq_base/end") and 78518ffa08fc ("mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files") from the mfd tree.
I *think* that the right thing to do is to use the version from the mfd tree ...
I do wonder why I only got this now (in the merge window) ... -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |