From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Aug 2023 19:24:22 +0000 (-0700)
Subject: Merge tag 'pm-6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v6.6.7~2207
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9578b04c32397e664bd4643c8b7f525728df3028;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull power management fixes from Rafael Wysocki:
 "These fix an amd-pstate cpufreq driver issues and recently introduced
  hibernation-related breakage.

  Specifics:

   - Make amd-pstate use device_attributes as expected by the CPU root
     kobject (Thomas Weißschuh)

   - Restore the previous behavior of resume_store() when hibernation is
     not available which is to return the full number of bytes that were
     to be written by user space (Vlastimil Babka)"

* tag 'pm-6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: amd-pstate: fix global sysfs attribute type
  PM: hibernate: fix resume_store() return value when hibernation not available
---

9578b04c32397e664bd4643c8b7f525728df3028