From patchwork Fri Oct 5 06:14:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 979319 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42RKJW0sxtz9s1c for ; Fri, 5 Oct 2018 16:16:11 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="bezn5lhl"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 42RKJV6Qg6zF3M7 for ; Fri, 5 Oct 2018 16:16:10 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="bezn5lhl"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 42RKG853wLzF3KQ for ; Fri, 5 Oct 2018 16:14:08 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="bezn5lhl"; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 42RKG83Bgfz9s1c; Fri, 5 Oct 2018 16:14:08 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1538720048; bh=jK0o3PtWZeLAF8khM/jrOtwToJhWv4Nn4c4dbxoOTZE=; h=Date:From:To:Cc:Subject:From; b=bezn5lhlwxyiQL9WaiGD2+TlBMM5fUFP4sUTkTc/eH/5JqXufFtjCAZE/7ihvxDF4 EQyolfr47hcoLXVXRVrSgai+KeTC8k4D63yCVPeBYNExoEnz4DZUro78XlzW4XD6Zw rRIxKVgRbTFi7Hq93Y3J78K/EghWdDC6o37rU7rO8SZsfG59QxLP2pApn3GLZw8QZP L9LwNvaEnqfw4cSFsBRhVGjVcQNiveXGvUujrAnncNqLDkmqQTYcLk9FfRi+lcQdbI 11m9mi5xYVw5GuVSXq3OumiHoBUw8Dvw+AECnQLH+gme/oSr6vzx1zhfHG/nfcb3oS bYDMicLHyw/rw== Date: Fri, 5 Oct 2018 16:14:06 +1000 From: Stephen Rothwell To: Andrew Morton , Michael Ellerman , Benjamin Herrenschmidt , PowerPC Subject: linux-next: build failure after merge of the akpm tree Message-ID: <20181005161406.73ef8727@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-Next Mailing List , Linux Kernel Mailing List Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi Andrew, After merging the akpm tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: arch/powerpc/kernel/setup-common.c:36:10: fatal error: linux/bootmem.h: No such file or directory #include ^~~~~~~~~~~~~~~~~ Caused by commit 49353a51a758 ("mm: remove include/linux/bootmem.h") interacting with commit d90fe2acd9b2 ("powerpc: Wire up memtest") from the powerpc tree. I applied the following patch for today: From: Stephen Rothwell Date: Fri, 5 Oct 2018 16:09:34 +1000 Subject: [PATCH] powerpc: fix up for removal of linux/bootmem.h Signed-off-by: Stephen Rothwell --- arch/powerpc/kernel/setup-common.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 2b56d1f30387..93ee3703b42f 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include