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=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 81911C433E0 for ; Thu, 6 Aug 2020 01:49:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 431A920823 for ; Thu, 6 Aug 2020 01:49:04 +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="Yx3BJr6p" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726851AbgHFBtD (ORCPT ); Wed, 5 Aug 2020 21:49:03 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:46659 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725998AbgHFBtD (ORCPT ); Wed, 5 Aug 2020 21:49:03 -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 4BMWcR5H9gz9sPC; Thu, 6 Aug 2020 11:48:55 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1596678540; bh=Ceb6LToJ+7vmEHhGywFYyHWH3nc/3SWKpK13hR/D9sU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Yx3BJr6pOw4OmA8EZp0nMhU9EQiiGK96eNm+E244cdRsEyxS9+lBXbwYyVLTzlM7I HXN43s7N8yL3VoE8wdrGycmcFjBch7eM6Sdygp3dMEFmX0vdESx6bfMFhjoAYF3utQ NMU1wKsqKRBBLxrHOLIvH4dOBzUnwcmGJXAY5OdiRYX1UkRGQy1zEZ0p9GhV59UqZs wcMycN8JK9znIBjOP7bIiZWE6UmJ/6eMOfFbUD6qmFjvy6Sb5EagMd9mZ/tFT3qxVm G3XrUyVZg0LdrrGFKclf7CAGO+PUbFSX1JBmT8K3Yo0boBOWqVnotwRCn5dpV3fesU VdZpXCieSOaDQ== Date: Thu, 6 Aug 2020 11:48:53 +1000 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Rob Herring , Linux Next Mailing List , Linux Kernel Mailing List , Douglas Anderson , Sam Ravnborg , "Alexander A. Klimov" Subject: Re: linux-next: manual merge of the devicetree tree with the drm tree Message-ID: <20200806114853.43f2e6fb@canb.auug.org.au> In-Reply-To: <20200722155239.07bafdfc@canb.auug.org.au> References: <20200722155239.07bafdfc@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/ciKrCbctQVDTvj=cVrqeP4m"; 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_/ciKrCbctQVDTvj=cVrqeP4m Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Wed, 22 Jul 2020 15:52:39 +1000 Stephen Rothwell = wrote: > > Today's linux-next merge of the devicetree tree got a conflict in: >=20 > Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt >=20 > between commit: >=20 > 5a2e9b658cdc ("dt-bindings: drm/bridge: ti-sn65dsi86: Convert to yaml") >=20 > from the drm tree and commit: >=20 > 382646090f7f ("dt-bindings: drm/bridge: Replace HTTP links with HTTPS o= nes") >=20 > from the devicetree tree. >=20 > I fixed it up (I delete the file and adde the following merge fix > patch) 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 > From: Stephen Rothwell > Date: Wed, 22 Jul 2020 15:47:22 +1000 > Subject: [PATCH] fix for "dt-bindings: drm/bridge: Replace HTTP links wit= h HTTPS ones" >=20 > Signed-off-by: Stephen Rothwell > --- > .../devicetree/bindings/display/bridge/ti,sn65dsi86.yaml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi8= 6.yaml b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml > index be10e8cf31e1..f8622bd0f61e 100644 > --- a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml > +++ b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml > @@ -11,7 +11,7 @@ maintainers: > =20 > description: | > The Texas Instruments SN65DSI86 bridge takes MIPI DSI in and outputs e= DP. > - http://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber= =3Dsn65dsi86&fileType=3Dpdf > + https://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumbe= r=3Dsn65dsi86&fileType=3Dpdf > =20 > properties: > compatible: > --=20 > 2.27.0 This is now a conflict between the drm tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/ciKrCbctQVDTvj=cVrqeP4m Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8rYYUACgkQAVBC80lX 0GwIXQf/SLzjkXaFmkX9wJyeKhhsoMGpM7T59b9DWNPtr1S4cP7EIuDXY7+cBhde UsF9GfJux7P2i1OadYftdH843y4rGP+SmxxKt0/2DsNjgsWQXz1u4/khJ3tEz9Q7 aRQD9ukn9F6UjiJmWvWtn1RTpJj58RYjHAoMGEB7aKIMD1bBCWiq30CD8cxheBZt z/hm4bPSpK3JoyP2JH0lz901ZmgoAhEwek3eX2F8FYgAaAvnDwS9FqjsZbJ8g3OR y0VgI/y+6CnLinCWeYkH+kMJZa4rCU+dBdkRZBeMio/T9DC7mwHvZHjPJ0Ec7wmm 2wr2T2pU6kEHlf+QMYbkq1Z4Hs7Q4w== =D5vb -----END PGP SIGNATURE----- --Sig_/ciKrCbctQVDTvj=cVrqeP4m--