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

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/soc/soc-topology.c
index 2b3c74a0b1269602ac502a952bc8c40d8d0b887e,92e4f4d08bfad6b7ff9e9904eac0fac7f98f8bd9..69d6a52d00667e576c76353da8dadab4c5fd0bf0
--- 1/sound/soc/soc-topology.c
--- 2/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@@ -549,9 -549,7 +549,8 @@@ static void remove_link(struct snd_soc_
                dobj->ops->link_unload(comp, dobj);
  
        list_del(&dobj->list);
- 
 -      snd_soc_remove_dai_link(comp->card, link);
 +      snd_soc_remove_pcm_runtime(comp->card,
 +                      snd_soc_get_pcm_runtime(comp->card, link));
  
        kfree(link->name);
        kfree(link->stream_name);

diff --cc sound/soc/sof/intel/hda-dai.c
Simple merge

diff --cc sound/soc/sof/ipc.c
Simple merge