On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown <broonie@xxxxxxxxxx> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp") from the tree and commit f618c4703a14672d27 ("drivers: of: add support for custom reserved memory drivers") from the devicetree tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
LGTM from the arm-soc side.
-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
