From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Aug 2019 18:16:04 +0000 (-0700)
Subject: Merge tag 'drm-fixes-2019-08-24' of git://anongit.freedesktop.org/drm/drm
X-Git-Tag: v5.3-rc6~16
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=bc67b17eb91ea6a2b6d943bb64cde8d1438a11ec

Merge tag 'drm-fixes-2019-08-24' of git://anongit.freedesktop.org/drm/drm

Pull more drm fixes from Dave Airlie:
 "Although the tree built for me fine on arm here, it appears either
  header cleanups in next or some kconfig combo it breaks, so this
  contains a fix to mediatek to include dma-mapping.h explicitly.

  There was also one nouveau fix that came in late that I was going to
  leave until next week, but since I was sending this I thought it may
  as well be in here:

  mediatek:
   - fix build in some cases

  nouveau:
   - fix hang with i2c and mst docks"

* tag 'drm-fixes-2019-08-24' of git://anongit.freedesktop.org/drm/drm:
  drm/mediatek: include dma-mapping header
  drm/nouveau: Don't retry infinitely when receiving no data on i2c over AUX
---

bc67b17eb91ea6a2b6d943bb64cde8d1438a11ec