Subject: linux-next: manual merge of the iommufd tree with the iommufd-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 28 Jul 2023 13:56:38 +1000

Hi all,

Today's linux-next merge of the iommufd tree got a conflict in:

  drivers/iommu/iommufd/device.c

between commit:

  99f98a7c0d69 ("iommufd: IOMMUFD_DESTROY should not increase the refcount")

from the iommufd-fixes tree and commits:

  91a2e17e243f ("iommufd: Replace the hwpt->devices list with iommufd_group")
  d03f1336fd91 ("iommufd: Move putting a hwpt to a helper function")

from the iommufd tree.

I fixed it up (I used the latter version of this file and added the
following merge fix patch) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

From: Stephen Rothwell <[email-masked]>
Date: Fri, 28 Jul 2023 13:52:56 +1000
Subject: [PATCH] fix for "iommufd: Move putting a hwpt to a helper function"

interacting with "iommufd: IOMMUFD_DESTROY should not increase the refcount"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/iommu/iommufd/iommufd_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h
index 5cba9107f873..cc3d534b0caf 100644
--- a/drivers/iommu/iommufd/iommufd_private.h
+++ b/drivers/iommu/iommufd/iommufd_private.h
@@ -280,7 +280,7 @@ static inline void iommufd_hw_pagetable_put(struct iommufd_ctx *ictx,
 {
 	lockdep_assert_not_held(&hwpt->ioas->mutex);
 	if (hwpt->auto_domain)
-		iommufd_object_destroy_user(ictx, &hwpt->obj);
+		iommufd_object_deref_user(ictx, &hwpt->obj);
 	else
 		refcount_dec(&hwpt->obj.users);
 }
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell