From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D9485360EDD for ; Tue, 12 May 2026 13:49:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778593748; cv=none; b=Q98+T0qc5zjWWALADM81fQHXcelM/cJ8/1JbKp5ygBOYUUh0LR4AvzjN+uwFbPHS2o/eu+DN7JYhLz1u611rGNz45Dw1bcmn9ekrhki2kF/wS/hp8Pv4wtXTiTID+xPguiF2owp/S3AXZX6RYc0ZntGef1RJu3DmNxMHXOYhEAE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778593748; c=relaxed/simple; bh=as6Xg+MVu3hzWrlkWNlahbf35lT85+2evMKZlsVkiTM=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=VsQoGlpZZ5yM3SO70uVSk1acgHGQtfpFJrJCtANiVrZSto8Sfek/lB9Tto6W19Gt2NuJevD2oAdrCKfn94hR6XB/89MKEqgFScdBsoW49pi6l7lL2yN/5T7osX0ryPeNuEkGGuX8qsGJWW6uKp7jyd1zE6xBUM7GCZqjLAxI9Vs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pGiSOq4u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="pGiSOq4u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21E3DC2BCB0; Tue, 12 May 2026 13:49:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778593748; bh=as6Xg+MVu3hzWrlkWNlahbf35lT85+2evMKZlsVkiTM=; h=Subject:To:Cc:From:Date:From; b=pGiSOq4uBNYg56XDhL+2nbm6bYlgMG0DmBWOGemy6D3p4q4swNR6uguzC4uhKL9Um waSCzoPfrE4EMsI+fmG91t/fbn0jkPRGIoxGajcIs8iYUQ2GSBUTeN9IqstW7Xpc0N WvSywZ6Y/m51XX/AFyErRb3QirHnCIJ3dfg20oeY= Subject: FAILED: patch "[PATCH] thermal: core: Free thermal zone ID later during removal" failed to apply to 6.1-stable tree To: rafael.j.wysocki@intel.com,stable@vger.kernel.org Cc: From: Date: Tue, 12 May 2026 15:49:05 +0200 Message-ID: <2026051205-eternity-hydrated-162c@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 daae9c18feec74566e023fc88cfb0ce26e39d868 # git commit -s git send-email --to '' --in-reply-to '2026051205-eternity-hydrated-162c@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From daae9c18feec74566e023fc88cfb0ce26e39d868 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Tue, 7 Apr 2026 15:58:34 +0200 Subject: [PATCH] thermal: core: Free thermal zone ID later during removal The thermal zone removal ordering is different from the thermal zone registration rollback path ordering and the former is arguably problematic because freeing a thermal zone ID prematurely may cause it to be used during the registration of another thermal zone which may fail as a result. Prevent that from occurring by changing the thermal zone removal ordering to reflect the thermal zone registration rollback path ordering. Also more the ida_destroy() call from thermal_zone_device_unregister() to thermal_release() for consistency. Fixes: b31ef8285b19 ("thermal core: convert ID allocation to IDA") Cc: All applicable Signed-off-by: Rafael J. Wysocki Link: https://patch.msgid.link/5063934.GXAFRqVoOG@rafael.j.wysocki diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 6e10b2fe2972..c1ec98591703 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -965,6 +965,7 @@ static void thermal_release(struct device *dev) tz = to_thermal_zone(dev); thermal_zone_destroy_device_groups(tz); thermal_set_governor(tz, NULL); + ida_destroy(&tz->ida); mutex_destroy(&tz->lock); complete(&tz->removal); } else if (!strncmp(dev_name(dev), "cooling_device", @@ -1729,8 +1730,6 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) thermal_thresholds_exit(tz); thermal_remove_hwmon_sysfs(tz); - ida_free(&thermal_tz_ida, tz->id); - ida_destroy(&tz->ida); device_del(&tz->device); put_device(&tz->device); @@ -1738,6 +1737,9 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) thermal_notify_tz_delete(tz); wait_for_completion(&tz->removal); + + ida_free(&thermal_tz_ida, tz->id); + kfree(tz->tzp); kfree(tz); }