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>] [day] [month] [year] [list]
Date:	Tue, 26 Jun 2012 14:36:38 +1000
From:	Stephen Rothwell <>
To:	Thomas Gleixner <>, Ingo Molnar <>,
	"H. Peter Anvin" <>,
	Peter Zijlstra <>
	Paul Mundt <>,
	Fengguang Wu <>,
	Randy Dunlap <>
Subject: linux-next: manual merge of the tip tree with Linus' tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
include/asm-generic/bug.h between commit 09682c1dd382 ("bug.h: Fix up
CONFIG_BUG=n implicit function declarations") from Linus' tree and commit
7b37393f13d5 ("bug.h: Fix x86 !CONFIG_BUG build regression") from the tip

These are trying to do the same thing, so I used the version from Linus'
Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists