From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 26 May 2025 18:14:58 +0000 (+0200)
Subject: Merge branch 'pm-em'
X-Git-Tag: v6.16-rc1~160^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e481e10ab59c73571595230fa2ca44f9ad1e0e17;p=thirdparty%2Flinux.git

Merge branch 'pm-em'

Merge energy model management code updates for 6.16-rc1:

 - Fix potential division-by-zero error in em_compute_costs() (Yaxiong
   Tian).

 - Fix typos in energy model documentation and example driver code (Moon
   Hee Lee, Atul Kumar Pant).

 - Rearrange the energy model management code and add a new function for
   adjusting a CPU energy model after adjusting the capacity of the
   given CPU to it (Rafael Wysocki).

* pm-em:
  PM: EM: Introduce em_adjust_cpu_capacity()
  PM: EM: Move CPU capacity check to em_adjust_new_capacity()
  PM: EM: Documentation: Fix typos in example driver code
  PM: EM: Documentation: fix typo in energy-model.rst
  PM: EM: Fix potential division-by-zero error in em_compute_costs()
---

e481e10ab59c73571595230fa2ca44f9ad1e0e17