Re: linux-next: build failure after merge of the tip tree

Ingo Molnar
2020-09-03T03:51:19Z

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
>
> After merging the tip tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
>
> Caused by commit
>
> f670269a42bf ("x86: Fix early boot crash on gcc-10, next try")
>
> interacting with commit
>
> a9a3ed1eff36 ("x86: Fix early boot crash on gcc-10, third try")
>
> from Linus' tree (v5.7-rc6) - the automatic merge did not go well.
>
> I have added this patch for today (it removes the older version).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 3 Sep 2020 12:31:13 +1000
> Subject: [PATCH] merge fix for compiler.h

I've merged the old commit by mistake - it's removed now.

Thanks,

Ingo