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

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.11.1506040033000.31424@nanos>
Date:	Thu, 4 Jun 2015 00:38:26 +0200 (CEST)
From:	Thomas Gleixner <tglx@...utronix.de>
To:	Vikas Shivappa <vikas.shivappa@...ux.intel.com>
cc:	linux-kernel@...r.kernel.org, vikas.shivappa@...el.com,
	x86@...nel.org, hpa@...or.com, mingo@...nel.org, tj@...nel.org,
	peterz@...radead.org, matt.fleming@...el.com, will.auld@...el.com,
	kanaka.d.juvva@...el.com
Subject: Re: [PATCH V8 00/10] New cpumask API and Intel Cache Allocation
 support

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