lkml.org 
[lkml]   [2007]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: Crypto Update for 2.6.23
On Sat, Jul 14, 2007 at 11:48:39PM -0700, David Miller wrote:
>
> I merged this into my net-2.6 tree, there was a tiny conflict
> in crypto/Kconfig I had to resolve because of the async_tx
> stuff that went in upstream.

Thanks!

> Herbert can you contact the async_tx author to make sure that
> his crypto/ bits go through you in the future so that conflicts
> like this can be avoided?

No problems. This was a once-off because it involved multiple
conflicts all over the place as Andrew can no doubt attest to :)

Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-07-15 15:19    [W:0.035 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site