Merge branches 'thermal-core' and 'thermal-intel' of .git into next

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

diff --cc drivers/thermal/power_allocator.c
index 251676902869d673140b3684c64b0c63ea376f77,045aea59ce9d60bf0066556f80a9a4fc9a635e71,4672250b329f4cec54ab243b55b41b127b1c48d0..9c8a7aad0252e5de75c862213db2f001f06bf9dd
--- 1/drivers/thermal/power_allocator.c
--- 2/drivers/thermal/power_allocator.c
--- 3/drivers/thermal/power_allocator.c
+++ b/drivers/thermal/power_allocator.c
@@@@ -331,9 -326,9 -326,9 +331,9 @@@@ static int allocate_power(struct therma
                                      granted_power, total_granted_power,
                                      num_actors, power_range,
                                      max_allocatable_power, current_temp,
- -                                   (s32)control_temp - (s32)current_temp);
+ +                                   control_temp - current_temp);
   
 --     devm_kfree(&tz->device, req_power);
 ++     kfree(req_power);
   unlock:
        mutex_unlock(&tz->lock);
   

diff --cc drivers/thermal/samsung/exynos_tmu.c
Simple merge

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