Merge branch 'asoc-4.18' into asoc-linus

diff --cc sound/soc/codecs/hdmi-codec.c
Simple merge

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

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

diff --cc sound/soc/sh/rcar/ssi.c
Simple merge

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