* linux-next: manual merge of the rpmsg tree with the origin tree
@ 2023-04-26 14:43 broonie
0 siblings, 0 replies; only message in thread
From: broonie @ 2023-04-26 14:43 UTC (permalink / raw)
To: Bjorn Andersson, Mathieu Poirier
Cc: Bjorn Andersson, Bjorn Andersson, Chris Lew, Deepak Kumar Singh,
Linux Kernel Mailing List, Linux Next Mailing List, Sarannya S
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-04-26 14:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-26 14:43 linux-next: manual merge of the rpmsg tree with the origin tree broonie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox