diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-09 10:59:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-09 10:59:00 -0800 |
| commit | 316eaf170252f3b50e0d7d5d17ac1f0ee8ae70ef (patch) | |
| tree | 346789e9dd80710a330f2b2e8ef17e2a3f2d1385 /drivers | |
| parent | Linux 5.5-rc1 (diff) | |
| parent | MAINTAINERS: thermal: Change the git tree location (diff) | |
| download | linux-dev-316eaf170252f3b50e0d7d5d17ac1f0ee8ae70ef.tar.xz linux-dev-316eaf170252f3b50e0d7d5d17ac1f0ee8ae70ef.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thermal/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 59b79fc48266..79b27865c6f4 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -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 |