| commit | 313243aa1a8c6e5ac8749338139d11ede860ae81 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 05 16:17:16 2018 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 05 16:17:16 2018 -0800 |
| tree | ddfa7df97639353c60a11655ad012a9dc45b01bc | |
| parent | f84d595a5b6e11620a56db6c1cf0988834e6eb5b [diff] | |
| parent | 563b5cbe334e9503ab2b234e279d500fc4f76018 [diff] |
Merge tag 'iommu-v4.15-rc7' of git://github.com/awilliam/linux-vfio Pull IOMMU fixes from Alex Williamson: "Fixes via Will Deacon for arm-smmu-v3. - Fix duplicate Stream ID handling in arm-smmu-v3 - Fix arm-smmu-v3 page table ops double free" * tag 'iommu-v4.15-rc7' of git://github.com/awilliam/linux-vfio: iommu/arm-smmu-v3: Cope with duplicated Stream IDs iommu/arm-smmu-v3: Don't free page table ops twice