From nobody Fri Jan 2 20:35:06 2026 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 65060E95A67 for ; Mon, 9 Oct 2023 00:09:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345023AbjJIAI7 (ORCPT ); Sun, 8 Oct 2023 20:08:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344929AbjJIAI5 (ORCPT ); Sun, 8 Oct 2023 20:08:57 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51894A6; Sun, 8 Oct 2023 17:08:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1696810134; bh=H3b5Q4CPhf81BAdNsBH6LuxbsnJyU4sVyUV1x2qhmA8=; h=Date:From:To:Cc:Subject:From; b=AGb1iLFDKb9CIgjxZnImgYVCOwokV6IZSIqFHl1vR4uD3FF7hOqYNNsEgClYAnV1+ o2udg/jytrXq50a49CBtHXPslZb0QMgIf3kJQUwg2+dSBK3RH91qL8tPwZcyviH0gg dNvCugSvjM5jkA1f3plzX3CCnydnbRp/CProX6coyj9+q+9jAFI4I5wRyvPIGK8k0V 31J6Lyjf7MOSIOuwBA9L2aTRuSsqlpGD2eXz/t0J5Dp4IVs2uYRlLjalJurYa2uo6R FE1Pjy7fsA3idSqfyQA1/O3hTB6ppOZulHDRbAznkS16jBtsI9HIN21rM0QPHcEstj wt4zzjagMh0fA== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S3fX56NxKz4xPf; Mon, 9 Oct 2023 11:08:53 +1100 (AEDT) Date: Mon, 9 Oct 2023 11:08:52 +1100 From: Stephen Rothwell To: Mauro Carvalho Chehab Cc: Bryan O'Donoghue , Hans Verkuil , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the v4l-dvb-next tree Message-ID: <20231009110852.36b0bd42@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/A1sezmQ/KuRtzY79VQD+=6s"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/A1sezmQ/KuRtzY79VQD+=6s Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, After merging the v4l-dvb-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/media/platform/qcom/camss/camss.c: In function 'camss_probe': drivers/media/platform/qcom/camss/camss.c:1634:17: error: label 'err_cleanu= p' used but not defined 1634 | goto err_cleanup; | ^~~~ Caused by commits 7405116519ad ("media: qcom: camss: Fix pm_domain_on sequence in probe") b278080a89f4 ("media: qcom: camss: Fix V4L2 async notifier error path") interacting with commit 2c1bae27df78 ("media: qcom: camss: Fix pm_domain_on sequence in probe") from the v4l-dvb tree. I have applied the following merge resolution patch for today. From: Stephen Rothwell Date: Mon, 9 Oct 2023 11:05:26 +1100 Subject: [PATCH] v4l-dvb-next: fix up for bad automatic merge. Signed-off-by: Stephen Rothwell --- drivers/media/platform/qcom/camss/camss.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/plat= form/qcom/camss/camss.c index 38d20b12cdd8..8e78dd8d5961 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -1628,12 +1628,6 @@ static int camss_probe(struct platform_device *pdev) return ret; } =20 - ret =3D camss_configure_pd(camss); - if (ret < 0) { - dev_err(dev, "Failed to configure power domains: %d\n", ret); - goto err_cleanup; - } - ret =3D camss_init_subdevices(camss); if (ret < 0) goto err_genpd_cleanup; --=20 2.40.1 --=20 Cheers, Stephen Rothwell --Sig_/A1sezmQ/KuRtzY79VQD+=6s Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUjRJQACgkQAVBC80lX 0GwuiQf/QfAzuWmGC6qJnIVAonO6LYfjmaUK06Ga8oQlvRphiOSu3980xTLIBg6F CoANi+4K1bSiQJYDfuQQigeffbfT/4c3FgTM5wP/9VUYIuruoA8NNJJoVcdPYlKI FGkiRzkAyiZSfWY7gIph9kb5lcYjdRgaJNHnFY/xUX9oWlsptH94AQ5HCe/SzaQT PBpWMRWoUgYyB/5w79BLJ4d7XZybzi9e8mGo1lnDCL5hCQJVo61260h6cgmH//To QAunR1ug2qqkuBMSRO7S5gjtIUq03s4s3vBdL08rdjWm6rUEsuRYPvtPw4PeytpB +UyvJRIw9b0+X74JL5/BfgUBQhd3ig== =ybwZ -----END PGP SIGNATURE----- --Sig_/A1sezmQ/KuRtzY79VQD+=6s--