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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 9 Aug 2017 14:57:27 +1000

Hi Bjorn,

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

  drivers/soc/qcom/Kconfig

between commit:

  2a464815d326 ("soc: qcom: bring all qcom drivers into a submenu")

from the qcom tree and commit:

  c4d77d5fcd8b ("soc: qcom: GLINK SSR notifier")

from the rpmsg 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 drivers/soc/qcom/Kconfig
index 5f12657fc552,d0fc331972d2..000000000000
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@@ -1,8 -1,15 +1,17 @@@
  #
  # QCOM Soc drivers
  #
 +menu "Qualcomm SoC drivers"
 +
+ config QCOM_GLINK_SSR
+ 	tristate "Qualcomm Glink SSR driver"
+ 	depends on RPMSG
+ 	depends on QCOM_RPROC_COMMON
+ 	help
+ 	  Say y here to enable GLINK SSR support. The GLINK SSR driver
+ 	  implements the SSR protocol for notifying the remote processor about
+ 	  neighboring subsystems going up or down.
+ 
  config QCOM_GSBI
          tristate "QCOM General Serial Bus Interface"
          depends on ARCH_QCOM