From: Mark Brown <broonie@kernel.org>
To: matsufan@gmail.com
Cc: alsa-devel@alsa-project.org,
Keith Tzeng <keith.tzeng@quanta.corp-partner.google.com>,
mac.chiang@intel.com, Keith Tzeng <keith.tzeng@quantatw.com>
Subject: Re: [PATCH] ASoC: Intel: boards: Add CML_RT1015 m/c driver
Date: Fri, 16 Oct 2020 17:04:18 +0100 [thread overview]
Message-ID: <20201016160418.GF5274@sirena.org.uk> (raw)
In-Reply-To: <1602864145-32249-1-git-send-email-keith.tzeng@quantatw.com>
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
On Sat, Oct 17, 2020 at 12:02:24AM +0800, matsufan@gmail.com wrote:
> +<<<<<<< HEAD
> obj-$(CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH) += snd-soc-cml_rt1011_rt5682.o
> +=======
> +obj-$(CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH) += cml_rt1011_rt5682.o
> +obj-$(CONFIG_SND_SOC_INTEL_SOF_CML_RT1015_RT5682_MACH) += cml_rt1015_rt5682.o
> +>>>>>>> 955c356... CHROMIUM: ASoC: Intel: boards: Add CML_RT1015 m/c driver
There's an unresolved conflict here :/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next parent reply other threads:[~2020-10-16 16:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1602864145-32249-1-git-send-email-keith.tzeng@quantatw.com>
2020-10-16 16:04 ` Mark Brown [this message]
2020-10-16 16:19 ` [PATCH] ASoC: Intel: boards: Add CML_RT1015 m/c driver Pierre-Louis Bossart
2020-10-16 16:34 ` Mark Brown
2020-10-16 17:55 ` Lu, Brent
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=20201016160418.GF5274@sirena.org.uk \
--to=broonie@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=keith.tzeng@quanta.corp-partner.google.com \
--cc=keith.tzeng@quantatw.com \
--cc=mac.chiang@intel.com \
--cc=matsufan@gmail.com \
/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).