From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 15 Jul 2024 16:53:48 +0000 (+0200)
Subject: Merge branches 'pm-cpuidle' and 'pm-powercap'
X-Git-Tag: v6.11-rc1~173^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fae6f8b97ed5f9d60d6af54614724cdca7dc5de;p=thirdparty%2Flinux.git

Merge branches 'pm-cpuidle' and 'pm-powercap'

Merge cpuidle and power capping changes for 6.11-rc1:

 - Improve the teo cpuidle governor and clean up leftover comments from
   the menu cpuidle governor (Christian Loehle).

 - Clean up a comment typo in the teo cpuidle governor (Atul Kumar
   Pant).

 - Add missing MODULE_DESCRIPTION() macro to cpuidle haltpoll (Jeff
   Johnson).

 - Switch the intel_idle driver to new Intel CPU model defines (Tony
   Luck).

 - Switch the Intel RAPL driver new Intel CPU model defines (Tony Luck).

 - Simplify if condition in the idle_inject driver (Thorsten Blum).

* pm-cpuidle:
  cpuidle: teo: Don't count non-existent intercepts
  cpuidle: teo: Remove recent intercepts metric
  Revert: "cpuidle: teo: Introduce util-awareness"
  cpuidle: governors: teo: Fix a typo in a comment
  cpuidle: haltpoll: add missing MODULE_DESCRIPTION() macro
  cpuidle: menu: Cleanup after loadavg removal
  intel_idle: Switch to new Intel CPU model defines

* pm-powercap:
  powercap: idle_inject: Simplify if condition
  powercap: intel_rapl: Switch to new Intel CPU model defines
  powercap: intel_rapl_msr: Switch to new Intel CPU model defines
---

7fae6f8b97ed5f9d60d6af54614724cdca7dc5de