From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753941AbbFCWx3 (ORCPT ); Wed, 3 Jun 2015 18:53:29 -0400 Received: from mga01.intel.com ([192.55.52.88]:54446 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752126AbbFCWxW (ORCPT ); Wed, 3 Jun 2015 18:53:22 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,549,1427785200"; d="scan'208";a="502376288" Date: Wed, 3 Jun 2015 15:52:05 -0700 (PDT) From: Vikas Shivappa X-X-Sender: vikas@vshiva-Udesk To: Thomas Gleixner cc: Vikas Shivappa , linux-kernel@vger.kernel.org, vikas.shivappa@intel.com, x86@kernel.org, hpa@zytor.com, mingo@kernel.org, tj@kernel.org, peterz@infradead.org, matt.fleming@intel.com, will.auld@intel.com, kanaka.d.juvva@intel.com Subject: Re: [PATCH V8 00/10] New cpumask API and Intel Cache Allocation support In-Reply-To: Message-ID: References: <1433358601-20255-1-git-send-email-vikas.shivappa@linux.intel.com> User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 3 Jun 2015, Thomas Gleixner wrote: > On Wed, 3 Jun 2015, Vikas Shivappa wrote: >> *All the patches will apply on 4.1-rc4*. > > And who is going to resolve the merge conflicts which are caused by > the updates to the cqm code which are pending in tip/perf ? > > You are very well aware of that changes. You got cc'ed on the patches > and on the tip-bot commit message, I checked your changes but had not seen the tip-bot messages. I did not expect it so soon , I am struggling with my mail client past few days. Will resend the patches on the relavant code base. Thanks, Vikas so why the hell are you basing your > patches against a totally different code base? > > Thanks, > > tglx >