Merge back thermal control material for 6.11.

diff --cc drivers/thermal/thermal_core.c
index ecc748d15eb7ce07479be603a9ce4df9745926b7,2aa04c46a425f43f9f6da5564f6a7834d5b5238b..3c03d657d98c5688d25959c3817244245e2623c1
--- 1/drivers/thermal/thermal_core.c
--- 2/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@@ -511,16 -514,16 +514,16 @@@ void __thermal_zone_device_update(struc
        update_temperature(tz);
  
        if (tz->temperature == THERMAL_TEMP_INVALID)
 -              return;
 +              goto monitor;
  
-       __thermal_zone_set_trips(tz);
- 
        tz->notify_event = event;
  
        for_each_trip_desc(tz, td)
                handle_thermal_trip(tz, td, &way_up_list, &way_down_list);
  
 -      list_sort(&way_up_list, &way_up_list, thermal_trip_notify_cmp);
+       thermal_zone_set_trips(tz);
+ 
 +      list_sort(NULL, &way_up_list, thermal_trip_notify_cmp);
        list_for_each_entry(td, &way_up_list, notify_list_node)
                thermal_trip_crossed(tz, &td->trip, governor, true);
  

diff --cc drivers/thermal/thermal_core.h
Simple merge