linux-kernel - linux-next: manual merge of the sparc tree with the fixes 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>] [day] [month] [year] [list]

Date:	Mon, 23 May 2011 12:21:16 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sam Ravnborg <sam@...nborg.org>,
	Daniel Hellstrom <daniel@...sler.com>
Subject: linux-next: manual merge of the sparc tree with the fixes tree

Hi David,

Today's linux-next merge of the sparc tree got conflicts in
arch/sparc/include/asm/smp_32.h and arch/sparc/kernel/smp_32.c between
commit 951d04e4ef43 ("sparc32: fix build, move inline function to .c
file") from the fixes tree and commit d6d048192b1d ("sparc32: implement
SMP IPIs using the generic functions") from the sparc tree.

The latter seems to supercede to former, so I used the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped