Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management updates from Zhang Rui: - Remove the 'module' Kconfig option for thermal subsystem framework because the thermal framework are required to be ready as early as possible to avoid overheat at boot time (Daniel Lezcano) - Fix a bug that thermal framework pokes disabled thermal zones upon resume (Wei Wang) - A couple of cleanups and trivial fixes on int340x thermal drivers (Srinivas Pandruvada, Zhang Rui, Sumeet Pawnikar) * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: drivers: thermal: processor_thermal: Downgrade error message mlxsw: Remove obsolete dependency on THERMAL=m hwmon/drivers/core: Simplify complex dependency thermal/drivers/core: Fix typo in the option name thermal/drivers/core: Remove depends on THERMAL in Kconfig thermal/drivers/core: Remove module unload code thermal/drivers/core: Remove the module Kconfig's option thermal: core: skip update disabled thermal zones after suspend thermal: make device_register's type argument const thermal: intel: int340x: processor_thermal_device: simplify to get driver data thermal/int3403_thermal: favor _TMP instead of PTYP
Showing
- arch/arm/configs/mini2440_defconfig 1 addition, 1 deletionarch/arm/configs/mini2440_defconfig
- arch/arm/configs/pxa_defconfig 1 addition, 1 deletionarch/arm/configs/pxa_defconfig
- arch/mips/configs/ip22_defconfig 1 addition, 1 deletionarch/mips/configs/ip22_defconfig
- arch/mips/configs/ip27_defconfig 1 addition, 1 deletionarch/mips/configs/ip27_defconfig
- arch/unicore32/configs/unicore32_defconfig 1 addition, 1 deletionarch/unicore32/configs/unicore32_defconfig
- drivers/hwmon/hwmon.c 1 addition, 3 deletionsdrivers/hwmon/hwmon.c
- drivers/net/ethernet/mellanox/mlxsw/Kconfig 0 additions, 1 deletiondrivers/net/ethernet/mellanox/mlxsw/Kconfig
- drivers/thermal/Kconfig 3 additions, 5 deletionsdrivers/thermal/Kconfig
- drivers/thermal/intel/Kconfig 0 additions, 1 deletiondrivers/thermal/intel/Kconfig
- drivers/thermal/intel/int340x_thermal/int3403_thermal.c 8 additions, 8 deletionsdrivers/thermal/intel/int340x_thermal/int3403_thermal.c
- drivers/thermal/intel/int340x_thermal/processor_thermal_device.c 2 additions, 11 deletions.../thermal/intel/int340x_thermal/processor_thermal_device.c
- drivers/thermal/qcom/Kconfig 0 additions, 1 deletiondrivers/thermal/qcom/Kconfig
- drivers/thermal/thermal_core.c 12 additions, 19 deletionsdrivers/thermal/thermal_core.c
- include/linux/thermal.h 3 additions, 3 deletionsinclude/linux/thermal.h
Loading
Please register or sign in to comment