Messages in this thread | | | Date | Fri, 17 Jan 2014 14:14:20 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the devicetree tree with the arm-soc tree |
| |
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts between commit 6b6430e82331 ("ARM: orion5x: Fix typo in device_type property of phy node") from the arm-soc tree and commit 40aad3c1a9b6 ("dt/bindings: Remove all references to device_type "ethernet-phy"") from the devicetree tree.
I fixed it up (removed the line) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |