Re: linux-next: manual merge of the devicetree tree with the rockchip and sunxi trees

2017-09-22 Thread Rob Herring
On Tue, Sep 19, 2017 at 9:26 PM, Stephen Rothwell wrote: > Hi Rob, > > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/vendor-prefixes.txt > > between commit: > > 50544f39018f ("dt-bindings: Add vendor prefix for Amarula Solutions") > >

linux-next: manual merge of the devicetree tree with the rockchip and sunxi trees

2017-09-19 Thread Stephen Rothwell
Hi Rob, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.txt between commit: 50544f39018f ("dt-bindings: Add vendor prefix for Amarula Solutions") from the rockchip tree, commit: 912620c02c31 ("dt-bindings: add vendor p