summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-07-14 19:13:21 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-07-14 19:13:21 +0200
commitd121758da6df6829cb505ef0143cf42d28bd865d (patch)
treed49c19d67164bcdc92669674e158857c8aa38d57 /kernel
parentbfb5ef2219b7b28a6e328860438eb55027807289 (diff)
parentc9e4bf607d8c431452ef362c00e62ce999bbae93 (diff)
parent3a8395b565b5b4f019b3dc182be4c4541eb35ac8 (diff)
Merge branches 'pm-sleep' and 'pm-qos'
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