From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Jan 2016 20:56:23 +0000 (-0800)
Subject: Merge tag 'iommu-fixes-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.9.8~2979
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d8b0e79083d229829a408cd016dc4a038f637dd;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'iommu-fixes-v4.4-rc8' of git://git./linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:

 - Two build issues, one in the ipmmu-vmsa driver and one for the new
   generic dma-api implemention used on arm64

 - A performance fix for said dma-api implemention

 - An issue caused by a wrong offset in map_sg in the same code as above

* tag 'iommu-fixes-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/dma: Use correct offset in map_sg
  iommu/ipmmu-vmsa: Don't truncate ttbr if LPAE is not enabled
  iommu/dma: Avoid unlikely high-order allocations
  iommu/dma: Add some missing #includes
---

1d8b0e79083d229829a408cd016dc4a038f637dd