Merge branches 'pm-domains', 'powercap' and 'pm-tools'

* pm-domains:
  PM / Domains: Export of_genpd_get_from_provider function

* powercap:
  powercap / RAPL: add IDs for future Xeon CPUs

* pm-tools:
  tools / cpupower: Fix no idle state information return value
  tools / cpupower: Correctly detect if running as root

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

diff --cc include/linux/pm_domain.h
index 6cd20d5,ba7ca54,73e938b,2e0e06d..a9edab2
--- 1/include/linux/pm_domain.h
--- 2/include/linux/pm_domain.h
--- 3/include/linux/pm_domain.h
--- 4/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@@@@ -75,11 -75,11 -72,8 -72,10 +75,11 @@@@@ struct generic_pm_domain 
        bool max_off_time_changed;
        bool cached_power_down_ok;
        struct gpd_cpuidle_data *cpuidle_data;
  -     void (*attach_dev)(struct device *dev);
  -     void (*detach_dev)(struct device *dev);
  +     int (*attach_dev)(struct generic_pm_domain *domain,
  +                       struct device *dev);
  +     void (*detach_dev)(struct generic_pm_domain *domain,
  +                        struct device *dev);
  ++    unsigned int flags;             /* Bit field of configs for genpd */
    };
    
    static inline struct generic_pm_domain *pd_to_genpd(struct dev_pm_domain *pd)