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

[Linus Walleij]

On Wed, May 16, 2012 at 7:14 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Today's linux-next merge of the crypto tree got a conflict in
> arch/arm/mach-ux500/devices-common.h between commit 08956a0e8a69 ("ARM:
> 7372/1: ux500: factor out dynamic amba device allocator") from the  tree
> and commit 585d188f8072 ("mach-ux500: crypto - core support for CRYP/HASH
> module") from the crypto tree.
>
> Just context changes (maybe).  I fixed it up (see below) and can carry
> the fix as necessary.
>
> I suspect that there may be something deeper here, though.

This looks correct, thanks Stephen!

Linus Walleij
--
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/