Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 28 Jul 2023 13:56:38 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jason Gunthorpe <jgg@nvidia.com>
Cc:     Jason Gunthorpe <jgg@ziepe.ca>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the iommufd tree with the iommufd-fixes
 tree
Message-ID: <20230728135638.2ac25a2b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/wCmSbf.q8uEVjUf2p9oTgGO";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/wCmSbf.q8uEVjUf2p9oTgGO
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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/iommuf=
d/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 iomm=
ufd_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);
 }
--=20
2.40.1

--=20
Cheers,
Stephen Rothwell

--Sig_/wCmSbf.q8uEVjUf2p9oTgGO
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTDPHYACgkQAVBC80lX
0Gy93wgAlJSA40kArB7lDC3p9+R+98gWNm1UGBL+gcK8V837qRfASKjialyoS1hW
HuciInTeSS3pmLxkX2CvaPrjSLIw2l+NemEKKVb4b3ZJV0P5g4qHwz2rjXKtEaau
lf/zpWWS7+2iMTWawAEeSck3pnZ3PeB+mLdtZ/80fLASaWyupzhmoFX8+ao1TgLX
4I87DjXqvWjmPhvv9MmNo2Ce1qOz4EyEyHGUEKWttyVrcXQXI8pT45YKzazNI0h1
bhbb/Lk9KZxAqWo1hjoxP6saDP0uS8z8UQodO2p4grybzOIzrSorVsfobNskLIVH
4ePi9PI7tr7LP/uKZOzYp1y5deNr/Q==
=gjXK
-----END PGP SIGNATURE-----

--Sig_/wCmSbf.q8uEVjUf2p9oTgGO--