diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-09 22:30:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-09 22:30:55 -0700 |
| commit | 179145e6312b1ccb1731841360d7fcaf2f4abc7a (patch) | |
| tree | 68108aa8d2d109a9ad4ab7c95bd9ccec7e727f0b /arch/mips/bcm63xx | |
| parent | c7a1aefc47cc17b754180a18f77f508f2f210d2c (diff) | |
| parent | d3e01c51598b2639a4830549058500e5f2ace86f (diff) | |
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 'arch/mips/bcm63xx')
0 files changed, 0 insertions, 0 deletions