From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree Date: Thu, 23 May 2019 13:53:55 +0200 Message-ID: <20190523115355.joyeqlmbjkufueyn@flea> References: <20190521105151.51ffa942@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0018240827==" Return-path: Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F99E89DFD for ; Thu, 23 May 2019 11:53:59 +0000 (UTC) In-Reply-To: <20190521105151.51ffa942@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Stephen Rothwell Cc: Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , Jyri Sarha , Marco Felsch , Linux Next Mailing List , DRI , Thierry Reding List-Id: dri-devel@lists.freedesktop.org --===============0018240827== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="22oxjvmo2hvuqeqd" Content-Disposition: inline --22oxjvmo2hvuqeqd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > Hi all, > > 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 S9700RTWV43TR-01B") > fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") > > from the drm-misc tree. > > I fixed it up (I deleted the file and added the patch 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. 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=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90 Rob, Stephen, are you ok with the change? If so, I'll push it. Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com --22oxjvmo2hvuqeqd Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCXOaJzQAKCRDj7w1vZxhR xcfwAP9V0omTw8jbR0a5wFDMizYxiSE6KvGa0yDpAyucXGBcqAEAgP78Gkggt6vS 4E1Xd5LVpNQXXiwmH7FNbcL6r2C8ggk= =birf -----END PGP SIGNATURE----- --22oxjvmo2hvuqeqd-- --===============0018240827== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs --===============0018240827==--