]> 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)
commit90c0db1b90b36a8e34fdf1b38206ea323fc68445
tree7957ab150be67760ab441fdd9890bed94b23bf3c
parentf5344f41c651893f2b2a51d8031f9f98d1dd53be
parentb73520968351c76de5bf1e3d693a9dfa873589d4
parent13b94a25425b5dff4f09416c5f9fc6403fa606f8
parent4b9d0d47ae95095e2d8e3e2920445f51792ad14f
parentdd4e31619517d033bb7d206acd59b455fb49a5ab
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