From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0AABC3A5A9 for ; Mon, 4 May 2020 03:52:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A2CC206EB for ; Mon, 4 May 2020 03:52:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="S7jBsOJW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726472AbgEDDwz (ORCPT ); Sun, 3 May 2020 23:52:55 -0400 Received: from ozlabs.org ([203.11.71.1]:60343 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726404AbgEDDwy (ORCPT ); Sun, 3 May 2020 23:52:54 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49Fppq0Lzgz9sSm; Mon, 4 May 2020 13:52:51 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1588564373; bh=6O/gTKsKfyQgDitWq0l6CCrgWrqbk/bSQq70qnnSe3E=; h=Date:From:To:Cc:Subject:From; b=S7jBsOJWmznqSx1FAqVyzn88QdxQmSP+VBwGijonT5xHux/1CM+6LgjfeTcyjs4Gx ucPBtPjf7QA+eBv1QxLjNOVGGKA+V1Mmv7Ch3azEOQ8X9gM+vsTC+2FE3HgiWRGLHQ 9yPrd+QTWw1jyTvELf1ebdia5rwKPha6paRcZbJvrfDlCfqE46a7lrvk4GNtgER+su 7zd3Jm/VWxwRFY6BhSt+WM2YfB/HZ4W74tE1NsI6GqiXogksLJFBbV8yMvNhb8cIJS 92poDUyaKDlYBaGMKWGgSDPdtzt9zz9DLJROdubmG8Aku4WvcjcH2KXDVSUVMvDWOx WYNefqynvcG6g== Date: Mon, 4 May 2020 13:52:50 +1000 From: Stephen Rothwell To: Rob Herring , Dave Airlie , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List , Sam Ravnborg 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-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --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--