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=-2.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 27612C433DF for ; Mon, 18 May 2020 07:12:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0AF902070A for ; Mon, 18 May 2020 07:12:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726676AbgERHMo (ORCPT ); Mon, 18 May 2020 03:12:44 -0400 Received: from mx2.suse.de ([195.135.220.15]:51962 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726127AbgERHMo (ORCPT ); Mon, 18 May 2020 03:12:44 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 81EEEAC52; Mon, 18 May 2020 07:12:45 +0000 (UTC) Date: Mon, 18 May 2020 09:12:34 +0200 From: Borislav Petkov To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the tip tree with Linus' tree Message-ID: <20200518071234.GA24692@zn.tnic> References: <20200518151032.57d57052@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200518151032.57d57052@canb.auug.org.au> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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