* linux-next: manual merge of the sound-asoc tree with the jc_docs tree
@ 2019-09-02 4:04 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-09-02 4:04 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Jonathan Corbet
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Mauro Carvalho Chehab, Maxime Ripard
[-- Attachment #1: Type: text/plain, Size: 824 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt
between commit:
aa95b4a960ab ("docs: fix a couple of new broken references")
from the jc_docs tree and commit:
8a99f76ac1a5 ("ASoC: dt-bindings: Convert Allwinner A33 codec to a schema")
from the sound-asoc tree.
I fixed it up (the latter removed the file, so I did that) 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:[~2019-09-02 4:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-02 4:04 linux-next: manual merge of the sound-asoc tree with the jc_docs 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