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

[Kai Vehmanen]

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

Br, Kai