linux-next: merge conflict between drm-misc and sound trees

[Stephen Rothwell]

Hi Takashi,

On Wed, 14 Mar 2018 08:37:12 +0100 Takashi Iwai <tiwai at suse.de> wrote:
>
> FYI, there was yet another fix over the relevant code, but the
> conflict resolution must be trivial as well.

OK, thanks as well.

-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20180314/845a013b/attachment.sig>