Merge back thermal control material for 6.4-rc1.

diff --cc drivers/power/supply/power_supply_core.c
Simple merge

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

diff --cc include/linux/thermal.h
Simple merge