[Intel-gfx] linux-next: manual merge of the sound-asoc tree with the drm-misc tree

[Mark Brown]

On Wed, Oct 18, 2017 at 02:33:37PM +0000, Deucher, Alexander wrote:

Please fix your mail client to word wrap within paragraphs at something
substantially less than 80 columns.  Doing this makes your messages much
easier to read and reply to.

> Your conflict change affectively reverted 1e4448648333a which is what
> caused the problem.  It looks like Dave did not yet pull the request I
> made.  I can send another pull request, but you may run into the same
> issue if you resolve the conflict the same way again.  

OK...  I really wasn't expecting to see any conflicts at all TBH.  I'll
have a look tomorrow.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20171018/bb9b8550/attachment-0001.sig>