* linux-next: manual merge of the soundwire tree with Linus' tree
@ 2022-09-21 5:20 Stephen Rothwell
2022-09-21 5:26 ` Vinod Koul
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2022-09-21 5:20 UTC (permalink / raw)
To: Vinod Koul
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Srinivas Kandagatla
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
Hi all,
Today's linux-next merge of the soundwire tree got a conflict in:
drivers/soundwire/qcom.c
between commit:
4ef3f2aff126 ("soundwire: qcom: fix device status array range")
from Linus' tree and commits:
8039b6f3e5c7 ("soundwire: qcom: update status from device id 1")
ed8d07acec73 ("soundwire: qcom: do not send status of device 0 during alert")
from the soundwire tree.
I fixed it up (I used the latter) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the soundwire tree with Linus' tree
2022-09-21 5:20 linux-next: manual merge of the soundwire tree with Linus' tree Stephen Rothwell
@ 2022-09-21 5:26 ` Vinod Koul
0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2022-09-21 5:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Srinivas Kandagatla
On 21-09-22, 15:20, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the soundwire tree got a conflict in:
>
> drivers/soundwire/qcom.c
>
> between commit:
>
> 4ef3f2aff126 ("soundwire: qcom: fix device status array range")
>
> from Linus' tree and commits:
>
> 8039b6f3e5c7 ("soundwire: qcom: update status from device id 1")
> ed8d07acec73 ("soundwire: qcom: do not send status of device 0 during alert")
>
> from the soundwire tree.
>
> I fixed it up (I used the latter) and can carry the fix as necessary.
Thanks Stephen,
That seems to be the correct resolution, I will merge fixes to bring
this in.
> 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
--
~Vinod
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-21 5:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-21 5:20 linux-next: manual merge of the soundwire tree with Linus' tree Stephen Rothwell
2022-09-21 5:26 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox