]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge branch 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 1 Dec 2023 20:07:55 +0000 (21:07 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 1 Dec 2023 20:07:55 +0000 (21:07 +0100)
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


Trivial merge