linux-kernel - linux-next: manual merge of the devicetree tree with the etnaviv 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>] [day] [month] [year] [list]

Message-ID: <20200212104603.56f59785@canb.auug.org.au>
Date:   Wed, 12 Feb 2020 10:46:03 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Herring <robherring2@...il.com>,
        Lucas Stach <l.stach@...gutronix.de>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Guido Günther <agx@...xcpu.org>
Subject: linux-next: manual merge of the devicetree tree with the etnaviv
 tree

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt

between commit:

  22567d017c2c ("dt-bindings: etnaviv: Add #cooling-cells")

from the etnaviv tree and commit:

  90aeca875f8a ("dt-bindings: display: Convert etnaviv to json-schema")

from the devicetree tree.

I fixed it up (I just dropped the etnaviv tree change ... someone should
maybe add that change to the devicetree tree) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped