From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 11 Mar 2024 14:54:23 +0000 (+0100)
Subject: Merge branches 'pm-powercap' and 'pm-tools'
X-Git-Tag: block-6.9-20240315~6^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c907ab55471c5ea07f33d799193cf2f5639d7046;p=linux-block.git

Merge branches 'pm-powercap' and 'pm-tools'

Merge power capping changes and power management utilities updates for
6.9-rc1:

 - Address multiple issues in the TPMI RAPL driver and add support for
   new platforms (Lunar Lake-M, Arrow Lake) to Intel RAPL (Zhang Rui).

 - Fix freq_qos_add_request() return value check in dtpm_cpu (Daniel
   Lezcano).

 - Fix kernel-doc for dtpm_create_hierarchy() (Yang Li).

 - Fix file leak in get_pkg_num() in x86_energy_perf_policy (Samasth
   Norway Ananda).

 - Fix cpupower-frequency-info.1 man page typo (Jan Kratochvil).

* pm-powercap:
  powercap: dtpm: Fix kernel-doc for dtpm_create_hierarchy() function
  powercap: dtpm_cpu: Fix error check against freq_qos_add_request()
  powercap: intel_rapl: Add support for Arrow Lake
  powercap: intel_rapl: Add support for Lunar Lake-M paltform
  powercap: intel_rapl_tpmi: Fix System Domain probing
  powercap: intel_rapl_tpmi: Fix a register bug
  powercap: intel_rapl: Fix locking in TPMI RAPL
  powercap: intel_rapl: Fix a NULL pointer dereference

* pm-tools:
  Fix cpupower-frequency-info.1 man page typo
  tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num()
---

c907ab55471c5ea07f33d799193cf2f5639d7046