projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bfb5ef2
c9e4bf6
3a8395b
)
Merge branches 'pm-sleep' and 'pm-qos'
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 14 Jul 2023 17:13:21 +0000
(19:13 +0200)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 14 Jul 2023 17:13:21 +0000
(19:13 +0200)
Merge a PM QoS fix and a hibernation fix for 6.5-rc2.
- Unbreak the /sys/power/resume interface after recent changes (Azat
Khuzhin).
- Allow PM_QOS_DEFAULT_VALUE to be used with frequency QoS (Chungkai
Yang).
* pm-sleep:
PM: hibernate: Fix writing maj:min to /sys/power/resume
* pm-qos:
PM: QoS: Restore support for default value on frequency QoS
Trivial merge