Merge branch 'asoc-5.3' into asoc-next

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc sound/soc/generic/audio-graph-card.c
Simple merge

diff --cc sound/soc/intel/boards/sof_rt5682.c
index 90d262ebeb10b23f9e6656fb3cfc5c5d30efe44a,64db00353e187a9bbde3a5a70d3a08587c9b74a5..daeaa396d92817122df49dbb85616651ee4b931c
--- 1/sound/soc/intel/boards/sof_rt5682.c
--- 2/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@@ -491,10 -548,10 +548,10 @@@ static int sof_audio_probe(struct platf
        struct snd_soc_dai_link *dai_links;
        struct snd_soc_acpi_mach *mach;
        struct sof_card_private *ctx;
-       int dmic_num, hdmi_num;
+       int dmic_be_num, hdmi_num;
        int ret, ssp_amp, ssp_codec;
  
 -      ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_ATOMIC);
 +      ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
        if (!ctx)
                return -ENOMEM;
  

diff --cc sound/soc/intel/skylake/skl.c
Simple merge

diff --cc sound/soc/intel/skylake/skl.h
Simple merge

diff --cc sound/soc/qcom/common.c
Simple merge

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

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

diff --cc sound/soc/ti/davinci-mcasp.c
Simple merge