Received: by 2002:a05:7412:da14:b0:e2:908c:2ebd with SMTP id fe20csp1775084rdb; Mon, 9 Oct 2023 02:27:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHi5VUg4Oqc4fGcw3L3TexnYvRooww58Sw/lIquS9OUsMaHCX8WhYXtz71xENoeM8LJiGE6 X-Received: by 2002:a05:6a00:2348:b0:690:d251:28ad with SMTP id j8-20020a056a00234800b00690d25128admr14615876pfj.29.1696843636809; Mon, 09 Oct 2023 02:27:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696843636; cv=none; d=google.com; s=arc-20160816; b=Ob/5RW/gdObsVxNRMDFTJqOa1n8SErfY661HjjEIiR7SBGjtd4t7oYAzpBi8nqpKKr QloQSg/55g5v/zfyvXYjN8gQI3ODfIS4zx06Z3X5kEGRz8QyzL9+sfAC/NiTsX5YT1FS LkZSashkDuAyhPawBRcS8tb4q9ZfR2PxYpj3NOXbIz71exxKTh8lQd4Y/s6y/0yWV9Co U3BV6xAeiPPwo0YNi4V8APafj50SBK+hCKuITO8/ocHwvzwDY0Lo3YR1Up20Ij6y7Hsr 4sidDCw3E3Fxek96Q4v0xGJS/DJZVQCPZ7k5piHk+2Z4uuDvqji0LQBtNQuT39rFMi6D usEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=tfQehytd154kLft/C6yCF4s9r73XIYt4SKOC9+YlYHc=; fh=VVhJmwaRpzvI9I5St4MPSDt0XYHXUONS3OumilM1eKw=; b=rsBqaR80aSgdRW8VAJA52b+D2UB7jNXtAl+GT7EzRkRrF6IdXfHFGuEkS4+PhZEPkJ WfLMb0LacQVvXnOPUNtQHruFB58NaST+mp+6Z9sakyooBeWuD4EPkW/pA66s/WU8qfy8 UYPJeEeOD7CX80uqQsTHg9bFZ2dvb/FqJyT+bMLcteFHQn1fQIswXe1tGCUntGrMDsby D4PIe6XxgAx4b2yYEIc6jN8R5PZM5Xa3tRWBlS2eyYxvlK9MEkmFvYprTmxlseM1qnMr qML3FJucyVT7sp6xibuiuvSBzIlsNIwo1xfS5PfElYLT4syeBJlg0BUWHyI8XQILUFSa xLkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=me4D9fpO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id cb7-20020a056a00430700b0068ff659af62si6922303pfb.106.2023.10.09.02.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 02:27:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=me4D9fpO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id C7F84802AD2B; Mon, 9 Oct 2023 02:27:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345950AbjJIJ1J (ORCPT + 99 others); Mon, 9 Oct 2023 05:27:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345862AbjJIJ05 (ORCPT ); Mon, 9 Oct 2023 05:26:57 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30993D7F for ; Mon, 9 Oct 2023 02:25:44 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-405361bba99so39253795e9.2 for ; Mon, 09 Oct 2023 02:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696843542; x=1697448342; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=tfQehytd154kLft/C6yCF4s9r73XIYt4SKOC9+YlYHc=; b=me4D9fpOnvg/FdEIxiR3mlEN7mDLOlqnbd/B1FKvBMfqiN2o7qLdp8kUvTcYyqKSFu 2B5un7CywJkjneGpPUUxzIjnXlA63NZhINmuMi9Uzniu7WAi5hKmZypfWjddz1+Hcekj sBswRTwSwExpoK9yaZch/qfsmKGUGPvtdvJikYqG7HdWld8EcRdw+Ysp+xgkaexxSgiG 5sMPSYdOaWlHvc3LHfmG+mA71+f29LeJ/6PlCheQxyNqpx8qEVBinUPVuKG0PPnSUud8 iItx9BhwqMmaMyeC5Tl+3tCjUWlG392Mr6rhHLxlmk94rOvGsQT0c7tffDY1Ypcbs8SV ExGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696843542; x=1697448342; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tfQehytd154kLft/C6yCF4s9r73XIYt4SKOC9+YlYHc=; b=vS+yZvWb/xFjPeaURyDQVzV3SQDlYNNM4gJ4Y28O6euumQTbjnc3REKEsrXre9FrIq VuFFEljM2msgeRjQZ0CwOGG0CtwA+6c7vyWfM+7vgVEOldD1gwuqn7Tgw+3Owm6iJEQh rGAyCaV3LuzKchgCri2jbHNfgjwOfhAaJO/LyGqNIm7+Au4cl8WFY8Kw6EBUTL4B1O19 ENXC0m+7QcxKhiSluRHWf/skMecvtVVbBRNGDRspO+MzwDLhJ966Bsp7k1jisCJN6lGB 0YtNq+kwpg6JkKBHaoZwaKygDH5/G6m77r7IybUcLswRCL81BL6gsZhogXPPBa0OVzIx jsuA== X-Gm-Message-State: AOJu0Yz0l5r0tVK1Ihj4ezF8F4DmyGL1EpIE2DhqWFJ9Ptw98vyLObHL 1DBl2M1J0FMVNhCRMG8GGdBL0A== X-Received: by 2002:a5d:484a:0:b0:320:1d1:71c4 with SMTP id n10-20020a5d484a000000b0032001d171c4mr13600684wrs.23.1696843542542; Mon, 09 Oct 2023 02:25:42 -0700 (PDT) Received: from [192.168.100.102] ([37.228.218.3]) by smtp.gmail.com with ESMTPSA id i17-20020adffdd1000000b00326c952716esm8979393wrs.61.2023.10.09.02.25.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Oct 2023 02:25:42 -0700 (PDT) Message-ID: <3edb10ab-2c14-4750-962c-c0b874c34b88@linaro.org> Date: Mon, 9 Oct 2023 10:25:41 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: build failure after merge of the v4l-dvb-next tree Content-Language: en-US To: Stephen Rothwell , Mauro Carvalho Chehab Cc: Hans Verkuil , Linux Kernel Mailing List , Linux Next Mailing List References: <20231009110852.36b0bd42@canb.auug.org.au> From: Bryan O'Donoghue In-Reply-To: <20231009110852.36b0bd42@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 09 Oct 2023 02:27:16 -0700 (PDT) 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 > 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/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