mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tejun Heo <tj@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
	paulus@samba.org, acme@ghostprotocols.net, eranian@google.com,
	namhyung.kim@lge.com, lizefan@huawei.com, mhocko@suse.cz,
	kamezawa.hiroyu@jp.fujitsu.com, cgroups@vger.kernel.org,
	containers@lists.linux-foundation.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCHSET] perf, cgroup: implement hierarchy support for perf_event controller
Date: Wed, 10 Apr 2013 11:01:17 -0700	[thread overview]
Message-ID: <20130410180117.GB17641@mtj.dyndns.org> (raw)
In-Reply-To: <20130410093755.GC24443@gmail.com>

Hello,

On Wed, Apr 10, 2013 at 11:37:55AM +0200, Ingo Molnar wrote:
> Yeah - at least for larger changes that's a good workflow.
> 
> For smaller changes we can pick one or the other tree. Tejun, do these changes 
> create any conflicts with the current tip:master tree? If not then you could carry 
> these changes in your tree. If there's significant conflicts then it might be 
> better to rebase this on top of perf/core and pull them into perf/core. (assuming 
> there's no other cgroups prereq patches beyond the ones in this series.)

The only conflict is a trivial #include one in
include/linux/res_counter.h which is unrelated to this series.  I'll
commit these to cgroup/for-3.10.

Thanks!

-- 
tejun

  reply	other threads:[~2013-04-10 18:01 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-09  2:23 Tejun Heo
2013-04-09  2:23 ` [PATCH 1/3] cgroup: make sure parent won't be destroyed before its children Tejun Heo
2013-04-09  2:23 ` [PATCH 2/3] cgroup: implement cgroup_is_descendant() Tejun Heo
2013-04-09  2:23 ` [PATCH 3/3] perf: make perf_event cgroup hierarchical Tejun Heo
2013-04-09  7:07 ` [PATCHSET] perf, cgroup: implement hierarchy support for perf_event controller Li Zefan
2013-04-10  7:32 ` Peter Zijlstra
2013-04-10  9:37   ` Ingo Molnar
2013-04-10 18:01     ` Tejun Heo [this message]
2013-04-10 18:08 ` Tejun Heo

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=20130410180117.GB17641@mtj.dyndns.org \
    --to=tj@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@ghostprotocols.net \
    --cc=cgroups@vger.kernel.org \
    --cc=containers@lists.linux-foundation.org \
    --cc=eranian@google.com \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=mhocko@suse.cz \
    --cc=mingo@kernel.org \
    --cc=namhyung.kim@lge.com \
    --cc=paulus@samba.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

all inboxes | Powered by JetHome®