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

Hi all, Today's linux-next merge of the crypto tree got a conflict in: arch/arm/boot/dts/stm32746g-eval.dts between commit: 4cc627472cd6 ("ARM: dts: stm32: enable RTC on stm32746g-eval") from the arm-soc tree and commit: 2e3db2931875 ("ARM: dts: stm32: enable CRC on stm32746g-eval board

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

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

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

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

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 f9bee046c915 ("hwrng: msm: switch Kconfig to ARCH_QCOM depends") from the crypto