diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-01 16:19:08 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-01 16:19:08 +0300 |
| commit | be6018a44c2479d22fef40eb6f5a3442627b8bcb (patch) | |
| tree | 8dbdea90894e2f376698a564c1c17f9c23ea20a2 /drivers/watchdog/sirfsoc_wdt.c | |
| parent | 5fcd7359019248b4de54379720847bd41bcc42aa (diff) | |
| parent | 9a7875461fd0427dc86e3a87e93bd5723679b8b1 (diff) | |
| parent | ad1e4f74c072eaa2c6d77dd710db31aafecd614f (diff) | |
| download | linux-be6018a44c2479d22fef40eb6f5a3442627b8bcb.tar.xz | |
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