diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-28 16:31:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-28 16:31:25 +0200 |
| commit | 6f257934ed6170ed0094149e0e1bac09f7997103 (patch) | |
| tree | 23cbfd414c5a44d796bd57a8690375e2bae1a52c /drivers | |
| parent | f5c8cf2a4992dd929fa0c2f25c09ee69b8dcbce1 (diff) | |
| parent | 85850af4fc47132f3f2f0dd698b90f67906600b4 (diff) | |
| parent | e0c57a5c70c13317238cb19a7ded0eab4a5f7de5 (diff) | |
| parent | 9bfb09774ea40937b6c6d6e07858e0f7ad1991ec (diff) | |
| download | linux-6f257934ed6170ed0094149e0e1bac09f7997103.tar.bz2 | |
Merge branches 'pm-sleep', 'pm-domains' and 'pm-tools'
Merge a hiberantion-related fix, a generic power domains code fix and
a pm-graph update for 6.1-rc1:
- Allow hybrid sleep to use suspend-to-idle as a system suspend method
if it is the current suspend method of choice (Mario Limonciello).
- Fix handling of unavailable/disabled idle states in the generic
power domains code (Sudeep Holla).
- Update the pm-graph suite of utilities to version 5.10 which is
fixes-mostly and does not add any new features (Todd Brandt).
* pm-sleep:
PM: hibernate: Allow hybrid sleep to work with s2idle
* pm-domains:
PM: domains: Fix handling of unavailable/disabled idle states
* pm-tools:
pm-graph v5.10