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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 948E8C433FE for ; Fri, 18 Nov 2022 09:20:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241849AbiKRJUd (ORCPT ); Fri, 18 Nov 2022 04:20:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241857AbiKRJU1 (ORCPT ); Fri, 18 Nov 2022 04:20:27 -0500 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEB08AE58; Fri, 18 Nov 2022 01:20:25 -0800 (PST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 523F45C0513; Fri, 18 Nov 2022 04:20:23 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 18 Nov 2022 04:20:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; t=1668763223; x=1668849623; bh=4n4DR4UwM1 0Hw+UX/vwcqMHSZCvbtAN5htQFeot9k0s=; b=LYNeULVFAebnqpXOJpHXpNjDeY XS0flPyOKrAZxKsh4iQc0ZI5EJvqg/vL6nqEYs2k4HELn5ioOaZASWxsOBDZz8Nk U05AvRz/anebMho0GIoFAUzeWR1Q6yHnU5KvMD1nZOe9dV2tCagLqZhi0JH3vmc1 LtG7PYqX4CR6zcupd+XfXf2RZZ7wky/8sxvaKpgnawNa9PBoZU0XWNLEBuTHrV+i Dt9H/w54YuWeBAsGdv+QQNxbSMV265i4e6LiwviudQHCQc9zv90hT1Vw/cIQoosB PtT0UHFH6679yAOFMWv+pSsE8UAUuA6b3otS69gmmKEp0Hw2aMEydArXGhHA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1668763223; x=1668849623; bh=4n4DR4UwM10Hw+UX/vwcqMHSZCvb tAN5htQFeot9k0s=; b=dYtPEl3UgKwY4kyD4AclEMrQ2EtGmLPlA68TpselZHFF 9u8LIdlGK0KAGUzTewj5FC9HO3MG39VuhRI9zm+ur9hWzfEkDlRNbeU9sL2qLVmh l6v/t6vop4T3uI8/LivxEaQyaJWmgtH9aYewlRAVb8j7ag0mz4E2v7cI7LOh6voh /brht4rf2zmC395EH+IGCIHNyyZpNURecjznZ6jIAtZY+V15ds2359kF8IrdJwYr zHvtZDwHd6wq7ElS1IfwH7Sjao5l6JXsJ8P2Sy4Soqpn0N1m+w5WBYvMwhs8l3kn cOdGElnKuyTbwsdFDvebzfpfudJciGUooy4nSwbV2w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrhedtgddtvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvvefukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepteefffefgfektdefgfeludfgtdejfeejvddttdekteeiffejvdfgheehfffh vedunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmh grgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 18 Nov 2022 04:20:22 -0500 (EST) Date: Fri, 18 Nov 2022 10:20:20 +0100 From: Maxime Ripard To: Nathan Chancellor Cc: Stephen Rothwell , Daniel Vetter , Intel Graphics , DRI , =?utf-8?B?Sm9zw6kgRXhww7NzaXRv?= , Linux Kernel Mailing List , Linux Next Mailing List , llvm@lists.linux.dev Subject: Re: linux-next: manual merge of the drm-misc tree with the origin tree Message-ID: <20221118092020.nhvjomvwwryb7j3n@houat> References: <20221116105702.746ce3cf@canb.auug.org.au> <20221118090636.00bfc293@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="utkgyjtezkaepsh6" Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --utkgyjtezkaepsh6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 17, 2022 at 05:01:08PM -0700, Nathan Chancellor wrote: > On Fri, Nov 18, 2022 at 09:06:36AM +1100, Stephen Rothwell wrote: > > Hi Nathan, > >=20 > > On Thu, 17 Nov 2022 10:29:33 -0700 Nathan Chancellor wrote: > > > > > > This resolution is not quite right, as pointed out by clang: > > >=20 > > > drivers/gpu/drm/vc4/vc4_hdmi.c:351:14: error: variable 'vc4_hdmi'= is uninitialized when used here [-Werror,-Wuninitialized] > > > mutex_lock(&vc4_hdmi->mutex); > > > ^~~~~~~~ > > > ./include/linux/mutex.h:187:44: note: expanded from macro 'mutex_= lock' > > > #define mutex_lock(lock) mutex_lock_nested(lock, 0) > > > ^~~~ > > > drivers/gpu/drm/vc4/vc4_hdmi.c:322:27: note: initialize the varia= ble 'vc4_hdmi' to silence this warning > > > struct vc4_hdmi *vc4_hdmi; > > > ^ > > > =3D NULL > > > 1 error generated. > > >=20 > > > Obviously, the assignment of vc4_hdmi should be before mutex_lock(). > >=20 > > Thanks for pointing that out (silly me :-) ). I have fixed up the > > resolution for today. >=20 > Great, thank you so much! One less warning to worry about :) I actually did the same conflict resolution in drm-tip. I've fixed it up too, thanks for your report :) Maxime --utkgyjtezkaepsh6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCY3dOVAAKCRDj7w1vZxhR xa2fAQD933QJY5E3XRwJGvMvYIALowd4qIYtQyxBCrk/Zo2bTQEAiLYk8Ij68h6E CzpNCMHNSYp+43IPN7VzU0UqzQpvawk= =GyeM -----END PGP SIGNATURE----- --utkgyjtezkaepsh6--