linux-next: manual merge of the sound-asoc tree with the tree

Hi all, Today's linux-next merge of the sound-asoc tree got a conflict in sound/soc/soc-compress.c between commit 2a99ef0fdb35 ("ASoC: compress: Add suport for DPCM into compressed audio") from the sound tree and commit 76063d340520 ("ASoC: compress: Add suport for DPCM into compressed audio") fro

linux-next: manual merge of the sound-asoc tree with the tree

Hi all, Today's linux-next merge of the sound-asoc tree got a conflict in sound/soc/fsl/fsl_ssi.c between commit 0da9e55e71bc ("ASoC: fsl_ssi: Add dual fifo mode support") from the slave-dma tree and commit c1953bfe1329 ("ASoC: fsl-ssi: Add imx51-ssi and of_device_id matching") and 0888efd166fa ("