]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-core', 'pm-pci', 'pm-sleep', 'pm-domains' and 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Apr 2021 14:57:17 +0000 (16:57 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Apr 2021 14:57:17 +0000 (16:57 +0200)
commit4a623e3e3e5922a5ca0174e253d741f4e1bef138
tree974d100b9e93c48cb3badc083f06c570f7693cc9
parent2856aec8760400c32074d53ab060f1b7c0b9a0d7
parent295543b428ef67f755f50411bdb2f3e159b7fa8d
parent26d6875bd41d8a709b06c7b1c52165c023d7cc14
parenteeb886dd91584576983c85853654b178589e5b87
parent51accf3d41f80da96e7211d64ad863f468166e7e
parentcff6a1329aad42931bbd23d64bc28faf58022288
Merge branches 'pm-core', 'pm-pci', 'pm-sleep', 'pm-domains' and 'powercap'

* pm-core:
  PM: runtime: Add documentation for pm_runtime_resume_and_get()
  PM: runtime: Replace inline function pm_runtime_callbacks_present()
  PM: core: Remove duplicate declaration from header file

* pm-pci:
  PCI: PM: Do not read power state in pci_enable_device_flags()

* pm-sleep:
  PM: wakeup: remove redundant assignment to variable retval
  PM: hibernate: x86: Use crc32 instead of md5 for hibernation e820 integrity check
  PM: wakeup: use dev_set_name() directly
  PM: sleep: fix typos in comments
  freezer: Remove unused inline function try_to_freeze_nowarn()

* pm-domains:
  PM: domains: Don't runtime resume devices at genpd_prepare()

* powercap:
  powercap: RAPL: Fix struct declaration in header file
  MAINTAINERS: Add DTPM subsystem maintainer
  powercap: Add Hygon Fam18h RAPL support
MAINTAINERS