Subject: linux-next: manual merge of the input tree with the arm-soc tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 6 Oct 2020 16:06:22 +1100

Hi all,

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

  Documentation/devicetree/bindings/vendor-prefixes.yaml

between commit:

  cb1cc137a2c1 ("dt-bindings: Add vendor prefix for Shenzhen Zkmagic Technology Co., Ltd.")

from the arm-soc tree and commit:

  8f445ffa851e ("dt-bindings: input/touchscreen: add bindings for zinitix")

from the input 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 6242f1baa24c,bd7b2d404124..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1214,8 -1143,8 +1214,10 @@@ patternProperties
      description: Shenzhen Zidoo Technology Co., Ltd.
    "^zii,.*":
      description: Zodiac Inflight Innovations
+   "^zinitix,.*":
+     description: Zinitix Co., Ltd
 +  "^zkmagic,.*":
 +    description: Shenzhen Zkmagic Technology Co., Ltd.
    "^zte,.*":
      description: ZTE Corp.
    "^zyxel,.*":