* linux-next: build failure after merge of the coresight tree
@ 2022-09-12 5:42 Stephen Rothwell
2022-09-12 11:37 ` Robin Murphy
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stephen Rothwell @ 2022-09-12 5:42 UTC (permalink / raw)
To: Mathieu Poirier, Joerg Roedel
Cc: Joerg Roedel, Robin Murphy, Yicong Yang,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1424 bytes --]
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:
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>
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: linux-next: build failure after merge of the coresight tree
2022-09-12 5:42 linux-next: build failure after merge of the coresight tree Stephen Rothwell
@ 2022-09-12 11:37 ` Robin Murphy
2022-09-12 14:33 ` Mathieu Poirier
2022-09-12 15:14 ` Yicong Yang
2 siblings, 0 replies; 4+ messages in thread
From: Robin Murphy @ 2022-09-12 11:37 UTC (permalink / raw)
To: Stephen Rothwell, Mathieu Poirier, Joerg Roedel
Cc: Joerg Roedel, Yicong Yang, Linux Kernel Mailing List,
Linux Next Mailing List
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>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: build failure after merge of the coresight tree
2022-09-12 5:42 linux-next: build failure after merge of the coresight tree Stephen Rothwell
2022-09-12 11:37 ` Robin Murphy
@ 2022-09-12 14:33 ` Mathieu Poirier
2022-09-12 15:14 ` Yicong Yang
2 siblings, 0 replies; 4+ messages in thread
From: Mathieu Poirier @ 2022-09-12 14:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Joerg Roedel, Joerg Roedel, Robin Murphy, Yicong Yang,
Linux Kernel Mailing List, Linux Next Mailing List
On Sun, 11 Sept 2022 at 23:42, Stephen Rothwell <sfr@canb.auug.org.au> 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:
>
> 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(-)
Thanks for the leg work on this. I will apply this patch to the CS tree.
Mathieu
>
>
> 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>
> --
> 2.35.1
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: build failure after merge of the coresight tree
2022-09-12 5:42 linux-next: build failure after merge of the coresight tree Stephen Rothwell
2022-09-12 11:37 ` Robin Murphy
2022-09-12 14:33 ` Mathieu Poirier
@ 2022-09-12 15:14 ` Yicong Yang
2 siblings, 0 replies; 4+ messages in thread
From: Yicong Yang @ 2022-09-12 15:14 UTC (permalink / raw)
To: Stephen Rothwell, Mathieu Poirier, Joerg Roedel
Cc: Joerg Roedel, Robin Murphy, Yicong Yang,
Linux Kernel Mailing List, Linux Next Mailing List
On 9/12/2022 1:42 PM, 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:
>
> 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"
>
s/hihi_ptt/hisi_ptt
thanks for fixing this!
Acked-by: Yicong Yang <yangyicong@hisilicon.com>
> 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>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-12 15:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-12 5:42 linux-next: build failure after merge of the coresight tree Stephen Rothwell
2022-09-12 11:37 ` Robin Murphy
2022-09-12 14:33 ` Mathieu Poirier
2022-09-12 15:14 ` Yicong Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox