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)
commit2f9fd9e439706c615b77c23d70184ddefa7fb9e0
tree5c95884329ff31c98205fc6e0e5a149386ceace3
parentb21defcb52c67c5580ddba8b9823820bccccf97e
parent8130b05c559d1aa83d0c8971b422ba0da18ef24a
Merge tag 'pm-6.9-rc3' of git://git./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()