Re: linux-next: manual merge of the devicetree tree with the samsung-krzk tree

On Tue, Sep 3, 2019 at 7:32 AM Krzysztof Kozlowski wrote: > > On Tue, 3 Sep 2019 at 07:37, Stephen Rothwell wrote: > > > > Hi all, > > > > Today's linux-next merge of the devicetree tree got a conflict in: > > > > Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt > > > > between

Re: linux-next: manual merge of the devicetree tree with the samsung-krzk tree

On Tue, 3 Sep 2019 at 07:37, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt > > between commit: > > 5833f5a5daf3 ("dt-bindings: gpu: mali: Add Samsung exynos5250

linux-next: manual merge of the devicetree tree with the samsung-krzk tree

Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt between commit: 5833f5a5daf3 ("dt-bindings: gpu: mali: Add Samsung exynos5250 compatible") from the samsung-krzk tree and commit: 553cedf60056