From nobody Mon Apr 6 01:42:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE7D7ECAAA1 for ; Mon, 12 Sep 2022 05:42:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229597AbiILFmg (ORCPT ); Mon, 12 Sep 2022 01:42:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229531AbiILFmd (ORCPT ); Mon, 12 Sep 2022 01:42:33 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2326C1B7A0; Sun, 11 Sep 2022 22:42:31 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4MQwTq1Wf4z4xDK; Mon, 12 Sep 2022 15:42:23 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1662961345; bh=FUlwZvf0AqBJmNJhvyP/tZHWBYHMhvn55UsXTMROtKA=; h=Date:From:To:Cc:Subject:From; b=XOFU04HgE6VmS10QCnapoP+sQZHQifv4NkoMsiIR0g1c5gtEtEOWV/6CBHyrw0Yjq Ow9pfHEfUcVHjyp5s+lc8iDjxcYS3zp+M8VxmT5yixdx2QgN43iZiHBfYa6dg245Zm +LQr8ECnZDTtNgYnGP27q7Nx8wHzL0+1wRINquDyp5rINkHhbC9mfd/Az8Bo1CMtIC LEi+dCh2gEZObytpN4ByJTOK5yRiuyOG93gDH9nJDcSrbzVZPuhVU7ewxTuozCnTMZ 8PmgAXOhZeAFrfbgo+ELH3PzcnfSKf3M4w+5VdxXT16wnic2ATLvu889XZh7RblB+F s9qXC1hR02zAA== Date: Mon, 12 Sep 2022 15:42:19 +1000 From: Stephen Rothwell To: Mathieu Poirier , Joerg Roedel Cc: Joerg Roedel , Robin Murphy , Yicong Yang , Linux Kernel Mailing List , Linux Next Mailing List 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/IuiIRRo5jrrAH9ebJeOiukO Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 | ^~~~~~~~~~~~~~~~~~~ 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 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 Acked-by: Robin Murphy Acked-by: Yicong Yang --- 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 #include #include -#include #include #include #include --=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--