Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/smmu', 'x86/vt-d', 'x86/amd',...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/acpi/arm64/iort.c
Simple merge

diff --cc drivers/acpi/bus.c
Simple merge

diff --cc drivers/iommu/amd/init.c
Simple merge

diff --cc drivers/iommu/amd/iommu.c
Simple merge

diff --cc drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
Simple merge

diff --cc drivers/iommu/arm/arm-smmu/arm-smmu.c
Simple merge

diff --cc drivers/iommu/arm/arm-smmu/qcom_iommu.c
Simple merge

diff --cc drivers/iommu/dma-iommu.c
Simple merge

diff --cc drivers/iommu/intel/iommu.c
index be35284,be35284,be35284,be35284,76a58b8,be35284,2f7213f,be35284..a6a07d9
--- 1/drivers/iommu/intel/iommu.c
--- 2/drivers/iommu/intel/iommu.c
--- 3/drivers/iommu/intel/iommu.c
--- 4/drivers/iommu/intel/iommu.c
--- 5/drivers/iommu/intel/iommu.c
--- 6/drivers/iommu/intel/iommu.c
--- 7/drivers/iommu/intel/iommu.c
--- 8/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@@@@@@@@ -5392,26 -5392,26 -5392,26 -5392,26 -5429,19 -5392,26 -5389,26 -5392,26 +5426,19 @@@@@@@@@ intel_iommu_dev_has_feat(struct device 
        static int
        intel_iommu_dev_enable_feat(struct device *dev, enum iommu_dev_features feat)
        {
---- ---        if (feat == IOMMU_DEV_FEAT_AUX)
++++ +++        switch (feat) {
++++ +++        case IOMMU_DEV_FEAT_AUX:
                        return intel_iommu_enable_auxd(dev);
        
---- ---        if (feat == IOMMU_DEV_FEAT_IOPF)
++++ +++        case IOMMU_DEV_FEAT_IOPF:
                        return intel_iommu_dev_has_feat(dev, feat) ? 0 : -ENODEV;
        
---- ---        if (feat == IOMMU_DEV_FEAT_SVA) {
---- ---                struct device_domain_info *info = get_domain_info(dev);
---- - -
---- - -                if (!info)
---- - -                        return -EINVAL;
++++ +++        case IOMMU_DEV_FEAT_SVA:
++++ +++                return intel_iommu_enable_sva(dev);
        
      -                 if (!info)
      -                         return -EINVAL;
      - 
---- ---                if (!info->pasid_enabled || !info->pri_enabled || !info->ats_enabled)
---- ---                        return -EINVAL;
---- ---
---- ---                if (info->iommu->flags & VTD_FLAG_SVM_CAPABLE)
---- ---                        return 0;
++++ +++        default:
++++ +++                return -ENODEV;
                }
---- ---
---- ---        return -ENODEV;
        }
        
        static int

diff --cc drivers/iommu/rockchip-iommu.c
Simple merge

diff --cc drivers/iommu/virtio-iommu.c
Simple merge