[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:
> On Fri, 11 Oct 2019 16:10:29 +0200,
> Kai Vehmanen wrote:
>>
>> Hey,
>>
>> On Fri, 11 Oct 2019, Pierre-Louis Bossart wrote:
>>> Kai, I get a conflict when I try to apply these patches on Mark's tree? You
>>> probably want to rebase?
>>> Or was the intent to go through Takashi's tree?
>>
>> I rebased this on top of Takashi's latest before sending:
>>
>> 07be92a0e6b0 (tiwai/master) Merge branch 'for-next'
>>
>> But yeah, the series will conflict with the DMI patch in Mark's tree:
>>
>> 43b2ab9009b1 ASoC: SOF: Intel: hda: Disable DMI L1 entry during capture
> 
> 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?