* linux-next: manual merge of the dmaengine tree with the sound-asoc tree
@ 2025-02-12 3:00 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2025-02-12 3:00 UTC (permalink / raw)
To: Vinod Koul, Mark Brown, Liam Girdwood
Cc: Andrei Simion, Charan Pedumuru, Durai Manickam KR,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
Hi all,
Today's linux-next merge of the dmaengine tree got a conflict in:
Documentation/devicetree/bindings/misc/atmel-ssc.txt
between commit:
6603c5133daa ("ASoC: dt-bindings: atmel,at91-ssc: Convert to YAML format")
from the sound-asoc tree and commit:
a54ec770396c ("dt-bindings: dma: convert atmel-dma.txt to YAML")
from the dmaengine tree.
I fixed it up (I just deleted the file) 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] only message in thread
only message in thread, other threads:[~2025-02-12 3:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-12 3:00 linux-next: manual merge of the dmaengine tree with the sound-asoc tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®