Merge branch 'pm-qos'

* pm-qos:
  PM / QoS: Handle device PM QoS flags while removing constraints
  PM / QoS: Resume device before exposing/hiding PM QoS flags
  PM / QoS: Document request manipulation requirement for flags
  PM / QoS: Fix a free error in the dev_pm_qos_constraints_destroy()
  PM / QoS: Fix the return value of dev_pm_qos_update_request()
  PM / ACPI: Take device PM QoS flags into account
  PM / Domains: Check device PM QoS flags in pm_genpd_poweroff()
  PM / QoS: Make it possible to expose PM QoS device flags to user space
  PM / QoS: Introduce PM QoS device flags support
  PM / QoS: Prepare struct dev_pm_qos_request for more request types
  PM / QoS: Introduce request and constraint data types for PM QoS flags
  PM / QoS: Prepare device structure for adding more constraint types

diff --cc drivers/base/power/domain.c
Simple merge

diff --cc drivers/base/power/qos.c
index fbbd4ed2edf288318f8d165760c91ee420f1812c,f03f1ba28c7526cf389179c8db08b9099b5c47b9..ff46387f5308394d913d5789c16265253b56b5f0
--- 1/drivers/base/power/qos.c
--- 2/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@@ -449,9 -548,10 +548,10 @@@ int dev_pm_qos_add_ancestor_request(str
                ancestor = ancestor->parent;
  
        if (ancestor)
-               error = dev_pm_qos_add_request(ancestor, req, value);
+               error = dev_pm_qos_add_request(ancestor, req,
+                                              DEV_PM_QOS_LATENCY, value);
  
 -      if (error)
 +      if (error < 0)
                req->dev = NULL;
  
        return error;