Merge branch 'for-next' into for-linus

Prepare for 6.8 merge.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --cc sound/pci/hda/cs35l41_hda_property.c
index c1afb721b4c677a4fe86622263708a9a59c3fc3f,fcc605be51cf7bf195572ad96d634e4687a96ff8..35277ce890a46fb9204cc80a55e812cb64c842d5
--- 1/sound/pci/hda/cs35l41_hda_property.c
--- 2/sound/pci/hda/cs35l41_hda_property.c
+++ b/sound/pci/hda/cs35l41_hda_property.c
@@@ -208,9 -234,10 +234,9 @@@ static int generic_dsd_config(struct cs
                         "_DSD already exists.\n");
        }
  
-       if (cfg->bus == SPI) {
+       if (cs35l41->control_bus == SPI) {
                cs35l41->index = id;
  
 -#if IS_ENABLED(CONFIG_SPI)
                /*
                 * Manually set the Chip Select for the second amp <cs_gpio_index> in the node.
                 * This is only supported for systems with 2 amps, since we cannot expand the

diff --cc sound/pci/hda/patch_realtek.c
Simple merge