Merge tag 'iommu-v4.15-rc7' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jan 2018 00:17:16 +0000 (16:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jan 2018 00:17:16 +0000 (16:17 -0800)
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


Trivial merge