linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20190903153718.14b7a5e7@canb.auug.org.au>
Date:   Tue, 3 Sep 2019 15:37:18 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Herring <robherring2@...il.com>,
        Krzysztof Kozlowski <krzk@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Guillaume Gardet <guillaume.gardet@....com>
Subject: 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 ("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
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