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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CACRpkdbhyL4eJOLZ0pw_T3LDwPpFJM4BWVAhKh8hZADMJ4PBEA@mail.gmail.com>
Date:	Wed, 16 May 2012 09:26:53 +0200
From:	Linus Walleij <linus.walleij@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Herbert Xu <herbert@...dor.apana.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>,
	Andreas Westin <andreas.westin@...ricsson.com>
Subject: Re: linux-next: manual merge of the crypto tree with the arm tree

On Wed, May 16, 2012 at 7:14 AM, Stephen Rothwell <sfr@...b.auug.org.au> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/