Commit 316eaf17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux 

Pull thermal fixes from Zhang Rui:
 "Starting from this release cycle, we have Daniel Lezcano work as the
  new thermal co-maintainer because Eduardo's email is bouncing for
  sometime and we can not reach him. We also have a new shared git tree
  so that both Daniel and I can actively working on it.

  Specifics:

   - Update MAINTAINER file for new thermal co-maintainer and new
     thermal git tree address. (Daniel Lezcano, Florian Fainelli, Zhang
     Rui)

   - Fix a Kconfig warning. (YueHaibing)"

* tag 'thermal-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  MAINTAINERS: thermal: Change the git tree location
  MAINTAINERS: thermal: Add Daniel Lezcano as the thermal maintainer
  MAINTAINERS: thermal: Eduardo's email is bouncing
  thermal: power_allocator: Fix Kconfig warning
parents e42617b8 6e456dca

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -16314,12 +16314,10 @@ F: drivers/media/radio/radio-raremono.c 








THERMAL









M:	Zhang Rui <rui.zhang@intel.com>









M:	Eduardo Valentin <edubezval@gmail.com>









R:	Daniel Lezcano <daniel.lezcano@linaro.org>









M:	Daniel Lezcano <daniel.lezcano@linaro.org>









R:	Amit Kucheria <amit.kucheria@verdurent.com>









L:	linux-pm@vger.kernel.org









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git









Q:	https://patchwork.kernel.org/project/linux-pm/list/









S:	Supported









F:	drivers/thermal/
































drivers/thermal/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -108,7 +108,7 @@ config THERMAL_DEFAULT_GOV_USER_SPACE

















config THERMAL_DEFAULT_GOV_POWER_ALLOCATOR









	bool "power_allocator"









	select THERMAL_GOV_POWER_ALLOCATOR









	depends on THERMAL_GOV_POWER_ALLOCATOR









	help









	  Select this if you want to control temperature based on









	  system and device power allocation. This governor can only


































































CRA Git | Maintained and supported by SUSTech CRA and CCSE