Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion...

diff --cc drivers/thermal/cpu_cooling.c
Simple merge

diff --cc drivers/thermal/thermal_core.c
index 655591316a881274a6d152801ffd19138a0dc34b,655591316a881274a6d152801ffd19138a0dc34b,655591316a881274a6d152801ffd19138a0dc34b,f2a0cd119e2211e29957e63e5adfeca0b9738738..11f0675cb7e552456d36ec49c82a46d5cf016d04
--- 1/drivers/thermal/thermal_core.c
--- 2/drivers/thermal/thermal_core.c
--- 3/drivers/thermal/thermal_core.c
--- 4/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@@@@ -1313,10 -1313,10 -1313,10 -1287,15 +1292,10 @@@@@ void thermal_zone_device_unregister(str
        thermal_set_governor(tz, NULL);
    
        thermal_remove_hwmon_sysfs(tz);
---     release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
---     idr_destroy(&tz->idr);
+++     ida_simple_remove(&thermal_tz_ida, tz->id);
+++     ida_destroy(&tz->ida);
        mutex_destroy(&tz->lock);
        device_unregister(&tz->device);
   -    kfree(tz->device.groups);
    }
    EXPORT_SYMBOL_GPL(thermal_zone_device_unregister);