linux-kernel - linux-next: manual merge of the devicetree tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20220115104103.7fa71b2e@canb.auug.org.au>
Date:   Sat, 15 Jan 2022 10:41:03 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Herring <robherring2@...il.com>
Cc:     Krzysztof Kozlowski <krzysztof.kozlowski@...onical.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rob Herring <robh@...nel.org>,
        Sam Protsenko <semen.protsenko@...aro.org>,
        Stanislav Jakubek <stano.jakubek@...il.com>
Subject: linux-next: manual merge of the devicetree tree with Linus' tree

Hi all,

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

  Documentation/devicetree/bindings/vendor-prefixes.yaml

between commit:

  2d6a1c7d5772 ("dt-bindings: Add vendor prefix for WinLink")

from Linus' tree and commit:

  ea800bc1bd93 ("dt-bindings: vendor-prefixes: add Wingtech")

from the devicetree tree.

I fixed it up (see below) 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

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index b3de81e8290f,a2efbc26d945..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1338,8 -1332,8 +1346,10 @@@ patternProperties
      description: Wiligear, Ltd.
    "^winbond,.*":
      description: Winbond Electronics corp.
 +  "^winlink,.*":
 +    description: WinLink Co., Ltd
+   "^wingtech,.*":
+     description: Wingtech Technology Co., Ltd.
    "^winstar,.*":
      description: Winstar Display Corp.
    "^wits,.*":

Content of type "application/pgp-signature" skipped