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 for Android: free password hash cracker in your pocket
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:	Wed, 19 Dec 2012 11:10:53 +1100
From:	Stephen Rothwell <>
To:	Rusty Russell <>
	James Hogan <>,
	Takashi Iwai <>
Subject: linux-next: manual merge of the modules tree with Linus' tree

Hi Rusty,

Today's linux-next merge of the modules tree got a conflict in
kernel/modsign_pubkey.c between commit 84ecfd15f554 ("modsign: add symbol
prefix to certificate list") from Linus' tree and commit bb8f5966421d
("MODSIGN: Avoid using .incbin in C source") from the modules tree.

I fixed it up (I just used the modules tree version as it removed the
section of code modified by the former) and can carry the fix as
necessary (no action is required).

Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists