From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 1 Jun 2020 13:19:08 +0000 (+0200)
Subject: Merge branches 'pm-core' and 'pm-sleep'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=be6018a44c2479d22fef40eb6f5a3442627b8bcb;p=linux.git

Merge branches 'pm-core' and 'pm-sleep'

* pm-core:
  PM: runtime: Replace pm_runtime_callbacks_present()
  PM: runtime: clk: Fix clk_pm_runtime_get() error path
  PM: runtime: Make clear what we do when conditions are wrong in rpm_suspend()

* pm-sleep:
  PM: hibernate: Restrict writes to the resume device
  PM: hibernate: Split off snapshot dev option
  PM: hibernate: Incorporate concurrency handling
  PM: sleep: Helpful edits for devices.rst documentation
  Documentation: PM: sleep: Update driver flags documentation
  PM: sleep: core: Rename DPM_FLAG_LEAVE_SUSPENDED
  PM: sleep: core: Rename DPM_FLAG_NEVER_SKIP
  PM: sleep: core: Rename dev_pm_smart_suspend_and_suspended()
  PM: sleep: core: Rename dev_pm_may_skip_resume()
  PM: sleep: core: Rework the power.may_skip_resume handling
  PM: sleep: core: Do not skip callbacks in the resume phase
  PM: sleep: core: Fold functions into their callers
  PM: sleep: core: Simplify the SMART_SUSPEND flag handling
---

be6018a44c2479d22fef40eb6f5a3442627b8bcb