lkml.org 
[lkml]   [2016]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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

\
 
 \ /
  Last update: 2016-01-11 16:41    [W:0.045 / U:0.284 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site