Linux cryptographic layer development
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@osdl.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Adrian Bunk <bunk@stusta.de>,
	linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org,
	Michal Ludvig <michal@logix.cz>
Subject: Re: [-mm patch] CRYPTO_DEV_PADLOCK_AES must select CRYPTO_BLKCIPHER
Date: Sun, 20 Aug 2006 16:51:50 -0700	[thread overview]
Message-ID: <20060820165150.bdb9e4cc.akpm@osdl.org> (raw)
In-Reply-To: <20060820230415.GB31693@gondor.apana.org.au>

On Mon, 21 Aug 2006 09:04:15 +1000
Herbert Xu <herbert@gondor.apana.org.au> 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.

      reply	other threads:[~2006-08-20 23:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20060819220008.843d2f64.akpm@osdl.org>
2006-08-20 16:09 ` [-mm patch] CRYPTO_DEV_PADLOCK_AES must select CRYPTO_BLKCIPHER Adrian Bunk
2006-08-20 23:04   ` Herbert Xu
2006-08-20 23:51     ` Andrew Morton [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060820165150.bdb9e4cc.akpm@osdl.org \
    --to=akpm@osdl.org \
    --cc=bunk@stusta.de \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michal@logix.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox