From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 26 Apr 2024 13:00:56 +0000 (+0200)
Subject: Merge back earlier thermal core changes for v6.10.
X-Git-Tag: io_uring-6.10-20240523~108^2~1^2~6
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8c882f172f930323e9c994b5b802edf7fb471597;p=linux-block.git

Merge back earlier thermal core changes for v6.10.
---

8c882f172f930323e9c994b5b802edf7fb471597
diff --cc drivers/thermal/thermal_debugfs.c
index 5693cc8b231a,d9f33df2ad2d..771ef5ecadf6
--- a/drivers/thermal/thermal_debugfs.c
+++ b/drivers/thermal/thermal_debugfs.c
@@@ -751,9 -738,8 +745,9 @@@ static void tze_seq_stop(struct seq_fil
  
  static int tze_seq_show(struct seq_file *s, void *v)
  {
 -	struct thermal_zone_device *tz = s->private;
 +	struct thermal_debugfs *thermal_dbg = s->private;
 +	struct thermal_zone_device *tz = thermal_dbg->tz_dbg.tz;
- 	struct thermal_trip *trip;
+ 	struct thermal_trip_desc *td;
  	struct tz_episode *tze;
  	const char *type;
  	int trip_id;