From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 29 Dec 2014 20:24:00 +0000 (+0100)
Subject: Merge branches 'pm-domains', 'powercap' and 'pm-tools'
X-Git-Tag: v3.19-rc3~20^2~1
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60

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

4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60
diff --cc include/linux/pm_domain.h
index 6cd20d5e651b,ba7ca5468a7b,73e938b7e937,2e0e06daf8c0..a9edab2c787a
--- a/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)