On Mon, May 18, 2020 at 03:10:32PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> include/linux/compiler.h
>
> between commit:
>
> a9a3ed1eff36 ("x86: Fix early boot crash on gcc-10, third try")
>
> from Linus' tree and commit:
>
> f670269a42bf ("x86: Fix early boot crash on gcc-10, next try")
>
> from the tip tree.
That commit is gone in the meantime so you won't have the merge conflict
anymore once tip/master is regenerated.
Thx.
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG
Nürnberg
