From patchwork Tue Oct 6 03:58:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 268067 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD733C46466 for ; Tue, 6 Oct 2020 03:59:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A5EE208B6 for ; Tue, 6 Oct 2020 03:59:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="h1C2vyTY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727008AbgJFD6w (ORCPT ); Mon, 5 Oct 2020 23:58:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725977AbgJFD6w (ORCPT ); Mon, 5 Oct 2020 23:58:52 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29761C0613CE; Mon, 5 Oct 2020 20:58:52 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4C53c84q97z9sTK; Tue, 6 Oct 2020 14:58:48 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1601956729; bh=iWcvZufCX12F8E6C2qQJJzj37lQzvnAo1HzQn3tI6Ew=; h=Date:From:To:Cc:Subject:From; b=h1C2vyTYHFhG9P8BBJmDM+h1xGcNLnZ0P7V3xKT9tvwjUTT38XCZ1Gmw5m9lJjIUW copf6yKlgRQHc27VuadxJurUby8Mj+Rh4zIJxU3EbJ6S2Tm2onh3H0U0Hqpg0mNw+z BfbhONNi0D0vBXUAm6FwVqf1EFshQgRjg0Dw5KmqvlvlRm2ZteAAd++I69rDiLQLdu LKJBzogripmKTFMUa6lZ8vANjB5ChX0soViCHtUrLjvlX0clF0CTfhBZ1NbvO4Ezki styUDI1nkKH4a1wTYhURh0u9iyEj/wp4GrMmJigpTI1CL4roWRquQUImB5kz7Hky1g Pd9IPaEG1IzkQ== Date: Tue, 6 Oct 2020 14:58:47 +1100 From: Stephen Rothwell To: David Miller , Networking , Christoph Hellwig Cc: Linux Kernel Mailing List , Linux Next Mailing List , Daniel Borkmann , Magnus Karlsson Subject: linux-next: build failure after merge of the net-next tree Message-ID: <20201006145847.14093e47@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, After merging the net-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: net/xdp/xsk_buff_pool.c:7:10: fatal error: linux/dma-noncoherent.h: No such file or directory 7 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~ Caused by commit 1c1efc2af158 ("xsk: Create and free buffer pool independently from umem") interacting with commit a3cf77774abf ("dma-mapping: merge into ") from the dma-mapping tree. I have applied teh following merge fix patch. From: Stephen Rothwell Date: Tue, 6 Oct 2020 14:53:30 +1100 Subject: [PATCH] xsk: fix up for "dma-mapping: merge into " Signed-off-by: Stephen Rothwell --- net/xdp/xsk_buff_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c index e63fadd000db..dbed16648607 100644 --- a/net/xdp/xsk_buff_pool.c +++ b/net/xdp/xsk_buff_pool.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include "xsk_queue.h"