Re: linux-next: manual merge of the arm-soc tree with the pm tree

[Kevin Hilman]

Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes:

> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-mvebu/platsmp.c between commit f6cec7cd0777 ("ARM: mvebu:
> remove device tree parsing for cpu nodes") from the  tree and commit
> 994c8c94b419 ("ARM: mvebu: Remove the harcoded BootROM window
> allocation") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix looks correct, thanks.

Kevin (for arm-soc folks)
--
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/