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=-6.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS 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 E9D61C282DD for ; Thu, 23 May 2019 13:04:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A203C21019 for ; Thu, 23 May 2019 13:04:33 +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="WbLEKpyn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730755AbfEWNEd (ORCPT ); Thu, 23 May 2019 09:04:33 -0400 Received: from ozlabs.org ([203.11.71.1]:41029 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730028AbfEWNEc (ORCPT ); Thu, 23 May 2019 09:04:32 -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 458qTR0Bgvz9s1c; Thu, 23 May 2019 23:04:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1558616668; bh=d5ZuvkUP8TBeK3z+2ilZtV6jDe/CcGS8heAqRVjKyAc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=WbLEKpyn+6AuwbkHqX6gXhyjuGcn4cZX2J5oIjCcNCN7Ey0ipmIEcoo4rBkdlhcZE ZVEdz+zKdre7TOdoSLKv+XZnhmLOK5Eb4TQ1SjHWjrIRNvBpwqDoiYW8hpPi60iOEB dGWM/0rjlpIIoKowDqXK28a3DJz7e1/eb0MKib1BYTvTreP00ZyBMplpCKj8NplYo/ lo8wMCY5uLrHbOS2jYqQtsMYwQSJAqFYVtEXI76fqQrRtezTQsg3u6UvQHB6pyp/9T BDNVV9W1cZFpoS9BQT7HfDGnzjCprZgy54Usd4C98xbisTQZ7M5InZ6QNzk55uAErD IzE6GlfdXfbOQ== Date: Thu, 23 May 2019 23:04:09 +1000 From: Stephen Rothwell To: Maxime Ripard Cc: Daniel Vetter , Intel Graphics , DRI , Linux Kernel Mailing List , Jyri Sarha , Marco Felsch , Linux Next Mailing List , Thierry Reding , Sean Paul Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20190523230409.31da92b9@canb.auug.org.au> In-Reply-To: <20190523115355.joyeqlmbjkufueyn@flea> References: <20190521105151.51ffa942@canb.auug.org.au> <20190523115355.joyeqlmbjkufueyn@flea> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/_M21XHDo4D4.=IXfMFpYmIR"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/_M21XHDo4D4.=IXfMFpYmIR Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Maxime, On Thu, 23 May 2019 13:53:55 +0200 Maxime Ripard wrote: > > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > Documentation/devicetree/bindings/vendor-prefixes.txt > > > > between commit: > > > > 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") > > > > from Linus' tree and commits: > > > > b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") > > b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9= 700RTWV43TR-01B") > > fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electron= ics") > > > > from the drm-misc tree. >=20 > I just took your patch and pushed a temp branch there: > https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/= ?h=3Ddrm-misc-next&id=3D3832f2cad5307ebcedeead13fbd8d3cf06ba5e90 >=20 > Rob, Stephen, are you ok with the change? If so, I'll push it. All that needs to be done is for my patch (slightly corrected) needs to be applied to the drm-misc tree. That tree already has the back merge of Linus' tree and the txt file has been removed (my patch should have been applied as part of the merge resolution but doing it later is fine). --=20 Cheers, Stephen Rothwell --Sig_/_M21XHDo4D4.=IXfMFpYmIR Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlzmmkkACgkQAVBC80lX 0GwClQf+KtJ3Zpo/s3kaUrdzpTkte/89nvyxmaiI63SFv545RTxjA9IyszIyDugJ amyGja9rdP0UOiFkAy+Y3mcI1Nyp36x4Pcp3qvsdHWcJd+6QZ8H2J7IP6ItA1F4M EXpv5KBcR1BSPxmY+aJQp4vLuE8AfafHAGtMf4uPFMr7XRIfhSm6w4K4UF9Y/Xp1 b3xC3Tp2BjZg1pc2ZNEj3c4H2pElewVaRex7F4Pozihu8sVlnLMrNEQvlEumgSBr i+ZH0L7Dc9ggHXqPU/4R+6NcbDxMzccWtOZqy3oBoir7g98D2O+1vlfv0Hcz8MP7 XBhTHOlQZwlM55ReOqZ2ja3WiNdafw== =7Nua -----END PGP SIGNATURE----- --Sig_/_M21XHDo4D4.=IXfMFpYmIR--