[alsa-devel] [PATCH v6 5/9] ASoC: SOF: Intel: add support for snd-hda-codec-hdmi

[Pierre-Louis Bossart]

>> On 10/17/19 2:58 AM, Takashi Iwai wrote:
>>> A trivial conflict can be resolved by either Mark or my side, so don't
>>> worry too much about it.
>>>
>>> But if the patches don't rely on the new stuff that are found only in
>>> my tree, maybe it's better to rebase on Mark's tree, so that you can
>>> follow the whole other SOF development.
>>
>> I'll let Kai comment, but this change will have ripple effects on machine
>> drivers we need to upstream, so it might be better to use Mark's tree?
> 
> ack on both, now that we agree on the few change to generic hda part,
> the rest is SOF specific and easier to merge via Mark's tree. I'll
> work with Pierre to submit v7 (either directly, or even as part of
> Pierre's next SOF series).

Kai, it's probably better if you manage this directly, the next series 
will be about all the S0ix/DOix support and already quite dense.