linux-kernel - Re: linux-next: manual merge of the crypto tree with Linus' 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120507041654.GA25039@gondor.apana.org.au>
Date:	Mon, 7 May 2012 14:16:54 +1000
From:	Herbert Xu <herbert@...dor.apana.org.au>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andreas Westin <andreas.westin@...ricsson.com>,
	Linus Walleij <linus.walleij@...aro.org>,
	Lee Jones <lee.jones@...aro.org>, Arnd Bergmann <arnd@...db.de>
Subject: Re: linux-next: manual merge of the crypto tree with Linus' tree

On Mon, May 07, 2012 at 12:11:37PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got conflicts in
> arch/arm/mach-ux500/board-mop500.c and arch/arm/mach-ux500/board-u5500.c
> between commit b024a0c80435 ("ARM: ux500: move top level platform devices
> in sysfs to /sys/devices/socX") from Linus' tree and commit 3ba812f4d0be
> ("mach-ux500: crypto - core support for CRYP/HASH module") from the
> crypto tree.
> 
> Just context changes.  I fixed them up (see below) and can carry the
> fixes as necessary.

I think it looks fine but I'll let Linus Walleij have the final
say on this.

Thanks!
-- 
Email: Herbert Xu <herbert@...dor.apana.org.au>
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-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/