Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal updates from Zhang Rui: - Fix a race condition when updating cooling device, which may lead to a situation where a thermal governor never updates the cooling device. From Michele Di Giorgio. - Fix a zero division error when disabling the forced idle injection from the intel powerclamp. From Petr Mladek. - Add suspend/resume callback for intel_pch_thermal thermal driver. From Srinivas Pandruvada. - Another two fixes for clocking cooling driver and hwmon sysfs I/F. From Michele Di Giorgio and Kuninori Morimoto. [ Hmm. That suspend/resume callback for intel_pch_thermal doesn't look like a fix, but I'm letting it slide.. - Linus ] * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal: clock_cooling: Fix missing mutex_init() thermal: hwmon: EXPORT_SYMBOL_GPL for thermal hwmon sysfs thermal: fix race condition when updating cooling device thermal/powerclamp: Prevent division by zero when counting interval thermal: intel_pch_thermal: Add suspend/resume callback
No related branches found
No related tags found
Showing
- drivers/thermal/clock_cooling.c 1 addition, 0 deletionsdrivers/thermal/clock_cooling.c
- drivers/thermal/fair_share.c 2 additions, 0 deletionsdrivers/thermal/fair_share.c
- drivers/thermal/gov_bang_bang.c 2 additions, 0 deletionsdrivers/thermal/gov_bang_bang.c
- drivers/thermal/intel_pch_thermal.c 59 additions, 1 deletiondrivers/thermal/intel_pch_thermal.c
- drivers/thermal/intel_powerclamp.c 7 additions, 4 deletionsdrivers/thermal/intel_powerclamp.c
- drivers/thermal/power_allocator.c 2 additions, 0 deletionsdrivers/thermal/power_allocator.c
- drivers/thermal/step_wise.c 2 additions, 0 deletionsdrivers/thermal/step_wise.c
- drivers/thermal/thermal_core.c 7 additions, 3 deletionsdrivers/thermal/thermal_core.c
- drivers/thermal/thermal_hwmon.c 2 additions, 0 deletionsdrivers/thermal/thermal_hwmon.c
Loading
Please register or sign in to comment