diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-08-03 13:12:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-08-03 13:12:44 +0200 |
| commit | 86ba54fb0816480941cda78a99f107ab2bbd4249 (patch) | |
| tree | 7957ab150be67760ab441fdd9890bed94b23bf3c /fs | |
| parent | c81b30c895ca1aa65a692505a9d6c4c9494afb40 (diff) | |
| parent | 02d7f4005e942f75c63302d54a659e673edd00df (diff) | |
| parent | afb0367a80553e795e7ad055299096544454f3f6 (diff) | |
| parent | 8365a898fe53f85529566501d3b3d88640b3975e (diff) | |
| parent | 68f9b22842897087895230964776083e168415de (diff) | |
| download | linux-86ba54fb0816480941cda78a99f107ab2bbd4249.tar.bz2 | |
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