linux-next: manual merge of the dt-rh tree with the arm-soc tree

Hi Rob, Today's linux-next merge of the dt-rh tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.txt between commit: d5553cb05a04 ("ARM: dts: zx: add an initial zx296702 dts and doc") from the arm-soc tree and commit: 72d942e23cda ("of: Add vendor prefix for Zodia

linux-next: manual merge of the dt-rh tree with the arm-soc tree

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")

linux-next: manual merge of the dt-rh tree with the arm-soc tree

Hi Rob, Today's linux-next merge of the dt-rh tree got a conflict in Documentation/devicetree/bindings/vendor-prefixes.txt between commits 70e123373c05 ("rtc: Add support for Intersil ISL12057 I2C RTC chip") from the arm-soc tree and 53d6b36020c7 ("of: Add vendor prefix for LG Corporation") from L