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

Hi all, On Wed, 9 Aug 2017 14:57:27 +1000 Stephen Rothwell 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: >

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

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