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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:	Tue, 4 Jun 2013 15:43:41 +1000
From:	Stephen Rothwell <>
To:	Andrew Morton <>
	Kent Overstreet <>,
	Tejun Heo <>
Subject: linux-next: manual merge of the akpm tree with the percpu tree

Hi Andrew,

Today's linux-next merge of the akpm tree got conflicts in
include/linux/percpu-refcount.h and lib/percpu-refcount.c between commit
215e262f2aeb ("percpu: implement generic percpu refcounting") from the
percpu tree and commit "generic dynamic per cpu refcounting" from the
akpm tree.

I just dropped the patch from the akpm tree.  The percpu tree patch looks
like it may be a later version.

Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists