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

Quoting Randy Dunlap [off-list ref]:

On 06/12/2012 10:54 PM, Stephen Rothwell wrote:

quoted

Hi all,

Changes since 20120612:

on x86_64:

arch/x86/crypto/serpent-avx-x86_64.o: In function `serpent_xts_decrypt':
(.text+0x856c): multiple definition of `serpent_xts_decrypt'
arch/x86/crypto/serpent-sse2-x86_64.o:(.text+0xae8): first defined here

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