Re: linux-next: manual merge of the crypto tree with the arm-soc tree

2014-02-26 Thread Herbert Xu
On Wed, Feb 26, 2014 at 01:15:06PM -0600, Kumar Gala wrote: > > On Feb 25, 2014, at 10:01 PM, Stephen Rothwell wrote: > > > Hi Herbert, > > > > Today's linux-next merge of the crypto tree got a conflict in > > drivers/char/hw_random/Kconfig between commit 2257ffbca73c ("hwrng: msm: > > switch K

Re: linux-next: manual merge of the crypto tree with the arm-soc tree

2014-02-26 Thread Kumar Gala
On Feb 25, 2014, at 10:01 PM, Stephen Rothwell wrote: > Hi Herbert, > > Today's linux-next merge of the crypto tree got a conflict in > drivers/char/hw_random/Kconfig between commit 2257ffbca73c ("hwrng: msm: > switch Kconfig to ARCH_QCOM depends") from the arm-soc tree and commit > f9bee046c91