Re: [PATCH v4 0/2] Skylake PSys support

[Srinivas Pandruvada]

On Wed, 2016-04-20 at 15:59 +0200, Peter Zijlstra wrote:
> On Sun, Apr 17, 2016 at 03:02:59PM -0700, Srinivas Pandruvada wrote:
> > 
> > Skylake processor supports a new set of RAPL registers for
> > controlling
> > entire SoC instead of just CPU package called PSys. This change
> > adds
> > support in two sub systems:
> > 
> > x86/perf: Adds basic support for Skylake RAPL and PSys support
> > 
> > powercap/rapl: A new platform domain to the current power capping
> > Intel
> > RAPL driver.
> > 
> > Srinivas Pandruvada (2):
> > Â perf/x86/intel/rapl: support Skylake RAPL domains
> > Â powercap: intel_rapl: PSys support
> > 
> > Âarch/x86/events/intel/rapl.cÂÂÂÂÂ| 51 +++++++++++++++++++++++++++-
> > -
> > Âarch/x86/include/asm/msr-index.h |ÂÂ2 ++
> > Âdrivers/powercap/intel_rapl.cÂÂÂÂ| 69
> > ++++++++++++++++++++++++++++++++++++++++
> > Â3 files changed, 120 insertions(+), 2 deletions(-)
> These two patches depend on one another, right? 
Yes.
> Because the first patch
> adds the MSR the second patch uses?
> 
> How should we go about merging this? The perf-rapl stuff normally
> goes
> through tip while the powercap stuff goes through Rafael's tree.
Do you want me to only send PERF patch and wait for this to be merged
before sending powercap?

Thanks,
Srinivas