Date: Wed, 3 Jun 2015 15:52:05 -0700 (PDT)
From: Vikas Shivappa <vikas.shivappa@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>
cc: Vikas Shivappa <vikas.shivappa@linux.intel.com>,
        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: <alpine.DEB.2.11.1506040033000.31424@nanos>
Message-ID: <alpine.DEB.2.10.1506031549240.31064@vshiva-Udesk>
References: <1433358601-20255-1-git-send-email-vikas.shivappa@linux.intel.com> <alpine.DEB.2.11.1506040033000.31424@nanos>
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
Content-Length: 947
Lines: 33


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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/