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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 5 Nov 2019 09:39:20 +1100

Hi all,

Today's linux-next merge of the qcom tree got a conflict in:

  arch/arm64/configs/defconfig

between commit:

  af24cb20689d ("arm64: defconfig: Enable HiSilicon ZIP controller")

from the arm-soc tree and commit:

  ca1561a3d8e4 ("arm64: defconfig: Enable Qualcomm pseudo rng")

from the qcom 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/arm64/configs/defconfig
index d3a289e12c92,0de751801c98..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -750,8 -749,8 +759,9 @@@ CONFIG_QCOM_SMEM=
  CONFIG_QCOM_SMD_RPM=y
  CONFIG_QCOM_SMP2P=y
  CONFIG_QCOM_SMSM=y
+ CONFIG_QCOM_SOCINFO=m
  CONFIG_ARCH_R8A774A1=y
 +CONFIG_ARCH_R8A774B1=y
  CONFIG_ARCH_R8A774C0=y
  CONFIG_ARCH_R8A7795=y
  CONFIG_ARCH_R8A7796=y
@@@ -861,7 -860,8 +873,9 @@@ CONFIG_NLS_ISO8859_1=
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
 +CONFIG_CRYPTO_DEV_HISI_ZIP=m
+ CONFIG_CRYPTO_USER_API_RNG=m
+ CONFIG_CRYPTO_DEV_QCOM_RNG=m
  CONFIG_DMA_CMA=y
  CONFIG_CMA_SIZE_MBYTES=32
  CONFIG_PRINTK_TIME=y