[alsa-devel] [PATCH 00/10] ASoC: SOF: initial cleanup for DT and multi-client support

[Pierre-Louis Bossart]

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.