From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760637AbcAKPPY (ORCPT ); Mon, 11 Jan 2016 10:15:24 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36472 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759867AbcAKPPW (ORCPT ); Mon, 11 Jan 2016 10:15:22 -0500 Date: Mon, 11 Jan 2016 16:15:18 +0100 From: Ingo Molnar To: Tejun Heo Cc: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Fenghua Yu , Johannes Weiner Subject: Re: linux-next: manual merge of the cgroup tree with the tip tree Message-ID: <20160111151518.GA28800@gmail.com> References: <20151221154119.66094285@canb.auug.org.au> <20151221044854.GB27493@htj.duckdns.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151221044854.GB27493@htj.duckdns.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Tejun Heo 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