[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20070714.234839.34761809.davem@davemloft.net>
Date: Sat, 14 Jul 2007 23:48:39 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: herbert@...dor.apana.org.au
Cc: torvalds@...ux-foundation.org, linux-crypto@...r.kernel.org,
linux-kernel@...r.kernel.org, akpm@...ux-foundation.org
Subject: Re: Crypto Update for 2.6.23
From: Herbert Xu <herbert@...dor.apana.org.au>
Date: Wed, 11 Jul 2007 21:08:49 +0800
> Here is the crypto update for 2.6.23:
>
> Please pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
>
> or
>
> master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
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.
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?
Thanks.
-
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/
Powered by blists - more mailing lists