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

2014-02-26 04:02:09

Subject: 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 tree.

Two version of the same patch ... I just kept the arm-soc version.

--
Cheers,
Stephen Rothwell <[email protected]>

Attachments:

(No filename) (427.00 B)
(No filename) (836.00 B)
Download all attachments

2014-02-26 19:15:15

by Kumar Gala

[permalink] [raw]

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

On Feb 25, 2014, at 10:01 PM, Stephen Rothwell <[email protected]> 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

thanks

- k

--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

2014-02-26 21:58:32

by Herbert Xu

[permalink] [raw]

Subject: 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 <[email protected]> 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 <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt