* linux-next: manual merge of the crypto tree with the omap tree
@ 2010-09-27 4:33 Stephen Rothwell
2010-09-27 4:41 ` Herbert Xu
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-09-27 4:33 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-next, linux-kernel, Dmitry Kasatkin, Tony Lindgren, linux-omap
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
arch/arm/mach-omap2/devices.c between commit
5d14f2792f9d63c5d25903bd048017c4b53c7d9a ("omap: crypto: updates to
enable omap aes") from the omap tree and commit
b744c679f62b368cb94c21c1dcd4618e42d88d63 ("crypto: updates to enable omap
aes") from the crypto tree.
Two versions of the same patch. The version in the omap tree has been
updated, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the crypto tree with the omap tree
2010-09-27 4:33 linux-next: manual merge of the crypto tree with the omap tree Stephen Rothwell
@ 2010-09-27 4:41 ` Herbert Xu
0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2010-09-27 4:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Dmitry Kasatkin, Tony Lindgren, linux-omap
On Mon, Sep 27, 2010 at 02:33:00PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
>
> Today's linux-next merge of the crypto tree got a conflict in
> arch/arm/mach-omap2/devices.c between commit
> 5d14f2792f9d63c5d25903bd048017c4b53c7d9a ("omap: crypto: updates to
> enable omap aes") from the omap tree and commit
> b744c679f62b368cb94c21c1dcd4618e42d88d63 ("crypto: updates to enable omap
> aes") from the crypto tree.
>
> Two versions of the same patch. The version in the omap tree has been
> updated, so I used that.
Thanks for the note Stephen.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-27 4:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-27 4:33 linux-next: manual merge of the crypto tree with the omap tree Stephen Rothwell
2010-09-27 4:41 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®