From: Robin Murphy <robin.murphy@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Joerg Roedel <joro@8bytes.org>
Cc: Joerg Roedel <jroedel@suse.de>,
Yicong Yang <yangyicong@hisilicon.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the coresight tree
Date: Mon, 12 Sep 2022 12:37:46 +0100 [thread overview]
Message-ID: <fc02df92-2092-d7c2-fed5-f9db26846c07@arm.com> (raw)
In-Reply-To: <20220912154219.162eb9d3@canb.auug.org.au>
On 2022-09-12 06:42, Stephen Rothwell wrote:
> 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 HiSilicon 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:
In fact it's not even using those interfaces anyway, so never had any
reason to include dma-iommu.h in the first place, and Mathieu can make
this fix in the Coresight tree as-is. FWIW,
Acked-by: Robin Murphy <robin.murphy@arm.com>
> 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 private"
>
> 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>
next prev parent reply other threads:[~2022-09-12 11:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-12 5:42 linux-next: build failure after merge of the coresight tree Stephen Rothwell
2022-09-12 11:37 ` Robin Murphy [this message]
2022-09-12 14:33 ` Mathieu Poirier
2022-09-12 15:14 ` Yicong Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fc02df92-2092-d7c2-fed5-f9db26846c07@arm.com \
--to=robin.murphy@arm.com \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=sfr@canb.auug.org.au \
--cc=yangyicong@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox