linux-next: manual merge of the sound tree with the drm-intel tree

Hi Takashi, Today's linux-next merge of the sound tree got a conflict in: drivers/gpu/drm/i915/intel_audio.c between commit: 3c85f5027595 ("drm/i915: s/mode/adjusted_mode/ in functions that really get passed the adjusted_mode") from the drm-intel tree and commit: 7e8275c2f2bb

linux-next: manual merge of the sound tree with the drm-intel tree

Hi Takashi, Today's linux-next merge of the sound tree got a conflict in: drivers/gpu/drm/i915/intel_audio.c between commit: 3c85f5027595 ("drm/i915: s/mode/adjusted_mode/ in functions that really get passed the adjusted_mode") from the drm-intel tree and commit: 7e8275c2f2bb