Re: linux-next: Tree for Jun 13 (crypto)

[Herbert Xu]

On Wed, Jun 13, 2012 at 08:03:17PM +0300, Jussi Kivilinna wrote:
> 
> Reverting commit e2f4d85d5b2049a90859aa10de914ed31a4f17a4, "crypto:
> serpent - add common glue code for avx and sse2 implementation",
> should help for most.
> 
> >arch/x86/crypto/serpent-avx-x86_64.o: In function `serpent_dec_blk_8way':
> >(.text+0x3d70): multiple definition of `serpent_dec_blk_8way'
> >arch/x86/crypto/serpent-avx-x86_64.o: In function `__serpent_enc_blk_8way':
> >(.text+0x0): multiple definition of `__serpent_enc_blk_8way'
> 
> Attached patch should solve these (patch depends on above revert).
> 
> -Jussi

> crypto: serpent-sse2/avx - allow both to be built into kernel
> 
> From: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
> 
> Rename serpent-avx assembler functions so that they do not collide with
> serpent-sse2 assembler functions when linking both versions in to same
> kernel image.
> 
> Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
> Cc: Johannes Goetzfried <Johannes.Goetzfried@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>

OK I have reverted e2f4d85d and applied your patch.  In the process
I have rebased all patches on top of the original one so watch out if
you're pulling my tree.

Thanks!
-- 
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/