From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Oct 2017 18:49:38 +0000 (-0700)
Subject: Merge tag 'iommu-fixes-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc5~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=997301a860fca1a05ab8e383a8039b65f8abeb1e;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'iommu-fixes-v4.14-rc4' of git://git./linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:

 - keep an important data structure in the Exynos driver around after
   kernel-init to fix a kernel-oops

 - keep SWIOTLB enabled when SME is active in the AMD IOMMU driver

 - add a missing IOTLB sync to the AMD IOMMU driver

* tag 'iommu-fixes-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Finish TLB flush in amd_iommu_unmap()
  iommu/exynos: Remove initconst attribute to avoid potential kernel oops
  iommu/amd: Do not disable SWIOTLB if SME is active
---

997301a860fca1a05ab8e383a8039b65f8abeb1e