Re: [PATCH V8 00/10] New cpumask API and Intel Cache Allocation support

[Thomas Gleixner]

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, 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/