Merge back thermal control material for 6.4-rc1.

diff --cc drivers/hwmon/hwmon.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
Simple merge

diff --cc drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
Simple merge