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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAJKOXPfokg493On43AJkx=YWz-6Tee8_G+Mha9cnLVeBvyb9mQ@mail.gmail.com>
Date:   Tue, 3 Sep 2019 08:32:32 +0200
From:   Krzysztof Kozlowski <krzk@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Rob Herring <robh@...nel.org>
Cc:     Rob Herring <robherring2@...il.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Guillaume Gardet <guillaume.gardet@....com>
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@...b.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