From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bjorn Andersson <bjorn.andersson@linaro•org>,
Andy Gross <agross@codeaurora•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro•org>
Subject: linux-next: manual merge of the rpmsg tree with the qcom tree
Date: Wed, 9 Aug 2017 14:57:27 +1000 [thread overview]
Message-ID: <20170809145727.7b3849da@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-08-09 4:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-09 4:57 Stephen Rothwell [this message]
2017-09-05 0:27 ` linux-next: manual merge of the rpmsg tree with the qcom tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170809145727.7b3849da@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agross@codeaurora$(echo .)org \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=srinivas.kandagatla@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox