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

2012-05-16 Thread Herbert Xu
On Thu, May 17, 2012 at 01:21:16PM +1000, Stephen Rothwell wrote: > Hi Herbert, > > Today's linux-next merge of the crypto tree got a conflict in > drivers/crypto/Kconfig between commit aef7b31c8833 ("powerpc/crypto: > Build files for the nx device driver") from the powerpc tree and commit > 2789c

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

2012-05-16 Thread Stephen Rothwell
Hi Herbert, Today's linux-next merge of the crypto tree got a conflict in drivers/crypto/Kconfig between commit aef7b31c8833 ("powerpc/crypto: Build files for the nx device driver") from the powerpc tree and commit 2789c08fffea ("crypto: ux500 - Add driver for CRYP hardware") from the crypto tree.