summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-11-15 19:54:05 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-11-15 19:54:05 +0100
commit923c256e37e6821e03a105fa77570124e35181d8 (patch)
tree0c6fa1a8df0c3999651dbfcb2084633a35816a6f /kernel
parenta8aaea4f6e1a33614854414ad37144f6eb61c6aa (diff)
parentf557e0d1c2e6eb6af6d4468ed2c0ee91829370e2 (diff)
parent5609296750afd6462a4d994b6803ccc5e8bf1d4e (diff)
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