[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-kernel
Subject:    CRYPTO_DEV_NX merge problem (Re: linux-next: Tree for July 31)
From:       Michael Neuling <mikey () neuling ! org>
Date:       2012-07-31 5:58:58
Message-ID: 31974.1343714338 () neuling ! org
[Download RAW message or body]

> 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
--
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/
[prev in list] [next in list] [prev in thread] [next in thread]