From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 13 Nov 2017 00:33:35 +0000 (+0100)
Subject: Merge branch 'pm-domains'
X-Git-Tag: v4.15-rc1~145^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29aaf90875de6a1a760d555f815b18e412b5ab98;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'pm-domains'

* pm-domains:
  PM / Domains: Fix genpd to deal with drivers returning 1 from ->prepare()
  PM / domains: Rework governor code to be more consistent
  PM / Domains: Remove gpd_dev_ops.active_wakeup() callback
  soc: rockchip: power-domain: Use GENPD_FLAG_ACTIVE_WAKEUP
  soc: mediatek: Use GENPD_FLAG_ACTIVE_WAKEUP
  ARM: shmobile: pm-rmobile: Use GENPD_FLAG_ACTIVE_WAKEUP
  PM / Domains: Allow genpd users to specify default active wakeup behavior
  PM / Domains: Add support to select performance-state of domains
  PM / Domains: Rename genpd internals from pm_genpd_* to genpd_*
---

29aaf90875de6a1a760d555f815b18e412b5ab98