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

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

[Stephen Rothwell]

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")

from the crypto tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/boot/dts/stm32746g-eval.dts
index b5207588bdcb,0dc18a0f0940..000000000000
--- a/arch/arm/boot/dts/stm32746g-eval.dts
+++ b/arch/arm/boot/dts/stm32746g-eval.dts
@@@ -89,10 -89,10 +89,14 @@@
  	clock-frequency = <25000000>;
  };
  
+ &crc {
+ 	status = "okay";
+ };
+ 
 +&rtc {
 +	status = "okay";
 +};
 +
  &usart1 {
  	pinctrl-0 = <&usart1_pins_a>;
  	pinctrl-names = "default";

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

[Stephen Rothwell]

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 <sfr@canb.auug.org.au>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140226/6b2714ce/attachment.sig>

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

[Kumar Gala]

On Feb 25, 2014, at 10:01 PM, Stephen Rothwell <sfr@canb.auug.org.au> 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

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@canb.auug.org.au> 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@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt