linux-kernel - Re: linux-next: manual merge of the percpu tree with the tip tree

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

Message-ID: <4FB3AE32.8060006@intel.com>
Date:	Wed, 16 May 2012 21:40:02 +0800
From:	Alex Shi <alex.shi@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Tejun Heo <tj@...nel.org>, Rusty Russell <rusty@...tcorp.com.au>,
	Christoph Lameter <cl@...ux-foundation.org>,
	Ingo Molnar <mingo@...e.hu>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Suresh Siddha <suresh.b.siddha@...el.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: Re: linux-next: manual merge of the percpu tree with the tip tree

On 05/16/2012 03:36 PM, Stephen Rothwell wrote:

> Hi all,
> 
> Today's linux-next merge of the percpu tree got a conflict in
> arch/x86/mm/tlb.c between commit a6fca40f1d7f ("x86, tlb: Switch cr3 in
> leave_mm() only when needed") from the tip tree and commit c6ae41e7d469
> ("x86: replace percpu_xxx funcs with this_cpu_xxx") from the percpu tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.


Thanks a lot!

My auto-scripts just watching upstream kernel, so missing this...

but happy to know the pain of code clean up is closing soon. ;)
--
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/