From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 15 Dec 2020 14:25:37 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle' and 'pm-em'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4c5744a0c4fcb878e1500e77d53722197c0a3f7c;p=linux.git

Merge branches 'pm-cpuidle' and 'pm-em'

* pm-cpuidle:
  cpuidle: Select polling interval based on a c-state with a longer target residency
  cpuidle: psci: Enable suspend-to-idle for PSCI OSI mode
  PM: domains: Enable dev_pm_genpd_suspend|resume() for suspend-to-idle
  PM: domains: Rename pm_genpd_syscore_poweroff|poweron()

* pm-em:
  PM / EM: Micro optimization in em_cpu_energy
  PM: EM: Update Energy Model with new flag indicating power scale
  PM: EM: update the comments related to power scale
  PM: EM: Clarify abstract scale usage for power values in Energy Model
---

4c5744a0c4fcb878e1500e77d53722197c0a3f7c