From mboxrd@z Thu Jan 1 00:00:00 1970 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 0F9FFECAAA1 for ; Mon, 12 Sep 2022 11:37:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229640AbiILLhz (ORCPT ); Mon, 12 Sep 2022 07:37:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229598AbiILLhy (ORCPT ); Mon, 12 Sep 2022 07:37:54 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 86F4931229; Mon, 12 Sep 2022 04:37:53 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AA6F5113E; Mon, 12 Sep 2022 04:37:59 -0700 (PDT) Received: from [10.57.15.197] (unknown [10.57.15.197]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2A6583F71A; Mon, 12 Sep 2022 04:37:52 -0700 (PDT) Message-ID: Date: Mon, 12 Sep 2022 12:37:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Subject: Re: linux-next: build failure after merge of the coresight tree Content-Language: en-GB To: Stephen Rothwell , Mathieu Poirier , Joerg Roedel Cc: Joerg Roedel , Yicong Yang , Linux Kernel Mailing List , Linux Next Mailing List References: <20220912154219.162eb9d3@canb.auug.org.au> From: Robin Murphy In-Reply-To: <20220912154219.162eb9d3@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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 > | ^~~~~~~~~~~~~~~~~~~ > > 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 > From: Stephen Rothwell > 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 > --- > 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