Merge branch 'for-linus' into for-next

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --cc MAINTAINERS
Simple merge

diff --cc sound/core/pcm_dmaengine.c
index 4f18511f1c92ea729731903bb4f85bf15d5ed584,cc5db93b9132cebfb1d7f341ec806af6a6b06e7a..b54336d4bffcb9d07332ae8067f2242cf11749e6
--- 1/sound/core/pcm_dmaengine.c
--- 2/sound/core/pcm_dmaengine.c
+++ b/sound/core/pcm_dmaengine.c
@@@ -349,8 -349,23 +349,18 @@@ int snd_dmaengine_pcm_open_request_chan
  }
  EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan);
  
 -/**
 - * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream
 - * @substream: PCM substream
 - *
 - * Return: 0 on success, a negative error code otherwise
 - */
 -int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream)
+ int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream)
+ {
+       struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
+ 
+       dmaengine_synchronize(prtd->dma_chan);
+ 
+       return 0;
+ }
+ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_sync_stop);
+ 
 +static void __snd_dmaengine_pcm_close(struct snd_pcm_substream *substream,
 +                                    bool release_channel)
  {
        struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
        struct dma_tx_state state;

diff --cc sound/pci/hda/patch_realtek.c
Simple merge