lkml.org 
[lkml]   [2012]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectCRYPTO_DEV_NX merge problem (Re: linux-next: Tree for July 31)
Date
> 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 <sjenning@linux.vnet.ibm.com>
Subject: powerpc/crypto: rework Kconfig

and
commit fd297b3a7302ab866306f53c1fd1e97b083fe83e
Author: Anton Blanchard <anton@samba.org>
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?

Mikey


\
 
 \ /
  Last update: 2012-07-31 08:41    [W:0.043 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site