diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-04 10:41:07 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-04 10:41:07 +0200 |
commit | 601ef1f3c0df8d649700dc860c1de09acdf4b9b2 (patch) | |
tree | f55bdc7a070ea7af98449162c79120f9ebf64350 /kernel | |
parent | e27f84e163d2f03407e046b09a8f26ebd185a87f (diff) | |
parent | a61dec7447456858dfc88fe056017a91ab903ed0 (diff) | |
parent | 0fc784fb09f6db8d6650aac137daa779da25c73b (diff) |
Merge branches 'pm-cpufreq-sched' and 'pm-cpuidle'
* pm-cpufreq-sched:
cpufreq: schedutil: Avoid missing updates for one-CPU policies
schedutil: Allow cpufreq requests to be made even when kthread kicked
cpufreq: Rename cpufreq_can_do_remote_dvfs()
cpufreq: schedutil: Cleanup and document iowait boost
cpufreq: schedutil: Fix iowait boost reset
cpufreq: schedutil: Don't set next_freq to UINT_MAX
Revert "cpufreq: schedutil: Don't restrict kthread to related_cpus unnecessarily"
* pm-cpuidle:
cpuidle: governors: Consolidate PM QoS handling
cpuidle: governors: Drop redundant checks related to PM QoS