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:
pgpwG7fvRUmxG.pgp
Description: OpenPGP digital signature
