Merge tag 'iommu-fixes-v3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 19:29:39 +0000 (04:29 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 19:29:39 +0000 (04:29 +0900)
commit989d216f86bbef47059c10aca77be9f56305a7ec
tree6552f72fe243814d70b3cd9aecb0ef2f1166eecd
parent677d1bb0cbcfc43d10e95ab0c28b9045a1de7b5b
parent2c16c9fdacbbf3bd8ff6390e12c5d28b3f2c78ac
Merge tag 'iommu-fixes-v3.15-rc5' of git://git./linux/kernel/git/joro/iommu

Pull iommu fixes from Joerg Roedel:
 "Three fixes for the AMD IOMMU driver:
   - fix a locking issue around get_user_pages()
   - fix two issues with device aliasing and exclusion range handling"

* tag 'iommu-fixes-v3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: fix enabling exclusion range for an exact device
  iommu/amd: Take mmap_sem when calling get_user_pages
  iommu/amd: Fix interrupt remapping for aliased devices