Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFD773AC0FC for ; Mon, 12 Oct 2026 14:59:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791817151; cv=none; b=I4/0v2Q7+pKLP8rLJ03deTgWZpV6nFvUEma1JDJdYVYjL45zdEEqg4zYAm0wN8v+lRzcQ/1HisdzCeEbUJAiPPK2ZUbiRCz5Q6watJySDO1SL4mHlX0GrH0DkEp1xCfwLeCG4MPRdv//e7RIs+g3Ur430pC1K+9drn/HnYZaIgM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791817151; c=relaxed/simple; bh=tEUbvQiAIGRWCTBfVc+rFHhn/uIvmFCnONWZGdiRp/U=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=YSL1B9eENOU3cRXHkU5FsMm/1WWIWsXqYYKgVszCU7g2BCyeqKZ22nSXDSbNcdQ3ZpHFA4UKgWj+q39vXbwo4ZBel3d913OMpL6A5/+j0SAfZKW1Y/cE02oBZ5sg38V7mC7u5J160m/WcHStklCUMVbvOuhPAlhq6/8h2bGaFjs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SSvdCrp/; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SSvdCrp/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 249831F0089B; Mon, 12 Oct 2026 14:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791817150; bh=oR4TqfOZkTQSHDdmxZCyTHKxyiKLBh0Tmw3ua1qKnOE=; h=Subject:To:Cc:From:Date; b=SSvdCrp/w0RJ4VFUehaPiArFFsn1k1I5Ta3w9Lb1FYqP8nSYW1Nd2QPB5wBGINljS mVi2PrRtOjJxFqXpPeiOHqKyZpUXtDeLDrllccuxeAa2bNrtnCm3Qf9OPOFiQCdkel xnPL1UCq9kMwMFZLWJlFUiPNIL65IPjrz47h7mv8= Subject: FAILED: patch "[PATCH] pmdomain: rockchip: propagate subdomain add errors" failed to apply to 6.1-stable tree To: shawn.lin@rock-chips.com,sebastian.reichel@collabora.com,ulfh@kernel.org Cc: From: Date: Mon, 12 Oct 2026 16:59:16 +0200 Message-ID: <2026101216-quantum-murky-3a7f@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 4c0d69d677cf5b0065ebbb3ceb8ba66fddbec630 # git commit -s git send-email --to '' --in-reply-to '2026101216-quantum-murky-3a7f@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 4c0d69d677cf5b0065ebbb3ceb8ba66fddbec630 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Mon, 21 Sep 2026 14:52:50 +0800 Subject: [PATCH] pmdomain: rockchip: propagate subdomain add errors rockchip_pm_add_subdomain() ignored the return value of its recursive call, so a failure deeper in the hierarchy was silently dropped and probe still succeeded with an incomplete domain tree. Fixes: 6be05b5ec161 ("soc: rockchip: power-domain: add support for sub-power domains") Signed-off-by: Shawn Lin Reviewed-by: Sebastian Reichel Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c index ba66ae719428..068dd4b3705e 100644 --- a/drivers/pmdomain/rockchip/pm-domains.c +++ b/drivers/pmdomain/rockchip/pm-domains.c @@ -1018,7 +1018,9 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu, parent_domain->name, child_domain->name); } - rockchip_pm_add_subdomain(pmu, np); + error = rockchip_pm_add_subdomain(pmu, np); + if (error) + return error; } return 0;