Re: linux-next: manual merge of the cgroup tree with the tip tree

From	Ingo Molnar <mingo@kernel.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the cgroup tree with the tip tree
Date	2016-01-11 16:20 +0100
Message-ID	<qPMqe-46s-19@gated-at.bofh.it> (permalink)
References	<qI0A1-1P6-3@gated-at.bofh.it> <qI0A2-1P6-11@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

* Tejun Heo <tj@kernel.org> wrote:

> On Mon, Dec 21, 2015 at 03:41:19PM +1100, Stephen Rothwell wrote:
> > Hi Tejun,
> > 
> > Today's linux-next merge of the cgroup tree got a conflict in:
> > 
> >   init/Kconfig
> > 
> > between commits:
> > 
> >   257372262056 ("x86/intel_rdt: Add support for Cache Allocation detection")
> >   5ad9144cdb9a ("x86,cgroup/intel_rdt : Add a cgroup interface to manage Intel cache allocation")
> 
> Ingo, can you please revert the rdt cgroup.  I still don't think this
> is the right approach and tglx's new proposal seems a lot better.
> 
> Thanks.

Ok, it's all zapped.

Thanks,

	Ingo

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

Re: linux-next: manual merge of the cgroup tree with the tip tree Ingo Molnar <mingo@kernel.org> - 2016-01-11 16:20 +0100

csiph-web