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=-5.8 required=3.0 tests=BAYES_00,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 5EE97C48BE5 for ; Tue, 22 Jun 2021 03:24:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D8586113E for ; Tue, 22 Jun 2021 03:24:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbhFVD06 (ORCPT ); Mon, 21 Jun 2021 23:26:58 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:60723 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229546AbhFVD05 (ORCPT ); Mon, 21 Jun 2021 23:26:57 -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 4G8Bb74sB5z9sXk; Tue, 22 Jun 2021 13:24:35 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1624332280; bh=ukHoe8ctQydm1jqRsuwRW4KFJ9MlEMitYVp0CC94KvQ=; h=Date:From:To:Cc:Subject:From; b=H9x+PfUGruPRnjchM7TIRaA8XSf9Oi9rXdiOaxzJQuTd9DQF2PgsrKmgzvAGn1NgK SpmIUyUwB/8UxQ8qB4T3xaA4zU2tRI7pqAV7MlIxJe3gRc8aNrXwRXUSl61GzjrTDs VpVh8IxsBhADhYMXQgMPqBWPDTUpFMJsxJzNwACXO63YJx3aW5dRBl0fVV9HDbuhGf 1P194O/1dffRAe+hT+BBpiJ3ivKzkm5QlXpnau8npI5+8UeZjBVpiLR60a6qf5uNgJ NozDMciig7blGEC90tDn3UmTzYmESbvG0zRFXlWpsr8dWdV9daD6gPhMg3+Dih3Mh/ JAyrG59I++yZg== Date: Tue, 22 Jun 2021 13:24:34 +1000 From: Stephen Rothwell To: Rob Herring , Dave Airlie , DRI , Olof Johansson , Arnd Bergmann , ARM Cc: Alexandre Torgue , Fabrizio Castro , Linux Kernel Mailing List , Linux Next Mailing List , Parshuram Thombare , Rob Herring , Robert Foss Subject: linux-next: manual merge of the devicetree tree with Linus' and the drm, arm-soc trees Message-ID: <20210622132434.55d19766@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/uSDg2vJvmRq8jbuyLpabCQA"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/uSDg2vJvmRq8jbuyLpabCQA Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the devicetree tree got conflicts in: Documentation/devicetree/bindings/display/bridge/cdns,mhdp8546.yaml Documentation/devicetree/bindings/media/renesas,drif.yaml Documentation/devicetree/bindings/net/stm32-dwmac.yaml between commits: 7169d082e7e6 ("dt-bindings: drm/bridge: MHDP8546 bridge binding changes f= or HDCP") 8929ef8d4dfd ("media: dt-bindings: media: renesas,drif: Fix fck definitio= n") fea998229140 ("dt-bindings: net: document ptp_ref clk in dwmac") from Linus' and the drm, arm-soc trees and commit: 972d6a7dcec3 ("dt-bindings: Drop redundant minItems/maxItems") from the devicetree tree. I fixed it up (I used one side or the other, please check when linux-next is released) 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 --Sig_/uSDg2vJvmRq8jbuyLpabCQA Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmDRV/IACgkQAVBC80lX 0GxoNQf7BpZM/gOXkOiMkGb28zhmBiipd1Z+F6jFXBMUWWPxmT4MNkph/+HWbUUK I6NRDbRK/QXYZo4bfWYN7BV8BMBFs8fYoKRh1y8Rbi6QIW8f7L8xDI2kHqYtG0Yz /Y3/ZX8YRmHXOMeFnyAwb5kpc6gNo5Mz6W6g/fAWIsMwFVS1+5HqazPvgtwo4hMo lwoU3U2wTVtcatnjMQ9U0tkthC9Qp/z7ncMV/nYYephC94t5sma7awwBXmQffBRN LGavlv5jeQ0kTvaI7fKJsZ0TsZ234kokXorAeIJua/6TR5Ag2Uq3V5CFYXYUk7+H CpxXTNjcNHsQr544g6zYfMWWBLjCKg== =T7sk -----END PGP SIGNATURE----- --Sig_/uSDg2vJvmRq8jbuyLpabCQA--