From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Jul 2019 20:13:41 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Tag: v5.4-rc1~528
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aac09ce27556f79f20a860ae89d790d7bfbf1747;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'next' of git://git./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
---

aac09ce27556f79f20a860ae89d790d7bfbf1747