From: Will Deacon <will@kernel.org>
Date: Fri, 12 Jul 2024 15:57:42 +0000 (+0100)
Subject: Merge branch 'iommu/iommufd/attach-handles' into iommu/next
X-Git-Tag: v6.11-rc1~115^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74e54d532b59c7a4375205d498c68634e0cf43b2;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'iommu/iommufd/attach-handles' into iommu/next

* iommu/iommufd/attach-handles:
  iommu: Extend domain attach group with handle support
  iommu: Add attach handle to struct iopf_group
  iommu: Remove sva handle list
  iommu: Introduce domain attachment handle
---

74e54d532b59c7a4375205d498c68634e0cf43b2
diff --cc include/linux/iommu.h
index 5c72c4cbb178e,910aec80886e1..60194d38343a8
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@@ -1000,12 -1016,13 +1014,11 @@@ struct iommu_sva 
  struct iommu_mm_data {
  	u32			pasid;
  	struct list_head	sva_domains;
- 	struct list_head	sva_handles;
  };
  
 -int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode,
 -		      const struct iommu_ops *ops);
 +int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode);
  void iommu_fwspec_free(struct device *dev);
  int iommu_fwspec_add_ids(struct device *dev, const u32 *ids, int num_ids);
 -const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode);
  
  static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev)
  {