linux-next: manual merge of the drm tree with the riscv-dt tree

linux-next: manual merge of the drm tree with the riscv-dt tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1361 bytes --]

Hi all,

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

  Documentation/devicetree/bindings/vendor-prefixes.yaml

between commit:

  f61b65abc9f41 ("dt-bindings: vendor-prefixes: Add shenrongda")

from the riscv-dt tree and commit:

  b55dbe9011975 ("dt-bindings: vendor-prefixes: Add Shen Chao Optoelectronics")

from the drm 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.

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index bc1e6361c6941,7602034374d7f..0000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1529,8 -1527,8 +1531,10 @@@ patternProperties
      description: SGX Sensortech
    "^sharp,.*":
      description: Sharp Corporation
+   "^shenchao,.*":
+     description: Shen Chao Optoelectronics (Shenzhen) Co., Ltd.
 +  "^shenrongda,.*":
 +    description: Shenzhen Rongda Computer Co., Ltd.
    "^shift,.*":
      description: SHIFT GmbH
    "^shimafuji,.*":

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]