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

[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 <sfr@xxxxxxxxxxxxxxxx> 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
> > f9bee046c915 ("hwrng: msm: switch Kconfig to ARCH_QCOM depends") from the
> > crypto tree.
> > 
> > Two version of the same patch ... I just kept the arm-soc version.
> 
> Herbert,
> 
> Was trying to keep all the ARCH_QCOM Kconfig updates together and via arm-soc.git

OK I have reverted this patch from cryptodev.

Thanks,
-- 
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/