Skip to content
  • Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 9ebd051a
    Linus Torvalds authored
    Pull thermal updates from Zhang Rui:
    
     - use int instead of unsigned long to represent temperature to avoid
       bogus overheat detection when negative temperature reported.  From
       Sascha Hauer.
    
     - export available thermal governors information to user space via
       sysfs.  From Wei Ni.
    
     - introduce new thermal driver for Wildcat Point platform controller
       hub, which uses PCH thermal sensor and associated critical and hot
       trip points.  From Tushar Dave.
    
     - add suuport for Intel Skylake and Denlow platforms in powerclamp
       driver.
    
     - some small cleanups in thermal core.
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
      thermal: Add Intel PCH thermal driver
      thermal: Add comment explaining test for critical temperature
      thermal: Use IS_ENABLED instead of #ifdef
      thermal: remove unnecessary call to thermal_zone_device_set_polling
      thermal: trivial: fix typo in comment
      thermal: consistently use int for temperatures
      thermal: add available policies sysfs attribute
      thermal/powerclamp: add cpu id for denlow platform
      thermal/powerclamp: add cpu id for Skylake u/y
      thermal/powerclamp: add cpu id for skylake h/s
    9ebd051a