Merge back earlier thermal core changes for v6.10.

diff --cc drivers/thermal/thermal_debugfs.c
index 5693cc8b231aacdcf0a90f363a89e15f7bcd93f8,d9f33df2ad2d1c7c58e52da7332b819f983080fe..771ef5ecadf64116520810d028a6f1c9abc3fe40
--- 1/drivers/thermal/thermal_debugfs.c
--- 2/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;