linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Zijlstra <peterz@infradead.org>
To: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
	rjw@rjwysocki.net, x86@kernel.org, bp@alien8.de,
	linux-kernel@vger.kernel.org, jacob.jun.pan@linux.intel.com,
	linux-pm@vger.kernel.org
Subject: Re: [PATCH v4 0/2] Skylake PSys support
Date: Wed, 20 Apr 2016 15:59:45 +0200	[thread overview]
Message-ID: <20160420135945.GY3448@twins.programming.kicks-ass.net> (raw)
In-Reply-To: <1460930581-29748-1-git-send-email-srinivas.pandruvada@linux.intel.com>

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

  parent reply	other threads:[~2016-04-20 13:59 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-17 22:02 [PATCH v4 0/2] Skylake PSys support Srinivas Pandruvada
2016-04-17 22:03 ` [PATCH v4 1/2] perf/x86/intel/rapl: support Skylake RAPL domains Srinivas Pandruvada
2016-04-20 15:43   ` Peter Zijlstra
2016-04-20 15:54     ` Srinivas Pandruvada
2016-04-23 12:55   ` [tip:perf/core] perf/x86/intel/rapl: Support " tip-bot for Srinivas Pandruvada
2016-04-17 22:03 ` [PATCH v4 2/2] powercap: intel_rapl: PSys support Srinivas Pandruvada
2016-04-28 10:26   ` [tip:perf/core] powercap, perf/x86/intel/rapl: Add " tip-bot for Srinivas Pandruvada
2016-04-20 13:59 ` Peter Zijlstra [this message]
2016-04-20 18:28   ` [PATCH v4 0/2] Skylake " Srinivas Pandruvada
2016-04-20 20:21     ` Rafael J. Wysocki
2016-04-21 13:10       ` Peter Zijlstra
2016-04-21 14:48         ` Srinivas Pandruvada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160420135945.GY3448@twins.programming.kicks-ass.net \
    --to=peterz@infradead.org \
    --cc=bp@alien8.de \
    --cc=hpa@zytor.com \
    --cc=jacob.jun.pan@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=rjw@rjwysocki.net \
    --cc=srinivas.pandruvada@linux.intel.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).