Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 4 May 2020 13:52:50 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Rob Herring <robherring2@gmail.com>,
        Dave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Sam Ravnborg <sam@ravnborg.org>
Subject: linux-next: manual merge of the devicetree tree with the drm tree
Message-ID: <20200504135250.51966c49@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/IU7RdpOOufZBs8ITHvKaWMh";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/IU7RdpOOufZBs8ITHvKaWMh
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/panel-common.yaml

between commit:

  92e513fb0798 ("dt-bindings: display: grammar fixes in panel/")

from the drm tree and commit:

  3d21a4609335 ("dt-bindings: Remove cases of 'allOf' containing a '$ref'")

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/panel-common.yaml
index 17b8367f12dd,db3d270a33c6..000000000000
--- a/Documentation/devicetree/bindings/display/panel/panel-common.yaml
+++ b/Documentation/devicetree/bindings/display/panel/panel-common.yaml
@@@ -63,11 -61,10 +61,10 @@@ properties
 =20
    display-timings:
      description:
 -      Some display panels supports several resolutions with different tim=
ing.
 +      Some display panels support several resolutions with different timi=
ngs.
        The display-timings bindings supports specifying several timings and
 -      optional specify which is the native mode.
 +      optionally specifying which is the native mode.
-     allOf:
-       - $ref: display-timings.yaml#
+     $ref: display-timings.yaml#
 =20
    # Connectivity
    port:

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl6vkZIACgkQAVBC80lX
0GzgGAf6AnkTS9RySIb8lS8RUC4ksAylmyKYPffMLVU8BUG8Ao7cRfSaPsALfaNf
W9yr1VA1+jcFqj8CjG0Tjm+O5Gz+Rc/L1GC0Og/7cls5bUkXvYNaNx3Do4ovS+ZM
5jIf8q2JxhpJod14CX/MskBzqlBVTElg9kAlzzpOkHnInmvbTzXZ2WcSXcPp/M73
R5+c7zwW4ba3GzUcj6MmnxCxP51mdvB+6uYNlUU7thZ5qeQHt6FucdSNzxH8KdJU
s4x4lFpIGOE0NHgxWJvmjpZyK/3Do5kQRsVd6GJLGbIFw0eS0UxIHLlGOUVboCcB
NbPR89aw5DtXdvXpEbimJ6VUyp5crQ==
=cs8Y
-----END PGP SIGNATURE-----

--Sig_/IU7RdpOOufZBs8ITHvKaWMh--