From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>, Takashi Iwai <tiwai@suse.de>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Sebastian Reichel <sebastian.reichel@collabora.com>
Subject: linux-next: manual merge of the sound-asoc tree with the sound tree
Date: Tue, 12 Nov 2019 12:26:00 +1100 [thread overview]
Message-ID: <20191112122600.44c88517@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
sound/soc/codecs/Kconfig
between commit:
82e8d723e9e6 ("sound: Fix Kconfig indentation")
from the sound tree and commit:
36da67630d31 ("ASoC: Add DA7213 audio codec as selectable option")
from the sound-asoc tree.
I fixed it up (I just used the latter version which also fixed the
indentation) 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 --]
next reply other threads:[~2019-11-12 1:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 1:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-20 1:26 linux-next: manual merge of the sound-asoc tree with the sound tree Stephen Rothwell
2023-09-25 1:54 Stephen Rothwell
2019-10-16 0:33 Stephen Rothwell
2019-10-07 23:52 Stephen Rothwell
2019-08-09 3:31 Stephen Rothwell
2019-08-09 3:16 Stephen Rothwell
2019-08-01 2:50 Stephen Rothwell
2019-08-01 16:46 ` Pierre-Louis Bossart
2015-02-04 2:44 Stephen Rothwell
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=20191112122600.44c88517@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@kernel.org \
--cc=krzk@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sebastian.reichel@collabora.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).