diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-24 11:16:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-24 11:16:04 -0700 |
| commit | bc67b17eb91ea6a2b6d943bb64cde8d1438a11ec (patch) | |
| tree | a69457498720dc9bdd52dc7167d0ed6b0c2a1d8b /fs | |
| parent | 9140d8bdd4c5a04abe181bb300378355d56990a4 (diff) | |
| parent | 7837951a12fdaf88d2c51ff0757980c00072790c (diff) | |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions