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 for Android: free password hash cracker in your pocket
[<prev] [next>] [day] [month] [year] [list]
Date:	Tue, 7 Oct 2014 16:34:24 +1100
From:	Stephen Rothwell <>
To:	Tejun Heo <>, Rusty Russell <>,
	Christoph Lameter <>,
	Ingo Molnar <>,
	Martin Schwidefsky <>,
	Heiko Carstens <>
Subject: linux-next: manual merge of the percpu tree with the s390 tree

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/s390/kernel/irq.c between commit 201b275f0459 ("s390/nohz: use a
per-cpu flag for arch_needs_cpu") from the s390 tree and commit
eb7e7d766326 ("s390: Replace __get_cpu_var uses") from the percpu tree.

I fixed it up (the former changed the
"__get_cpu_var(s390_idle).nohz_delay = 1" into
"set_cpu_flag(CIF_NOHZ_DELAY)", so I used that) and can carry the fix
as necessary (no action is required).

Stephen Rothwell          

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)

Powered by blists - more mailing lists