OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b57841f
ae817e6
)
Merge branch 'thermal-intel-fixes'
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 31 Mar 2023 10:02:46 +0000
(12:02 +0200)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 31 Mar 2023 10:02:46 +0000
(12:02 +0200)
Merge Intel thermal driver fixes for 6.3-rc5:
- Fix handling of two recently added module parameters in the Intel
powerclamp thermal driver (David Arcari).
- Fix one more deadlock in the int340x thermal driver (Srinivas
Pandruvada).
* thermal-intel-fixes:
thermal: intel: powerclamp: Fix cpumask and max_idle module parameters
thermal: intel: int340x: processor_thermal: Fix additional deadlock
Trivial merge