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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 647D9C433EF for ; Tue, 12 Oct 2021 08:33:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42E746103E for ; Tue, 12 Oct 2021 08:33:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234831AbhJLIfw (ORCPT ); Tue, 12 Oct 2021 04:35:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:58466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234788AbhJLIfw (ORCPT ); Tue, 12 Oct 2021 04:35:52 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 07ADB60EE5; Tue, 12 Oct 2021 08:33:51 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1maDEL-00GCsN-6d; Tue, 12 Oct 2021 09:33:49 +0100 Date: Tue, 12 Oct 2021 09:33:48 +0100 Message-ID: <87ily2prpv.wl-maz@kernel.org> From: Marc Zyngier To: Stephen Rothwell , Lorenzo Pieralisi Cc: Joerg Roedel , Robin Murphy , Linux Kernel Mailing List , Linux Next Mailing List , Sven Peter Subject: Re: linux-next: build failure after merge of the iommu tree In-Reply-To: <20211012144639.0af3457c@canb.auug.org.au> References: <20211012144639.0af3457c@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: sfr@canb.auug.org.au, lorenzo.pieralisi@arm.com, joro@8bytes.org, robin.murphy@arm.com, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, sven@svenpeter.dev X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org [+ Sven] On Tue, 12 Oct 2021 04:46:39 +0100, Stephen Rothwell wrote: > > Hi all, > > After merging the iommu tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/iommu/apple-dart.c: In function 'apple_dart_get_resv_regions': > drivers/iommu/apple-dart.c:758:2: error: implicit declaration of function 'iommu_dma_get_resv_regions'; did you mean 'iommu_get_resv_regions'? [-Werror=implicit-function-declaration] > 758 | iommu_dma_get_resv_regions(dev, head); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > | iommu_get_resv_regions > cc1: all warnings being treated as errors > > Caused by commit > > b2b2781a9755 ("iommu/dart: Clean up IOVA cookie crumbs") > > interactig with commit > > 05dc551614a4 ("iommu/dart: Exclude MSI doorbell from PCIe device IOVA range") > > from the pci tree. > > I have applied the following merge fix patch. > > From: Stephen Rothwell > Date: Tue, 12 Oct 2021 14:40:49 +1100 > Subject: [PATCH] fix for "iommu/dart: Exclude MSI doorbell from PCIe device > IOVA range" > > Signed-off-by: Stephen Rothwell > --- > drivers/iommu/apple-dart.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c > index 912be9b7669c..280ff8df728d 100644 > --- a/drivers/iommu/apple-dart.c > +++ b/drivers/iommu/apple-dart.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > #include > #include > #include Thanks for fixing this. Lorenzo, do you mind slapping this on top of the Apple PCIe series? Thanks, M. -- Without deviation from the norm, progress is not possible.