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=-4.1 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,URIBL_BLOCKED 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 6896EC433DF for ; Wed, 5 Aug 2020 04:10:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4760B206D4 for ; Wed, 5 Aug 2020 04:10:08 +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="VY96+FzX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725791AbgHEEKH (ORCPT ); Wed, 5 Aug 2020 00:10:07 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:33843 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725763AbgHEEKH (ORCPT ); Wed, 5 Aug 2020 00:10:07 -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 4BLynj73ftz9sPB; Wed, 5 Aug 2020 14:10:01 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1596600605; bh=EDbOdXhB1TuEBU9puRY1xAP4ZxDZ7O7baOhMHFmh68c=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=VY96+FzXDSNkzH5t3nOkfEHh/5sTtDsb2WaRwUbi51sm/UcOPyjoDvN8BE2azoBy2 rprTCpTHXSCs6SZGC2ffuFIwpuiLOlroiSAjfOAuYXlv3RbVCVqJUkd78yliCkbGm5 eA/DMlaD3SyAFLZ2YBe3gppMlQ9f5aKqKBpIV0PbSsFwfVz4HOSg55DaEEWWYWmI9v 1UKK1jv3EldWt5fqV6I97hC7BgP9MPGbglOBDPFg4XnJ/JrzuWDgCke7gVSe3Cx6+B mxPqy+nlFdAMJeXfK+bUNDFu6wT94WZidOwHDEjcJvd66rzIg0VDP0d7+VY4/I49oW brnW9TTKSfRCA== Date: Wed, 5 Aug 2020 14:10:01 +1000 From: Stephen Rothwell To: DRI , Dave Airlie Cc: Kees Cook , Daniel Vetter , Intel Graphics , Linux Next Mailing List , Linux Kernel Mailing List , Suraj Upadhyay Subject: Re: linux-next: manual merge of the kspp tree with the drm-misc tree Message-ID: <20200805141001.61d49007@canb.auug.org.au> In-Reply-To: <20200703143550.7ebbe771@canb.auug.org.au> References: <20200703143550.7ebbe771@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/AzVZzTwidl13XJIF7qAgGko"; 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_/AzVZzTwidl13XJIF7qAgGko Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Fri, 3 Jul 2020 14:35:50 +1000 Stephen Rothwell w= rote: >=20 > Today's linux-next merge of the kspp tree got a conflict in: >=20 > drivers/gpu/drm/drm_edid.c >=20 > between commit: >=20 > 948de84233d3 ("drm : Insert blank lines after declarations.") >=20 > from the drm-misc tree and commit: >=20 > 80b89ab785a4 ("treewide: Remove uninitialized_var() usage") >=20 > from the kspp tree. >=20 > I fixed it up (see 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. >=20 > diff --cc drivers/gpu/drm/drm_edid.c > index 252e89cb54a3,b98fa573e706..000000000000 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@@ -3095,8 -3051,7 +3095,8 @@@ static int drm_cvt_modes(struct drm_con > const u8 empty[3] =3D { 0, 0, 0 }; > =20 > for (i =3D 0; i < 4; i++) { > - int uninitialized_var(width), height; > + int width, height; > + > cvt =3D &(timing->data.other_data.data.cvt[i]); > =20 > if (!memcmp(cvt->code, empty, 3)) This is now a conflict between the drm tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/AzVZzTwidl13XJIF7qAgGko Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8qMRkACgkQAVBC80lX 0Gx5EAf6AztnEL2f7GwFk68W7nbVmiG9c42Q99fUgYjjroldpn3PxcIFCK9HYeRT zzlzfsACmqM9JIIRl152AIsBSINaiwrcOhWEIzQZa0/iUXiPSiv4TzZHycuqFZpg UFBtg4BpWjSNEIlMKXa7hD0hi0NR1REHmLAKM54IS14g8Y27iwCWK8BN/osdmhXD eyvXf9+U6Qm2f5SksMng15+jWg19faq01pUbKK762A95aJ6FUIbRTqRYmFk0vj/6 TRx05Zga+JriB2Kjc0ky2UUX56M36FQ6rl6+EWVb2afRkGLFiS8uwekKqk0m3sND E8V47EqoKKyoNZmDDL4CYMvHUB4JOA== =R67q -----END PGP SIGNATURE----- --Sig_/AzVZzTwidl13XJIF7qAgGko--