Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Wed, 25 Oct 2023 15:34:55 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jason Gunthorpe <jgg@nvidia.com>, Joerg Roedel <joro@8bytes.org>
Cc:     Jacob Pan <jacob.jun.pan@linux.intel.com>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        Jiapeng Chong <jiapeng.chong@linux.alibaba.com>,
        Joao Martins <joao.m.martins@oracle.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lu Baolu <baolu.lu@linux.intel.com>,
        Yi Liu <yi.l.liu@intel.com>
Subject: linux-next: manual merge of the iommufd tree with the iommu tree
Message-ID: <20231025153455.283c5b12@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/MPnDetDqs2Pu0DORcE=2QfW";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/MPnDetDqs2Pu0DORcE=2QfW
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/intel/pasid.c

between commit:

  c61c255e114c ("iommu/vt-d: Remove unused function")

from the iommu tree and commits:

  f35f22cc760e ("iommu/vt-d: Access/Dirty bit support for SS domains")
  cbf8b441ea08 ("iommu/vt-d: Add helper to setup pasid nested translation")

from the iommufd tree.

I fixed it up (the latter added a use of the function removed by
the former, so I just used the latter) 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/MPnDetDqs2Pu0DORcE=2QfW
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU4mu8ACgkQAVBC80lX
0GxsOQf/cDs5qODl+IFre4BTgsv113Iyu2EiWHVFwbLaTvnzKqWsaG1Csoy12oNY
rlwTk82QwXZI4pxdFph8l82GJQ48IiD4QZOJY0Em/eMglpdbD/jBbxaCayoR3Gm9
xBrA+s2BflRBg689AcDoe+PU6OA1Xo2k1LJmSjGM0sMZVhn1YuJWhHoLSJFnIio1
ysX5Kfc2XWH+AA5J3EJbeEgpdRsi+ZRRF98KNYNE9hCzS7/dApOU5U7JhddLCsHL
g23ruvCb+mMFkyeU1Sb7wXUOk24rsNgCRV1Jm0UkTepF8WULEhQKZ6gErj6jMCLK
/tY+ZPgE41jjLXl7u+PFw30GX0iO9g==
=zu5G
-----END PGP SIGNATURE-----

--Sig_/MPnDetDqs2Pu0DORcE=2QfW--