linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Thierry Escande <thierry.escande@collabora.com>
Subject: Re: linux-next: build failure after merge of the char-misc tree
Date: Wed, 12 Apr 2017 12:33:33 +0200	[thread overview]
Message-ID: <20170412103333.GD11657@kroah.com> (raw)
In-Reply-To: <20170412151859.38f188a2@canb.auug.org.au>

On Wed, Apr 12, 2017 at 03:18:59PM +1000, Stephen Rothwell wrote:
> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  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 <linux/dmi.h>
>  #include <linux/mm.h>
>  #include <asm/bios_ebda.h>
> -#include <asm/e820.h>
> +#include <asm/e820/api.h>
>  #include <linux/acpi.h>
>  
>  #include "memconsole.h"
> -- 
> 2.11.0

Thanks for the patch, I'll keep it around for when things get merged to
Linus if needed.

greg k-h

  reply	other threads:[~2017-04-12 10:33 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-12  5:18 linux-next: build failure after merge of the char-misc tree Stephen Rothwell
2017-04-12 10:33 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-06-26  4:25 Stephen Rothwell
2023-06-26  9:06 ` Greg KH
2022-05-20  9:46 Stephen Rothwell
2022-05-20 19:08 ` Greg KH
2022-06-12 17:23   ` Samuel Thibault
2022-02-25 20:40 broonie
2022-02-26 15:08 ` Greg KH
2022-03-01  5:14   ` Stephen Rothwell
2022-03-01 21:27     ` Greg KH
2021-10-27  4:48 Stephen Rothwell
2021-10-27  6:51 ` Greg KH
2020-07-27  8:08 Stephen Rothwell
2020-07-27  9:24 ` Greg KH
2020-07-27  9:28   ` Oded Gabbay
2020-07-27 10:05     ` Greg KH
2020-07-27 10:59       ` Oded Gabbay
2020-07-28  7:33   ` Stephen Rothwell
2020-07-28  7:53     ` Greg KH
2020-07-28  8:23       ` Stephen Rothwell
2020-07-28 17:17         ` Greg KH
2020-07-28 17:19           ` Greg KH
2020-07-29  9:55             ` Oded Gabbay
2020-05-04  1:46 Stephen Rothwell
2020-05-04  1:47 ` Stephen Rothwell
2020-05-04  7:14   ` Greg KH
     [not found]   ` <BYAPR02MB394115C2C80B1169D282A646B7A60@BYAPR02MB3941.namprd02.prod.outlook.com>
2020-05-04  7:31     ` Greg KH
2019-07-08  9:23 Stephen Rothwell
2019-07-12  0:44 ` Stephen Rothwell
2019-07-12  7:59   ` Greg KH
2017-03-20  2:44 Stephen Rothwell
2017-03-20 12:23 ` Arnd Bergmann
2017-03-21  0:18   ` Benjamin Herrenschmidt
2017-03-21  0:36     ` Cyril Bur
2017-03-21  2:58       ` Joel Stanley
2015-08-07  6:32 Stephen Rothwell
2015-05-27  5:52 Stephen Rothwell
2015-05-27  7:08 ` Winkler, Tomas
2015-05-27 12:36   ` Greg KH
2014-02-21  5:47 Stephen Rothwell
2014-02-26  6:47 ` Stephen Rothwell
2014-02-27  3:37   ` Greg KH
2014-02-27  5:48     ` Stephen Rothwell
2013-09-27  7:10 Stephen Rothwell
2013-09-28  1:04 ` Greg KH
2013-04-02  6:29 Stephen Rothwell
2013-04-02  6:49 ` Richard Weinberger
2013-03-26  4:18 Stephen Rothwell
2013-03-18  2:56 Stephen Rothwell
2013-03-18  8:58 ` Kurt Van Dijck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170412103333.GD11657@kroah.com \
    --to=greg@kroah.com \
    --cc=arnd@arndb.de \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    --cc=thierry.escande@collabora.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).