From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Jan 2018 00:17:16 +0000 (-0800)
Subject: Merge tag 'iommu-v4.15-rc7' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v4.15-rc7~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=313243aa1a8c6e5ac8749338139d11ede860ae81;p=tomoyo%2Ftomoyo-test1.git

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
---

313243aa1a8c6e5ac8749338139d11ede860ae81