Subject: Re: CRYPTO_DEV_NX merge problem (Re: linux-next: Tree for July 31)

From: Seth Jennings <[email-masked]>
Date: Tue, 31 Jul 2012 08:30:46 -0500

On 07/31/2012 12:58 AM, Michael Neuling wrote:
>> Please do not add anything to linux-next included branches/series that is
>> destined for v3.7 until after v3.6-rc1 is released.
> 
> Looks like there is a merge conflict between:
>   commit 1b074ac867a2bd08a6f12f0feed7d91e06941723
>   Author: Seth Jennings <[email-masked]>
>   Subject: powerpc/crypto: rework Kconfig
> 
> and 
>   commit fd297b3a7302ab866306f53c1fd1e97b083fe83e
>   Author: Anton Blanchard <[email-masked]>
>   powerpc: Enable pseries hardware RNG and crypto modules
> 
> Seth made CRYPTO_DEV_NX a bool and Anton set it as a module.
> 
> Hence I get this with a pseries_defconfig
>   arch/powerpc/configs/pseries_defconfig:372:warning: symbol value 'm' invalid for CRYPTO_DEV_NX
> 
> Seth: any reason this can stay as a tristate?

My patch converted CRYPTO_DEV_NX to a submenu access config
and the functionality that used to be enabled by it is now
enabled by CRYPTO_DEV_NX_ENCRYPT.

The resolution is to change Anton's patch from

+CONFIG_CRYPTO_DEV_NX=m

to

+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_DEV_NX_ENCRYPT=m

Seth