diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-02-07 10:36:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-02-07 10:36:47 +1000 |
| commit | 78eb1ca47589f0cd9db2ceb28b60434e8d512131 (patch) | |
| tree | d3bd7737415f9748937ea869b4aca249cbb29727 /drivers/nfc/Makefile | |
| parent | 8628752d0c97c0b4d0406c39e313a30db950eba6 (diff) | |
| parent | 9ddac734aa310c5fbc0ec93602335d2a39092451 (diff) | |
| download | linux-78eb1ca47589f0cd9db2ceb28b60434e8d512131.tar.bz2 | |
Merge branch 'vmwgfx-fixes-5.0-2' of git://people.freedesktop.org/~thomash/linux into drm-fixes
A patch set from Christoph for vmwgfx dma mode detection breakage with the
new dma code restructuring in 5.0
A couple of fixes also CC'd stable
Finally an improved IOMMU detection that automatically enables dma mapping
also with other vIOMMUS than the intel one if present and enabled.
Currently trying to start a VM in that case would fail catastrophically.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190206194735.4663-1-thellstrom@vmware.com
Diffstat (limited to 'drivers/nfc/Makefile')
0 files changed, 0 insertions, 0 deletions