]> git.dujemihanovic.xyz Git - linux.git/commitdiff
Merge tag 'pm-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Apr 2024 19:55:40 +0000 (12:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Apr 2024 19:55:40 +0000 (12:55 -0700)
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()


Trivial merge