linux-kernel - linux-next: manual merge of the asm-generic tree with Linus' tree

lists.openwall.net		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: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 12 Jun 2009 16:49:14 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Ingo Molnar <mingo@...e.hu>
Subject: linux-next: manual merge of the asm-generic tree with Linus' tree

Hi Arnd,

Today's linux-next merge of the asm-generic tree got a conflict in
include/asm-generic/atomic.h between commit
53e111a730ea8b002d57dd226098c12789993329 ("x86: Fix atomic_long_xchg() on
64bit") from Linus' tree and commit
72099ed2719fc5829bd79c6ca9d1783ed026eb37 ("asm-generic: rename atomic.h
to atomic-long.h") from the asm-generic tree.

I applied the fix from the former patch to atomic-long.h
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped