From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Mark Brown <broonie@kernel.org>
Cc: tiwai@suse.de, alsa-devel@alsa-project.org
Subject: Re: [alsa-devel] [PATCH 00/10] ASoC: SOF: initial cleanup for DT and multi-client support
Date: Mon, 2 Dec 2019 18:08:40 -0600 [thread overview]
Message-ID: <b168d21f-58d5-6157-70b3-c9673ea87431@linux.intel.com> (raw)
In-Reply-To: <20191202233257.GG1998@sirena.org.uk>
On 12/2/19 5:32 PM, Mark Brown wrote:
> On Mon, Dec 02, 2019 at 02:39:31PM -0600, Pierre-Louis Bossart wrote:
>
>>> Daniel Baluta (2):
>>> ASoC: SOF: Make creation of machine device from SOF core optional
>
>> This patch conflicts with Jaroslav's "[PATCH] ASoC: intel/skl/hda - export
>> number of digital microphones via control components"
>
>> I will resubmit a v2 when Jaroslav's patches are available in Mark's tree.
>> For SOF development Jaroslav's changes were already applied and the conflict
>> solved already.
>
> If you want to respin this series with Jaroslav's patches also
> wrapped in that'd work just as well and get everything merged
> quicker. I've just got stuff in my to apply queue so far, not
> actually applied anything that you can't see in git. Waiting
> till after the merge window is also fine but if you did the
> merge/rebase already seems like you may as well post.
sounds good.
I'll repost once I have the merge/rebase test results, somehow there was
a firmware regression during the Thanksgiving break.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
prev parent reply other threads:[~2019-12-03 0:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 14:28 [alsa-devel] [PATCH 00/10] ASoC: SOF: initial cleanup for DT and multi-client support Pierre-Louis Bossart
2019-11-26 14:28 ` [alsa-devel] [PATCH 01/10] ASoC: SOF: topology: remove snd_sof_init_topology() Pierre-Louis Bossart
2019-11-26 14:28 ` [alsa-devel] [PATCH 02/10] ASoC: SOF: core: modify the signature for snd_sof_create_page_table Pierre-Louis Bossart
2019-11-26 14:28 ` [alsa-devel] [PATCH 03/10] ASoC: SOF: core: move check for runtime callbacks to core Pierre-Louis Bossart
2019-11-26 14:28 ` [alsa-devel] [PATCH 04/10] ASoC: SOF: Introduce default_fw_filename member in sof_dev_desc Pierre-Louis Bossart
2019-11-26 14:28 ` [alsa-devel] [PATCH 05/10] ASoC: SOF: partition audio-related parts from SOF core Pierre-Louis Bossart
2019-11-26 14:28 ` [alsa-devel] [PATCH 06/10] ASoC: SOF: intel: hda: Modify signature for hda_codec_probe_bus() Pierre-Louis Bossart
2019-11-26 14:28 ` [alsa-devel] [PATCH 07/10] ASoC: SOF: Make creation of machine device from SOF core optional Pierre-Louis Bossart
2019-11-26 14:28 ` [alsa-devel] [PATCH 08/10] ASoC: SOF: remove nocodec_fw_filename Pierre-Louis Bossart
2019-11-26 14:28 ` [alsa-devel] [PATCH 09/10] ASoC: SOF: Remove unused drv_name in sof_pdata Pierre-Louis Bossart
2019-11-26 14:28 ` [alsa-devel] [PATCH 10/10] ASoC: SOF: nocodec: Amend arguments for sof_nocodec_setup() Pierre-Louis Bossart
2019-12-02 20:39 ` [alsa-devel] [PATCH 00/10] ASoC: SOF: initial cleanup for DT and multi-client support Pierre-Louis Bossart
2019-12-02 23:32 ` Mark Brown
2019-12-03 0:08 ` Pierre-Louis Bossart [this message]
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=b168d21f-58d5-6157-70b3-c9673ea87431@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--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).