From: broonie@kernel•org
To: Bjorn Andersson <bjorn.andersson@linaro•org>,
Mathieu Poirier <mathieu.poirier@linaro•org>
Cc: Bjorn Andersson <andersson@kernel•org>,
Bjorn Andersson <quic_bjorande@quicinc•com>,
Chris Lew <quic_clew@quicinc•com>,
Deepak Kumar Singh <quic_deesin@quicinc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Sarannya S <quic_sarannya@quicinc•com>
Subject: linux-next: manual merge of the rpmsg tree with the origin tree
Date: Wed, 26 Apr 2023 15:43:54 +0100 [thread overview]
Message-ID: <20230426144354.87429-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the rpmsg tree got a conflict in:
drivers/rpmsg/qcom_glink_native.c
between commit:
0a7eee89e79eb ("rpmsg: glink: Transition intent request signaling to wait queue")
from the origin tree and commit:
96a7a78517751 ("rpmsg: glink: Add support to handle signals command")
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/rpmsg/qcom_glink_native.c
index 1beb40a1d3df2,208a5e9443cb9..0000000000000
--- a/drivers/rpmsg/qcom_glink_native.c
+++ b/drivers/rpmsg/qcom_glink_native.c
reply other threads:[~2023-04-26 14:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230426144354.87429-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=andersson@kernel$(echo .)org \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mathieu.poirier@linaro$(echo .)org \
--cc=quic_bjorande@quicinc$(echo .)com \
--cc=quic_clew@quicinc$(echo .)com \
--cc=quic_deesin@quicinc$(echo .)com \
--cc=quic_sarannya@quicinc$(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