From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 3 Aug 2020 11:12:44 +0000 (+0200)
Subject: Merge branches 'pm-sleep', 'pm-domains', 'powercap' and 'pm-tools'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=86ba54fb0816480941cda78a99f107ab2bbd4249;p=linux.git

Merge branches 'pm-sleep', 'pm-domains', 'powercap' and 'pm-tools'

* pm-sleep:
  PM: sleep: spread "const char *" correctness
  PM: hibernate: fix white space in a few places
  freezer: Add unsafe version of freezable_schedule_timeout_interruptible() for NFS
  PM: sleep: core: Emit changed uevent on wakeup_sysfs_add/remove

* pm-domains:
  PM: domains: Restore comment indentation for generic_pm_domain.child_links
  PM: domains: Fix up terminology with parent/child

* powercap:
  powercap: Add Power Limit4 support
  powercap: idle_inject: Replace play_idle() with play_idle_precise() in comments
  powercap: intel_rapl: add support for Sapphire Rapids

* pm-tools:
  pm-graph v5.7 - important s2idle fixes
  cpupower: Replace HTTP links with HTTPS ones
  cpupower: Fix NULL but dereferenced coccicheck errors
  cpupower: Fix comparing pointer to 0 coccicheck warns
---

86ba54fb0816480941cda78a99f107ab2bbd4249