From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 23 Oct 2025 11:12:24 +0000 (+0200)
Subject: Merge branches 'pm-cpuidle' and 'pm-cpufreq'
X-Git-Tag: v6.18-rc3~33^2
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=b62bd2cf7e991efbc823665e54dd7d7d8372c33b;p=linux%2F.git

Merge branches 'pm-cpuidle' and 'pm-cpufreq'

Merge cpuidle and cpufreq fixes for 6.18-rc3:

 - Revert a cpuidle menu governor change that introduced a serious
   performance regression on Chromebooks with Intel Jasper Lake
   processors (Rafael Wysocki)

 - Fix an amd-pstate driver regression leading to EPP=0 after
   hibernation (Mario Limonciello)

* pm-cpuidle:
  Revert "cpuidle: menu: Avoid discarding useful information"

* pm-cpufreq:
  cpufreq/amd-pstate: Fix a regression leading to EPP 0 after hibernate
---

b62bd2cf7e991efbc823665e54dd7d7d8372c33b