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~} <[email protected]>
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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
