From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 1 Dec 2023 20:07:55 +0000 (+0100)
Subject: Merge branch 'powercap'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a6b31256928d78204f8f282220d3b0d64387f79d;p=linux.git

Merge branch 'powercap'

Merge a power capping fix for 6.7-rc4 which eliminates unnecessary
and harmful conversions to uW from the DTPM (dynamic thermal and power
management) framework (Lukasz Luba).

* powercap:
  powercap: DTPM: Fix unneeded conversions to micro-Watts
---

a6b31256928d78204f8f282220d3b0d64387f79d