Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1306387 > unrolled thread

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

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

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

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

* 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

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web