Re: linux-next: manual merge of the crypto tree with thesparc-next tree

[Herbert Xu]

On Fri, Sep 07, 2012 at 12:51:04PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got conflicts in
> crypto/Kconfig between commits 4ff28d4ca93b ("sparc64: Add SHA1 driver
> making use of the 'sha1' instruction") and 9bf4852d3d19 ("sparc64: Add
> AES driver making use of the new aes opcodes") from the sparc-next tree
> and commit f0be44f4fb1f ("arm/crypto: Add optimized AES and SHA1
> routines") from the crypto tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good.  Thanks Stephen!
-- 
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/