From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Jul 2015 21:44:22 +0000 (-0700)
Subject: Merge tag 'iommu-fixes-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro... 
X-Git-Tag: v4.14-rc1~5129
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44b061f77f70e21031444e3611dfddbb80b4defc;p=platform%2Fkernel%2Flinux-rpi.git

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

Pul IOMMU fixes from Joerg Roedel:
 "Four fixes have queued up to fix regressions introduced after v4.1:

   - Don't fail IOMMU driver initialization when the add_device
     call-back returns -ENODEV, as that just means that the device is
     not translated by the IOMMU.  This is pretty common on ARM.

   - Two fixes for the ARM-SMMU driver for a wrong feature check and to
     remove a redundant NULL check.

   - A fix for the AMD IOMMU driver to fix a boot panic on systems where
     the BIOS requests Unity Mappings in the IVRS table"

* tag 'iommu-fixes-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Introduce protection_domain_init() function
  iommu/arm-smmu: Delete an unnecessary check before the function call "free_io_pgtable_ops"
  iommu/arm-smmu: Fix broken ATOS check
  iommu: Ignore -ENODEV errors from add_device call-back
---

44b061f77f70e21031444e3611dfddbb80b4defc