Re: Crypto Update for 2.6.23

2007-07-15 Thread David Miller
From: Herbert Xu <[EMAIL PROTECTED]> Date: Sun, 15 Jul 2007 21:15:57 +0800 > On Sat, Jul 14, 2007 at 11:48:39PM -0700, David Miller wrote: > > 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 avoi

Re: Crypto Update for 2.6.23

2007-07-15 Thread Herbert Xu
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

Re: Crypto Update for 2.6.23

2007-07-14 Thread David Miller
From: Herbert Xu <[EMAIL PROTECTED]> 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 merg