[PATCHSET] perf, cgroup: implement hierarchy support for perf_event controller
tj at kernel.org
Wed Apr 10 18:01:17 UTC 2013
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.
More information about the Containers