• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 2c45e7fb
    Linus Torvalds authored
    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
    2c45e7fb
thermal.h 19.3 KB