From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>,
Jonathan Corbet <corbet@lwn•net>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>,
Maxime Ripard <maxime.ripard@bootlin•com>
Subject: linux-next: manual merge of the sound-asoc tree with the jc_docs tree
Date: Mon, 2 Sep 2019 14:04:19 +1000 [thread overview]
Message-ID: <20190902140419.110a2c03@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2019-09-02 4:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190902140419.110a2c03@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=corbet@lwn$(echo .)net \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime.ripard@bootlin$(echo .)com \
--cc=mchehab+samsung@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox