Re: linux-next: manual merge of the irqdomain tree with Linus' tree

[Grant Likely]

On Mon, Feb 13, 2012 at 9:36 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Grant,
>
> Today's linux-next merge of the irqdomain tree got a conflict in
> drivers/mfd/twl-core.c between commit 6252547b8a7a ("ARM: omap: fix
> broken twl-core dependencies and ifdefs") from Linus' tree and commit
> 7da5a66bbf1f ("irq_domain: Remove 'new' irq_domain in favour of the ppc
> one") from the irqdomain tree.
>
> The latter removes the code modified by the former, so I did that.

Thanks Stephen. I'll respin the tree after the next rc

g.

> --
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/