Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932109AbWHTXzP (ORCPT ); Sun, 20 Aug 2006 19:55:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932113AbWHTXzO (ORCPT ); Sun, 20 Aug 2006 19:55:14 -0400 Received: from smtp.osdl.org ([65.172.181.4]:18129 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S932109AbWHTXzM (ORCPT ); Sun, 20 Aug 2006 19:55:12 -0400 Date: Sun, 20 Aug 2006 16:51:50 -0700 From: Andrew Morton To: Herbert Xu Cc: Adrian Bunk , linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, Michal Ludvig Subject: Re: [-mm patch] CRYPTO_DEV_PADLOCK_AES must select CRYPTO_BLKCIPHER Message-Id: <20060820165150.bdb9e4cc.akpm@osdl.org> In-Reply-To: <20060820230415.GB31693@gondor.apana.org.au> References: <20060819220008.843d2f64.akpm@osdl.org> <20060820160928.GN7813@stusta.de> <20060820230415.GB31693@gondor.apana.org.au> X-Mailer: Sylpheed version 2.2.7 (GTK+ 2.8.17; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1055 Lines: 26 On Mon, 21 Aug 2006 09:04:15 +1000 Herbert Xu wrote: > > --- linux-2.6.18-rc4-mm2/drivers/crypto/Kconfig.old 2006-08-20 17:28:46.000000000 +0200 > > +++ linux-2.6.18-rc4-mm2/drivers/crypto/Kconfig 2006-08-20 17:44:56.000000000 +0200 > > @@ -16,6 +16,7 @@ > > config CRYPTO_DEV_PADLOCK_AES > > bool "Support for AES in VIA PadLock" > > depends on CRYPTO_DEV_PADLOCK > > + select CRYPTO_BLKCIPHER > > default y > > help > > Use VIA PadLock for AES algorithm. > > Andrew, there is definitely something screwed up. Things are a bit messy at present - some git trees are based off Greg's tree and some are based off Linus's and git is pretty hopeless at pulling usable diffs in these complex situations. So yes, it's quite possible that the above is a merging problem. - 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/