diff options
| author | Linus Torvalds <[email protected]> | 2017-06-10 05:30:55 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-06-10 05:30:55 +0000 |
| commit | 179145e6312b1ccb1731841360d7fcaf2f4abc7a (patch) | |
| tree | 68108aa8d2d109a9ad4ab7c95bd9ccec7e727f0b /drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| parent | arm: dma-mapping: Reset the device's dma_ops (diff) | |
| download | kernel-179145e6312b1ccb1731841360d7fcaf2f4abc7a.tar.gz kernel-179145e6312b1ccb1731841360d7fcaf2f4abc7a.zip | |
Merge tag 'iommu-fixes-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel:
- another compile-fix for my header cleanup
- a couple of fixes for the recently merged IOMMU probe deferal code
- fixes for ACPI/IORT code necessary with IOMMU probe deferal
* tag 'iommu-fixes-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
arm: dma-mapping: Reset the device's dma_ops
ACPI/IORT: Move the check to get iommu_ops from translated fwspec
ARM: dma-mapping: Don't tear down third-party mappings
ACPI/IORT: Ignore all errors except EPROBE_DEFER
iommu/of: Ignore all errors except EPROBE_DEFER
iommu/of: Fix check for returning EPROBE_DEFER
iommu/dma: Fix function declaration
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c')
0 files changed, 0 insertions, 0 deletions