Merge branch 'for-linus' into for-next

The commit [7a2e9ddc: ALSA: usb-audio: Add native DSD support for
Denon/Marantz DACs] requires the new format definition that has
landed only in for-next branch.

diff --cc include/sound/pcm.h
Simple merge

diff --cc sound/core/pcm.c
index 8f624b7af0ca8dd5e5ad8f198729f838e6869cc5,c6ff94ab1ad65a883e5b969437d05afb837e1a02..cfc56c806964ed3a804f744c6297d6ea813b8fb2
--- 1/sound/core/pcm.c
--- 2/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@@ -216,12 -216,10 +216,14 @@@ static char *snd_pcm_format_names[] = 
        FORMAT(DSD_U8),
        FORMAT(DSD_U16_LE),
        FORMAT(DSD_U32_LE),
+       FORMAT(DSD_U16_BE),
+       FORMAT(DSD_U32_BE),
  };
  
 +/**
 + * snd_pcm_format_name - Return a name string for the given PCM format
 + * @format: PCM format
 + */
  const char *snd_pcm_format_name(snd_pcm_format_t format)
  {
        if ((__force unsigned int)format >= ARRAY_SIZE(snd_pcm_format_names))

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

diff --cc sound/usb/quirks.c
Simple merge