From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 15 Nov 2024 18:54:05 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle' and 'pm-em'
X-Git-Tag: v6.13-rc1~194^2~1
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/923c256e37e6821e03a105fa77570124e35181d8

Merge branches 'pm-cpuidle' and 'pm-em'

Merge cpuidle and Energy Model changes for 6.13-rc1:

 - Add a built-in idle states table for Granite Rapids Xeon D to the
   intel_idle driver (Artem Bityutskiy).

 - Fix some typos in comments in the cpuidle core and drivers (Shen
   Lichuan).

 - Remove iowait influence from the menu cpuidle governor (Christian
   Loehle).

 - Add min/max available performance state limits to the Energy Model
   management code (Lukasz Luba).

* pm-cpuidle:
  intel_idle: add Granite Rapids Xeon D support
  cpuidle: Correct some typos in comments
  cpuidle: menu: Remove iowait influence

* pm-em:
  PM: EM: Add min/max available performance state limits
---

923c256e37e6821e03a105fa77570124e35181d8