On Tue, 06 Aug 2024 13:06:25 +0200, Richard Fitzgerald wrote: > > On 5/8/24 09:02, Takashi Iwai wrote: > > On Fri, 02 Aug 2024 17:22:12 +0200, > > Richard Fitzgerald wrote: > >> > >> Add support for HP G12 laptops that use CS35L54 or CS35L56 amplifiers > >> with Realtek HDA codecs. Some of these use the same SSID for models with > >> CS35L54 and models with CS35L56 so the ACPI entries are examined to > >> determine which amp is present. > >> > >> To avoid having to #ifdef around this code we've fixed the definitions > >> of SPI and I2C functions that were not correctly supplying dummy functions > >> when the real functions are not in the build. > >> > >> Changes since V1: > >> Added I2C and SPI patches to provide dummy functions. > >> > >> Richard Fitzgerald (2): > >> spi: Add empty versions of ACPI functions > >> i2c: Fix conditional for substituting empty ACPI functions > >> > >> Simon Trimmer (1): > >> ALSA: hda/realtek: Add support for new HP G12 laptops > > > > Hm, the 3rd patch requires both patch 1 and 2, and now those seem to > > have been applied to two different trees, which makes hard to apply > > the 3rd one. > > > > Mark, Wolfram, will you guys submit PR for 6.11-rc3 including the > > patch 1 and 2? If so, I can apply the patch 3 later on top of > > 6.11-rc3. > > > > Or, I'd need to pull from both of you and apply the patch 3. > > > > > > thanks, > > > > Takashi > > We've just noticed that the SPI patches have gone into for-6.12. > We really hoped that we could get the main patch (G12 support) into > 6.11 (yes, I know, I didn't actually say that we were targeting 6.11 - > sorry). I also planned for 6.12, but fortunately didn't take it yet, so it's no problem :) And, I see Mark's PR is based on Linus tree, so that's fine to take. The remaining question is about the i2c patch. Wolfram, has the patch been merged for your branch for 6.11? If yes, can I pull your change, so that I can apply the patch 3 together with the SPI change? thanks, Takashi
