]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-sleep', 'pm-domains', 'powercap' and 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 3 Aug 2020 11:12:44 +0000 (13:12 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 3 Aug 2020 11:12:44 +0000 (13:12 +0200)
commitfa1a3e861c123e62b2c084d38aae2cf3c30bb810
tree7957ab150be67760ab441fdd9890bed94b23bf3c
parent37476391dc4750e3ff3f47bd09f6a202818eba91
parent779dfe66024126c71308940e49f79a605d7dcb6d
parentcaccd14aa0579033b73b371a1b00e487479c38af
parent047205e9d7e8cc2079f41571015565d46f3968a3
parentc89f8bfcd53eeea73f89ca2f38622ee5808d806d
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
fs/nfs/nfs4proc.c