Merge branch 'for-linus' into for-next

Pull 6.11 fixes to 6.12-devel branch

Signed-off-by: Takashi Iwai <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc sound/soc/codecs/peb2466.c
Simple merge

diff --cc sound/soc/codecs/tas2781-i2c.c
Simple merge

diff --cc sound/soc/intel/common/soc-acpi-intel-lnl-match.c
index 2522e6f11749748ea26376e173b20785d1804f09,edfb668d0580d3ffe9c9cc2335b552157ea11c11..3c4e0c7ca8eee8425d9ca5b13c87185499432e2a
--- 1/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
--- 2/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
@@@ -267,41 -208,9 +267,42 @@@ static const struct snd_soc_acpi_link_a
                .num_adr = ARRAY_SIZE(cs42l43_0_adr),
                .adr_d = cs42l43_0_adr,
        },
+       {}
  };
  
 +static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0_cs35l56_l3[] = {
 +      {
 +              .mask = BIT(0),
 +              .num_adr = ARRAY_SIZE(cs42l43_0_adr),
 +              .adr_d = cs42l43_0_adr,
 +      },
 +      {
 +              .mask = BIT(3),
 +              .num_adr = ARRAY_SIZE(cs35l56_3_lr_adr),
 +              .adr_d = cs35l56_3_lr_adr,
 +      },
 +      {}
 +};
 +
 +static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0_cs35l56_l23[] = {
 +      {
 +              .mask = BIT(0),
 +              .num_adr = ARRAY_SIZE(cs42l43_0_adr),
 +              .adr_d = cs42l43_0_adr,
 +      },
 +      {
 +              .mask = BIT(2),
 +              .num_adr = ARRAY_SIZE(cs35l56_2_l_adr),
 +              .adr_d = cs35l56_2_l_adr,
 +      },
 +      {
 +              .mask = BIT(3),
 +              .num_adr = ARRAY_SIZE(cs35l56_3_r_adr),
 +              .adr_d = cs35l56_3_r_adr,
 +      },
 +      {}
 +};
 +
  static const struct snd_soc_acpi_link_adr lnl_rvp[] = {
        {
                .mask = BIT(0),

diff --cc sound/soc/meson/axg-card.c
Simple merge