Subject: Re: linux-next: Tree for November 29

From: Herbert Xu <[email-masked]>
Date: Mon, 29 Nov 2010 22:57:17 +0800

On Mon, Nov 29, 2010 at 09:47:38AM +0000, Zimny Lech wrote:
> Ave
> 
> 2010/11/29 Stephen Rothwell <[email-masked]>:
> > Hi all,
> >
> > Changes since 20101126:
> 
> 
> Setup is 14188 bytes (padded to 14336 bytes).
> System is 1267 kB
> CRC 61cea148
> Kernel: arch/x86/boot/bzImage is ready  (#1)
>   Building modules, stage 2.
>   MODPOST 537 modules
> ERROR: "sock_no_mmap" [crypto/algif_skcipher.ko] undefined!

I hope this patch fixes it for you.

commit 7451708f39db19a8303bb7fb95f00aca9f673cb5
Author: Herbert Xu <[email-masked]>
Date:   Mon Nov 29 22:56:03 2010 +0800

    crypto: af_alg - Add dependency on NET
    
    Add missing dependency on NET since we require sockets for our
    interface.
    
    Should really be a select but kconfig doesn't like that:
    
    net/Kconfig:6:error: found recursive dependency: NET -> NETWORK_FILESYSTEMS -> AFS_FS -> AF_RXRPC -> CRYPTO -> CRYPTO_USER_API_HASH -> CRYPTO_USER_API -> NET
    
    Reported-by: Zimny Lech <[email-masked]>
    Signed-off-by: Herbert Xu <[email-masked]>

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 467491d..96b0e55 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -848,6 +848,7 @@ config CRYPTO_USER_API
 
 config CRYPTO_USER_API_HASH
 	tristate "User-space interface for hash algorithms"
+	depends on NET
 	select CRYPTO_HASH
 	select CRYPTO_USER_API
 	help
@@ -856,6 +857,7 @@ config CRYPTO_USER_API_HASH
 
 config CRYPTO_USER_API_SKCIPHER
 	tristate "User-space interface for symmetric key cipher algorithms"
+	depends on NET
 	select CRYPTO_BLKCIPHER
 	select CRYPTO_USER_API
 	help

Thanks,
-- 
Email: Herbert Xu <[email-masked]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt