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. > > > ASoC: SOF: Remove unused drv_name in sof_pdata > > > > Ranjani Sridharan (8): > > ASoC: SOF: topology: remove snd_sof_init_topology() > > ASoC: SOF: core: modify the signature for snd_sof_create_page_table > > ASoC: SOF: core: move check for runtime callbacks to core > > ASoC: SOF: Introduce default_fw_filename member in sof_dev_desc > > ASoC: SOF: partition audio-related parts from SOF core > > ASoC: SOF: intel: hda: Modify signature for hda_codec_probe_bus() > > ASoC: SOF: remove nocodec_fw_filename > > ASoC: SOF: nocodec: Amend arguments for sof_nocodec_setup()
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
