From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jul 2023 17:16:20 +0000 (-0700)
Subject: Merge tag 'pm-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v6.6.17~4344
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=892d7c1b29555cd145f0bf85818148c47bb7ac16;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull power management fixes from Rafael Wysocki:
 "Revert three recent intel_idle commits that introduced a functional
  issue, included a coding mistake and have been questioned at the
  design level"

* tag 'pm-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "intel_idle: Add support for using intel_idle in a VM guest using just hlt"
  Revert "intel_idle: Add a "Long HLT" C1 state for the VM guest mode"
  Revert "intel_idle: Add __init annotation to matchup_vm_state_with_baremetal()"
---

892d7c1b29555cd145f0bf85818148c47bb7ac16