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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 E3433C00449 for ; Fri, 5 Oct 2018 12:02:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8325920875 for ; Fri, 5 Oct 2018 12:02:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8325920875 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728387AbeJETBO (ORCPT ); Fri, 5 Oct 2018 15:01:14 -0400 Received: from ozlabs.org ([203.11.71.1]:52613 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728164AbeJETBO (ORCPT ); Fri, 5 Oct 2018 15:01:14 -0400 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 42RT0P4DZbz9s4s; Fri, 5 Oct 2018 22:02:45 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au From: Michael Ellerman To: Stephen Rothwell , Andrew Morton , Benjamin Herrenschmidt , PowerPC Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Christophe Leroy Subject: Re: linux-next: build failure after merge of the akpm tree In-Reply-To: <20181005161406.73ef8727@canb.auug.org.au> References: <20181005161406.73ef8727@canb.auug.org.au> Date: Fri, 05 Oct 2018 22:02:45 +1000 Message-ID: <87d0sok3dm.fsf@concordia.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell writes: > 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. Ah fudge, what are the chances we add a new include of bootmem.h just as Mike's removing bootmem. > 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 I could just apply that to my tree. memblock.h is where early_memtest() is actually defined anyway. cheers