From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the char-misc tree Date: Wed, 12 Apr 2017 15:18:59 +1000 Message-ID: <20170412151859.38f188a2@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:32991 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899AbdDLFTC (ORCPT ); Wed, 12 Apr 2017 01:19:02 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Greg KH , Arnd Bergmann , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Thierry Escande Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/firmware/google/memconsole-x86-legacy.c:23:0: arch/x86/include/uapi/asm/e820.h:66:23: error: 'E820_X_MAX' undeclared here (not in a function) struct e820entry map[E820_X_MAX]; ^ Caused by commit afe9dba4f9ae ("firmware: google memconsole: Move specific EBDA parts") interacting with commit 66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h") from the tip tree. I applied the following merge fix patch: From: Stephen Rothwell Date: Wed, 12 Apr 2017 15:12:12 +1000 Subject: [PATCH] firmware: google memconsole: merge fix for e820.h move Signed-off-by: Stephen Rothwell --- drivers/firmware/google/memconsole-x86-legacy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/google/memconsole-x86-legacy.c b/drivers/firmware/google/memconsole-x86-legacy.c index 529078c62488..99df2749c4c5 100644 --- a/drivers/firmware/google/memconsole-x86-legacy.c +++ b/drivers/firmware/google/memconsole-x86-legacy.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "memconsole.h" -- 2.11.0 -- Cheers, Stephen Rothwell