Messages in this thread |  | | From | Krzysztof Kozlowski <> | Date | Tue, 3 Sep 2019 08:32:32 +0200 | Subject | Re: linux-next: manual merge of the devicetree tree with the samsung-krzk tree |
| |
On Tue, 3 Sep 2019 at 07:37, Stephen Rothwell <sfr@canb.auug.org.au> 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 compatible") > > from the samsung-krzk tree and commit: > > 553cedf60056 ("dt-bindings: Convert Arm Mali Midgard GPU to DT schema") > > from the devicetree tree. > > I fixed it up (I just removed the txt file, some fixup will be requide for > the new yaml file) and can carry the fix as necessary. This is now fixed
Thanks Stephen.
Rob, The conflict is non trivial. I could drop the patch, so Guillaume could rebase his patch on top of next and send it again for inclusion through your tree. Any other ideas?
The patch itself: https://patchwork.kernel.org/patch/11123729/
Best regards, Krzysztof
|  |