Re: linux-next: manual merge of the staging tree with the imx-mxs tree

Hi all, On Fri, 12 Apr 2019 14:49:21 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the staging tree got a conflict in: > > Documentation/devicetree/bindings/vendor-prefixes.txt > > between commit: > > 189733b0a7e4 ("dt-bindings: Add vendor prefix for Rakuten Kobo, Inc.")

linux-next: manual merge of the staging tree with the imx-mxs tree

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.txt between commit: 189733b0a7e4 ("dt-bindings: Add vendor prefix for Rakuten Kobo, Inc.") from the imx-mxs tree and commit: 2e5cee6c7622 ("dt-bindings: Add vendor

linux-next: manual merge of the staging tree with the imx-mxs tree

Hi Greg, Today's linux-next merge of the staging tree got a conflict in arch/arm/boot/dts/imx51-babbage.dts between commit a198af2322a1 ("ARM: dts: i.MX51 babbage: Support diagnostic LED") from the imx-mxs tree and commit 17b5001b5143 ("imx-drm: convert to componentised device support") from the

linux-next: manual merge of the staging tree with the imx-mxs tree

Hi Greg, Today's linux-next merge of the staging tree got a conflict in arch/arm/boot/dts/imx51-babbage.dts between commit a198af2322a1 (ARM: dts: i.MX51 babbage: Support diagnostic LED) from the imx-mxs tree and commit 17b5001b5143 (imx-drm: convert to componentised device support) from the