From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 14 Jul 2023 17:13:21 +0000 (+0200)
Subject: Merge branches 'pm-sleep' and 'pm-qos'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d121758da6df6829cb505ef0143cf42d28bd865d;p=linux.git

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
---

d121758da6df6829cb505ef0143cf42d28bd865d