Received-SPF: pass (google.com: domain of linux-kernel+bounces-178300-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Tue, 14 May 2024 14:12:29 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robh@kernel.org>, Dave Airlie <airlied@redhat.com>
Cc: DRI <dri-devel@lists.freedesktop.org>, Krzysztof Kozlowski
 <krzysztof.kozlowski@linaro.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Neil Armstrong <neil.armstrong@linaro.org>
Subject: linux-next: manual merge of the devicetree tree with the drm tree
Message-ID: <20240514141229.5553dc13@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/+Vg_FtOuGI05fZTwkGy3VsR";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/+Vg_FtOuGI05fZTwkGy3VsR
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml

between commit:

  90ed42ceda76 ("dt-bindings: display: novatek, nt36523: define ports")

from the drm tree and commit:

  9fa6bcf23e44 ("dt-bindings: display: panel: constrain 'reg' in DSI panels=
")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/display/panel/novatek,nt36523.y=
aml
index bbeea8cfa5fb,0447ee724947..000000000000
--- a/Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
+++ b/Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
@@@ -34,7 -40,7 +37,6 @@@ properties
    vddio-supply:
      description: regulator that supplies the I/O voltage
 =20
-   reg: true
 -  ports: true
    rotation: true
    backlight: true
 =20

--Sig_/+Vg_FtOuGI05fZTwkGy3VsR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZC5K0ACgkQAVBC80lX
0Gx/vQf+PTRLh2MO6zTQJ0J7Q6T+fQrXS+4yZPrVmkvktXL2Hxfl8tBSANSzezrR
wvGkAY/HEhRxB8UrZ8B02Yc4BhTbY3OPH2HroGi4cvb0gyDK1mGKKJyaVj8nDYqU
Vw8eJdA0GtUKWH6ljmjORY7EkPvIycjnRvoqi8tZzPj4wQYG63/AOcWZx0r3vGPG
U+rFPZB32/DorRQKKlqG4wnL7t82UDJ95761OPB6lCquDh9Nb7//Kp/GuvLIXrv0
ks3JIzk/qwrIjef5FBnPTOoo1isV6Q5Y2cG3QV1bHTzLzMUIrJNicdgzvMOnDwrz
SiOrdA+2j1MQX2Iwihrkrbmkk5oJIg==
=zFgC
-----END PGP SIGNATURE-----

--Sig_/+Vg_FtOuGI05fZTwkGy3VsR--