From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Nov 2021 22:46:28 +0000 (-0800)
Subject: Merge tag 'pm-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=18e2befaf6c2a2b877a8842f8caa7bce54d9b59b;p=linux.git

Merge tag 'pm-5.16-rc2' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "These fix a system-wide suspend issue in the DTPM framework and
  improve the Energy Model documentation.

  Specifics:

   - Fix system suspend handling in DTPM when it is enabled, but not
     actually used (Daniel Lezcano)

   - Describe the new cpufreq callback for Energy Model registration and
     explain the "advanced" and "simple" EM variants in the EM
     documentation (Lukasz Luba)"

* tag 'pm-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Documentation: power: Describe 'advanced' and 'simple' EM models
  Documentation: power: Add description about new callback for EM registration
  powercap: DTPM: Fix suspend failure and kernel warning
---

18e2befaf6c2a2b877a8842f8caa7bce54d9b59b