From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Jul 2023 18:07:04 +0000 (-0700)
Subject: Merge tag 'pm-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v6.6.17~4378
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bde7f150276bf2a04f92d39beaf34eb40c42c9cc;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'pm-6.5-rc2' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "These fix hibernation (after recent changes), frequency QoS and the
  sparc cpufreq driver.

  Specifics:

   - Unbreak the /sys/power/resume interface after recent changes (Azat
     Khuzhin).

   - Allow PM_QOS_DEFAULT_VALUE to be used with frequency QoS (Chungkai
     Yang).

   - Remove __init from cpufreq callbacks in the sparc driver, because
     they may be called after initialization too (Viresh Kumar)"

* tag 'pm-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: sparc: Don't mark cpufreq callbacks with __init
  PM: QoS: Restore support for default value on frequency QoS
  PM: hibernate: Fix writing maj:min to /sys/power/resume
---

bde7f150276bf2a04f92d39beaf34eb40c42c9cc