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:   Mon, 12 Sep 2022 15:42:19 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Mathieu Poirier <mathieu.poirier@linaro.org>,
        Joerg Roedel <joro@8bytes.org>
Cc:     Joerg Roedel <jroedel@suse.de>,
        Robin Murphy <robin.murphy@arm.com>,
        Yicong Yang <yangyicong@hisilicon.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the coresight tree
Message-ID: <20220912154219.162eb9d3@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/IuiIRRo5jrrAH9ebJeOiukO";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

After merging the coresight tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/hwtracing/ptt/hisi_ptt.c:13:10: fatal error: linux/dma-iommu.h: No =
such file or directory
   13 | #include <linux/dma-iommu.h>
      |          ^~~~~~~~~~~~~~~~~~~

Caused by commit

  ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSili=
con PCIe Tune and Trace device")

interacting with commit

  f2042ed21da7 ("iommu/dma: Make header private")

from the iommu tree.

Since the public interfaces in dna-iommu.h were moved to iommu.h, I have
applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Sep 2022 15:35:37 +1000
Subject: [PATCH] hwtracing: hihi_ptt: fix up for "iommu/dma: Make header pr=
ivate"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/hwtracing/ptt/hisi_ptt.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_=
ptt.c
index 666a0f14b6c4..5d5526aa60c4 100644
--- a/drivers/hwtracing/ptt/hisi_ptt.c
+++ b/drivers/hwtracing/ptt/hisi_ptt.c
@@ -10,7 +10,6 @@
 #include <linux/bitops.h>
 #include <linux/cpuhotplug.h>
 #include <linux/delay.h>
-#include <linux/dma-iommu.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/IuiIRRo5jrrAH9ebJeOiukO
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMexrsACgkQAVBC80lX
0GzZvQf+PVGBGB26JJw4JuUv5x9upExpqUgGD4aLhn4JlYfAqk7AGXx5KkmeAx99
bbzjfVX+BtgMqvSgmMayKW1UqDUlA7ALEV25QSiJGI0azxhDvr1McTrRMI+UmXal
MnR3OQCmtB2hai9uqWTIaTj4/31UFFHWT5d4Wu2YpoH2WuiQpkmjsqA0suELyasl
xqt7UU3Z3cirnoyJOH20VSj9JQFOkWlxdWzgAOLhipLs4TNMklM50W7oXOlQgePu
fyF3ywadH5pOvivALcvBqMKXa5ds4fvkhY/DjudLnVdeoclK2BIfA5WWuPDiE9YA
S2K5UX8nzRSvkzsZ9nIR1TGWrhshdA==
=Jhdr
-----END PGP SIGNATURE-----

--Sig_/IuiIRRo5jrrAH9ebJeOiukO--