| Message ID | 20231009110852.36b0bd42@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp1581931vqo;
Sun, 8 Oct 2023 17:17:03 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IGmOZrh4NjudbZXvXvtS+1Y2Uo5mXZR+Zd2XcTODJ/+f3Sd5Iw0zD5NxuxSZxPAJZQEDp9M
X-Received: by 2002:a05:6870:7010:b0:1bf:7e94:bbb5 with SMTP id
u16-20020a056870701000b001bf7e94bbb5mr17967359oae.7.1696810623406;
Sun, 08 Oct 2023 17:17:03 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1696810623; cv=none;
d=google.com; s=arc-20160816;
b=QE5D7u6R3q0tDIRihtBNOVWIkE37mEqqW/MXZjeR5lVAp7a8ehwvISnLdqHtRuhWp3
AAbr7GLAP5cmB4dbNoRC01/Y/9S3YyvA0B/2Rj+zy75p35uTat2rlyXfZudwZbNQKBH3
gMzZFwbkBQziMkL3GRJcDgQQqajWkLy2l/bCr/fFheYGc4hgf35NDHOjALmcqJHJYNU3
qTTEPKYhFoR3enWhSl2LEg9W9mF5yoNsKsYDD17OoVG9nqn+IcZEGqgyUTHUoGfalXjS
gZq7Tuon066bgcTxwFRXHaVifn+iEVLtWuoAkESMpz8eanNJFfHvRLDJE+xQGJtAwzuV
5XBg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=H3b5Q4CPhf81BAdNsBH6LuxbsnJyU4sVyUV1x2qhmA8=;
fh=p1PVLzx19owYMzmPZzuFU+8/DFwjlOcDwjlMUCmarzU=;
b=rT07fAe8nGK7EcBzz6Rj5qLwWHIxDeGDVA9gWnuFnqRPvHSYiRa38GIWW0+a86NVko
kDJk5C1/NoLijFgJdHdO0dvbPNYCDMGuQU9iuffO15CSCUdbe/EHkRD4BgEOYJMN/I9W
UHpl9N1QeFXOgzOMVDD9ziOGs/arhWigvXDRI4wVO0YgyxniiG8WValtQJfymqhAkAaT
TVOtEm3r9iOzT3t4v9ofbEeMX9g39Axo7y91o9qb+thJlvpXYfXInd/81yG+3+4nq8US
byfoMrBrinWQAPIfZDx1D3jmJJa3UDx4so2I7yLj4vNyzE/PMMTSG0w4QbPX9E+yRD1s
ON1Q==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=AGb1iLFD;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:2 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2])
by mx.google.com with ESMTPS id
v10-20020a63610a000000b00589fcc39ef1si5764114pgb.365.2023.10.08.17.17.03
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 08 Oct 2023 17:17:03 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:2 as permitted sender)
client-ip=2620:137:e000::3:2;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=AGb1iLFD;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:2 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by agentk.vger.email (Postfix) with ESMTP id 8D6A68089851;
Sun, 8 Oct 2023 17:17:01 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1345020AbjJIAI7 (ORCPT <rfc822;ezelljr.billy@gmail.com>
+ 19 others); 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
<rfc822;linux-kernel@vger.kernel.org>);
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 <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
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
X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]);
Sun, 08 Oct 2023 17:17:01 -0700 (PDT)
X-Spam-Level: **
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1779234895819410815
X-GMAIL-MSGID: 1779234895819410815
|
| Series |
linux-next: build failure after merge of the v4l-dvb-next tree
|
|
Commit Message
Stephen Rothwell
Oct. 9, 2023, 12:08 a.m. UTC
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_cleanup' 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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
drivers/media/platform/qcom/camss/camss.c | 6 ------
1 file changed, 6 deletions(-)
Comments
On 09/10/2023 01:08, Stephen Rothwell wrote: > 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_cleanup' 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 <sfr@canb.auug.org.au> > 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 <sfr@canb.auug.org.au> > --- > 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/platform/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; > } > > - ret = camss_configure_pd(camss); > - if (ret < 0) { > - dev_err(dev, "Failed to configure power domains: %d\n", ret); > - goto err_cleanup; > - } > - > ret = camss_init_subdevices(camss); > if (ret < 0) > goto err_genpd_cleanup; commit: f69791c39745e ("media: qcom: camss: Fix genpd cleanup") already appears in linux-next/master @ next-20231009 which commit: 2c1bae27df78 ("media: qcom: camss: Fix pm_domain_on sequence in probe") depends on. Already looks resolved. --- bod
On 09/10/2023 11:25, Bryan O'Donoghue wrote: > On 09/10/2023 01:08, Stephen Rothwell wrote: >> 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_cleanup' 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 <sfr@canb.auug.org.au> >> 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 <sfr@canb.auug.org.au> >> --- >> 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/platform/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; >> } >> - ret = camss_configure_pd(camss); >> - if (ret < 0) { >> - dev_err(dev, "Failed to configure power domains: %d\n", ret); >> - goto err_cleanup; >> - } >> - >> ret = camss_init_subdevices(camss); >> if (ret < 0) >> goto err_genpd_cleanup; > > commit: f69791c39745e ("media: qcom: camss: Fix genpd cleanup") already appears in linux-next/master @ next-20231009 which commit: 2c1bae27df78 ("media: qcom: camss: Fix pm_domain_on sequence in > probe") depends on. > > Already looks resolved. There is a spurious patch committed in https://git.linuxtv.org/media_tree.git/log/ I'm not sure why it's there, but Mauro needs to drop that patch. Regards, Hans
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/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; } - ret = camss_configure_pd(camss); - if (ret < 0) { - dev_err(dev, "Failed to configure power domains: %d\n", ret); - goto err_cleanup; - } - ret = camss_init_subdevices(camss); if (ret < 0) goto err_genpd_cleanup;