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

2012-09-06 Thread 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 d

linux-next: manual merge of the crypto tree with the sparc-next tree

2012-09-06 Thread Stephen Rothwell
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