From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 5 Jun 2024 15:11:47 +0000 (+0200)
Subject: Merge branch 'pm-cpufreq'
X-Git-Tag: v6.10-rc3~32^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b7e7ff0fe44bc6e571ecddbd76fcea7498033c1;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pm-cpufreq'

Merge cpufreq fixes for 6.10-rc3:

 - Fix a recently introduced unchecked HWP MSR access in the
   intel_pstate driver (Srinivas Pandruvada).

 - Add missing conversion from MHz to KHz to amd_pstate_set_boost()
   to address sysfs inteface inconsistency (Dhananjay Ugwekar).

 - Get rid of an excess global header file used by the amd-pstate
   cpufreq driver (Arnd Bergmann).

* pm-cpufreq:
  cpufreq: intel_pstate: Fix unchecked HWP MSR access
  cpufreq: amd-pstate: Fix the inconsistency in max frequency units
  cpufreq: amd-pstate: remove global header file
---

9b7e7ff0fe44bc6e571ecddbd76fcea7498033c1