Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in
arch/arm/mach-vexpress/platsmp.c between commit d2606f81d563 ("ARM:
vexpress: Simplify SMP operations for DT-powered system") from the
arm-soc tree and commit 9d0c4dfedd96 ("of/fdt: update
of_get_flat_dt_prop in prep for libfdt") from the dt-rh tree.
I fixed it up (the former removed the code modified by the latter) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: PGP signature
