Merge branches 'iommu/api' and 'iommu/amd' into for-linus