From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bjorn Andersson <bjorn.andersson@linaro•org>,
Andy Gross <agross@codeaurora•org>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.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: Re: linux-next: manual merge of the rpmsg tree with the qcom tree
Date: Tue, 5 Sep 2017 10:27:35 +1000 [thread overview]
Message-ID: <20170905102735.4e59ffc9@canb.auug.org.au> (raw)
In-Reply-To: <20170809145727.7b3849da@canb.auug.org.au>
Hi all,
On Wed, 9 Aug 2017 14:57:27 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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.
>
> 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
Just a reminder that the above conflict still exists (but between the
rpmsg tree and the arm-soc tree, now).
--
Cheers,
Stephen Rothwell
prev parent reply other threads:[~2017-09-05 0:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-09 4:57 linux-next: manual merge of the rpmsg tree with the qcom tree Stephen Rothwell
2017-09-05 0:27 ` Stephen Rothwell [this message]
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=20170905102735.4e59ffc9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agross@codeaurora$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--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