diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-29 19:59:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-29 19:59:49 -0700 |
| commit | 89970a04d70c6c9e5e4492fd4096c0b5630a478c (patch) | |
| tree | 21946302b9015bae501db21e1082160b4c055476 /block | |
| parent | 806276b7f07a39a1cc3f38bb1ef5c573d4594a38 (diff) | |
| parent | 3ea3217cf91804be6ed9b368ef4ac7911eb1dadc (diff) | |
| download | linux-rt-89970a04d70c6c9e5e4492fd4096c0b5630a478c.tar.gz | |
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fixes from Zhang Rui:
- Fix a potential deadlock in cpu_cooling driver, which was introduced
in 4.11-rc1. (Matthew Wilcox)
- Fix the cpu_cooling and devfreq_cooling code to handle possible error
return value from OPP calls, together with three minor fixes in the
same patch series. (Viresh Kumar)
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: cpu_cooling: Check OPP for errors
thermal: cpu_cooling: Replace dev_warn with dev_err
thermal: devfreq: Check OPP for errors
thermal: devfreq_cooling: Replace dev_warn with dev_err
thermal: devfreq: Simplify expression
thermal: Fix potential deadlock in cpu_cooling
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions