From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bjorn Andersson <bjorn.andersson@linaro•org>,
Vinod Koul <vinod.koul@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Peter Griffin <peter.griffin@linaro•org>
Subject: linux-next: manual merge of the rpmsg tree with the slave-dma tree
Date: Mon, 14 Nov 2016 16:20:26 +1100 [thread overview]
Message-ID: <20161114162026.0511e0db@canb.auug.org.au> (raw)
Hi Bjorn,
Today's linux-next merge of the rpmsg tree got a conflict in:
drivers/remoteproc/Kconfig
between commit:
bb6869b21478 ("remoteproc: st_slim_rproc: add a slimcore rproc driver")
from the slave-dma tree and commit:
99d93470dcb4 ("remoteproc: qcom_wcnss: Fix circular module dependency")
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/remoteproc/Kconfig
index 14d5d2d43a38,5fcbefcb8636..000000000000
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@@ -100,10 -95,9 +96,9 @@@ config QCOM_WCNSS_PI
tristate "Qualcomm WCNSS Peripheral Image Loader"
depends on OF && ARCH_QCOM
depends on QCOM_SMEM
+ depends on REMOTEPROC
select QCOM_MDT_LOADER
select QCOM_SCM
- select QCOM_WCNSS_IRIS
- select REMOTEPROC
help
Say y here to support the Peripheral Image Loader for the Qualcomm
Wireless Connectivity Subsystem.
next reply other threads:[~2016-11-14 5:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-14 5:20 Stephen Rothwell [this message]
2016-11-17 6:40 ` linux-next: manual merge of the rpmsg tree with the slave-dma tree Bjorn Andersson
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=20161114162026.0511e0db@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=peter.griffin@linaro$(echo .)org \
--cc=vinod.koul@intel$(echo .)com \
/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