On Wed, Jan 05, 2022 at 01:03:45PM +0100, Takashi Iwai wrote: > On Wed, 05 Jan 2022 12:30:18 +0100, > Charles Keepax wrote: > > Patches 7,8 specifically will cause some very minor conflicts with > > Lucas's currently outstanding work on the HDA version of cs35l41. > > Whilst things will still build, this patch adds a test key function > > his code will now have to call. If his patches are getting merged > > first I will respin this series to update his code, he is currently on > > holiday until the 12th of Jan, so if we want to wait for another spin > > of those patches I can work with him to update them at that time. Or > > alternatively we could just merge them all and I will do a quick fixup > > patch at the end, since there is no build breakage. > > FWIW, the ASoC part of Lucas's patch set has been already merged in > Mark's asoc tree. (HD-audio part isn't merged yet though). > Yeah its the HDA part that would require a small change after those last two patches to call the additional function. The series is already based on top of the merged ASoC changes. Thanks, Charles
