Merge branch 'asoc-5.1' into asoc-5.2

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

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

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

diff --cc sound/soc/stm/stm32_i2s.c
Simple merge

diff --cc sound/soc/stm/stm32_sai_sub.c
Simple merge