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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:	Wed, 11 Nov 2009 18:59:19 +1100
From:	Stephen Rothwell <>
To:	Tejun Heo <>, Rusty Russell <>,
	Christoph Lameter <>,
	Ingo Molnar <>
	Anton Blanchard <>,
	Paul Mackerras <>,
	Thomas Gleixner <>,
	"H. Peter Anvin" <>,
	Peter Zijlstra <>
Subject: linux-next: manual merge of the percpu tree with the tip tree

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/powerpc/platforms/pseries/hvCall.S between commit
c8cd093a6e9f96ea6b871576fd4e46d7c818bb89 ("powerpc: tracing: Add
hypervisor call tracepoints") from the tip tree and commit
dd17c8f72993f9461e9c19250e3f155d6d99df22 ("percpu: remove per_cpu__
prefix") from the percpu tree.

The former removed the code changed by the latter, so I just used the tip
tree version.
Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists