From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Apr 2024 19:55:40 +0000 (-0700)
Subject: Merge tag 'pm-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v6.9-rc4-pxa1908~90
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=2f9fd9e439706c615b77c23d70184ddefa7fb9e0;p=linux.git

Merge tag 'pm-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "Fix a recent Energy Model change that went against a recent scheduler
  change made independently (Vincent Guittot)"

* tag 'pm-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: EM: fix wrong utilization estimation in em_cpu_energy()
---

2f9fd9e439706c615b77c23d70184ddefa7fb9e0