From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> 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-crypto" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html