From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 4 Jun 2018 08:41:07 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq-sched' and 'pm-cpuidle'
X-Git-Tag: v4.18-rc1~149^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=601ef1f3c0df8d649700dc860c1de09acdf4b9b2;p=users%2Fhch%2Fdma-mapping.git

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
---

601ef1f3c0df8d649700dc860c1de09acdf4b9b2