On Mon, May 07, 2012 at 12:31:00PM +1000, Stephen Rothwell wrote: > Hi Herbert, > > Today's linux-next merge of the crypto tree got a conflict in > arch/arm/mach-ux500/devices-common.c between commit 3510ec672319 ("ARM: > ux500: remove intermediary add_platform_device* functions") from Linus' > tree and commit 3ba812f4d0be ("mach-ux500: crypto - core support for > CRYP/HASH module") from the crypto tree. > > I can't easily resolve this, sorry. This crypto patch needs to be > revised on top of v3.4-rc1. > > I have use the crypto tree from next-20120504 for today. OK I'll fix it up. 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-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html