linux-kernel - Re: linux-next: build failure after merge of the coresight tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 12 Sep 2022 08:33:50 -0600
From:   Mathieu Poirier <mathieu.poirier@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Joerg Roedel <joro@...tes.org>, Joerg Roedel <jroedel@...e.de>,
        Robin Murphy <robin.murphy@....com>,
        Yicong Yang <yangyicong@...ilicon.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the coresight tree

On Sun, 11 Sept 2022 at 23:42, Stephen Rothwell <sfr@...b.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@...b.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@...b.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