tree 205fa380d16ac1edfb5a971873f2e85e8d922b17
parent c3c08f939abe3a1c95338a246c550aca0989dade
parent 6c395f66e98c895cf3ebf87c0b2fc63b6a57a196
author Linus Torvalds <torvalds@linux-foundation.org> 1563394421 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1563394421 -0700

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Pull thermal management updates from Zhang Rui:

 - Convert thermal documents to ReST (Mauro Carvalho Chehab)

 - Fix a cyclic depedency in between thermal core and governors (Daniel
   Lezcano)

 - Fix processor_thermal_device driver to re-evaluate power limits after
   resume (Srinivas Pandruvada, Zhang Rui)

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  drivers: thermal: processor_thermal_device: Fix build warning
  docs: thermal: convert to ReST
  thermal/drivers/core: Use governor table to initialize
  thermal/drivers/core: Add init section table for self-encapsulation
  drivers: thermal: processor_thermal: Read PPCC on resume