linux-next: manual merge of the thermal-soc tree with the thermal tree

Hi Eduardo, Today's linux-next merge of the thermal-soc tree got a conflict in: drivers/thermal/thermal_core.c between commit: c61628f5c6be ("thermal: fix race condition when updating cooling device") from the thermal tree and commit: 5eb0037dc771 ("thermal: core: introduce thermal_help

linux-next: manual merge of the thermal-soc tree with the thermal tree

Hi Eduardo, Today's linux-next merge of the thermal-soc tree got conflicts in: drivers/thermal/thermal_core.c drivers/thermal/thermal_helpers.c drivers/thermal/thermal_sysfs.c between commits from the thermal tree and the same (or similar) patches from the thermal-soc tree. It looks like

linux-next: manual merge of the thermal-soc tree with the thermal tree

Hi Eduardo, Today's linux-next merge of the thermal-soc tree got a conflict in include/linux/thermal.h between commit 33f1e05e1536 ("Thermal: initialize thermal zone device correctly") from the thermal tree and commit f7e41876c4b2 ("thermal: of: fix cooling device weights in device tree") from the