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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20160111151518.GA28800@gmail.com>
Date:	Mon, 11 Jan 2016 16:15:18 +0100
From:	Ingo Molnar <mingo@...nel.org>
To:	Tejun Heo <tj@...nel.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Fenghua Yu <fenghua.yu@...el.com>,
	Johannes Weiner <hannes@...xchg.org>
Subject: Re: linux-next: manual merge of the cgroup tree with the tip tree


* Tejun Heo <tj@...nel.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