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: Fri, 24 May 2019 09:12:53 +0200 Message-ID: <20190524071253.xfimg5mlvzevj2nk@flea> References: <20190521105151.51ffa942@canb.auug.org.au> <20190523115355.joyeqlmbjkufueyn@flea> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0339705149==" Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Rob Herring Cc: Stephen Rothwell , Daniel Vetter , Intel Graphics , Marco Felsch , Jyri Sarha , Linux Kernel Mailing List , Linux Next Mailing List , DRI , Thierry Reding List-Id: linux-next.vger.kernel.org --===============0339705149== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hfshwxlp636xi7sx" Content-Disposition: inline --hfshwxlp636xi7sx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, May 23, 2019 at 11:10:39AM -0500, Rob Herring wrote: > On Thu, May 23, 2019 at 6:54 AM Maxime Ripard wrote: > > > > 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. > > The 'tfc' line is missing a ':' on the end. That's on me, sorry. > Does the file pass dt_binding_check like that? No, it didn't but I overlooked it somehow. I've pushed that patch with the extra semi-column. Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com --hfshwxlp636xi7sx Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCXOeZdQAKCRDj7w1vZxhR xZr9AP9GA2LoSNSb8Aw3lEDA0VSIAbX2AciLEGPTA/XJg9DJNQEAjA43h9VqiTXF qjCOtN/i2lxT8YXjFbrhoaQuY7/4yQU= =kgcI -----END PGP SIGNATURE----- --hfshwxlp636xi7sx-- --===============0339705149== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 --===============0339705149==--