Merge branch 'for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/amd/raven/pci-acp3x.c
index cd5b097,a7de4e6..bd0b155
--- 1/sound/soc/amd/raven/pci-acp3x.c
--- 2/sound/soc/amd/raven/pci-acp3x.c
+++ b/sound/soc/amd/raven/pci-acp3x.c
@@@ -231,7 -231,9 +231,8 @@@ static int snd_acp3x_probe(struct pci_d
                }
                break;
        default:
 -              dev_info(&pci->dev, "Invalid ACP audio mode : %d\n", val);
 -              ret = -ENODEV;
 -              goto disable_msi;
 +              dev_info(&pci->dev, "ACP audio mode : %d\n", val);
++              break;
        }
        pm_runtime_set_autosuspend_delay(&pci->dev, 2000);
        pm_runtime_use_autosuspend(&pci->dev);

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

diff --cc sound/soc/codecs/rt1015.h
Simple merge

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

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

diff --cc sound/soc/intel/boards/bytcr_rt5640.c
Simple merge

diff --cc sound/soc/intel/keembay/kmb_platform.c
Simple merge

diff --cc sound/soc/qcom/lpass-cpu.c
Simple merge

diff --cc sound/soc/qcom/lpass-sc7180.c
Simple merge

diff --cc sound/soc/qcom/lpass.h
Simple merge