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=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 8E682C433DF for ; Mon, 18 May 2020 05:10:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63C9020787 for ; Mon, 18 May 2020 05:10:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="sJ3rWW/L" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726730AbgERFKi (ORCPT ); Mon, 18 May 2020 01:10:38 -0400 Received: from ozlabs.org ([203.11.71.1]:49029 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726357AbgERFKh (ORCPT ); Mon, 18 May 2020 01:10:37 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49QRt13xznz9sT8; Mon, 18 May 2020 15:10:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1589778635; bh=0h3w57Pp77i8mUOcndIQfvFacVXTqrNwKoWe4NKKQxg=; h=Date:From:To:Cc:Subject:From; b=sJ3rWW/L/UbX2cR1Cz6ACQeAoIIItDnpRoqpJqixD0RxZ3PcP4gxcmCma3ZODQNYe S1X/yEdNPYkr56hFzhP925HpJCDx02XVce1TgXZfjjCTgp3CuTRg9Z2JRmYNim4dZp JQIY87Il+00+OMYEGcFdpq856MZjgSc3YTngYYWamhJFV5v/MZk+alqdZ8uskQIf8x P07U4+3UsKKLdSElcinLAdfZNcTPQUZCui1+YIdyl244i7UFGod+6zsYnN3YFzw+eB phnCswHaYlfMYhaa/MuGb2ai0YYgNWfge9i9LXiyDRdMdi3tiqi8AxVJ5evBP4xkgJ VAMdfj99IUtTA== Date: Mon, 18 May 2020 15:10:32 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux Next Mailing List , Linux Kernel Mailing List , Borislav Petkov Subject: linux-next: manual merge of the tip tree with Linus' tree Message-ID: <20200518151032.57d57052@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/H7u=8lRjpqON5EppSwhwCen"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/H7u=8lRjpqON5EppSwhwCen Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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. I fixed it up (I just used Linus' tree version) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell --Sig_/H7u=8lRjpqON5EppSwhwCen Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7CGMgACgkQAVBC80lX 0GzKywf/VUidhSnH61/iRzImozeV98/N0g6tdRRNMjHXAePrZsJkeJCu6XZ+RiFG WQzlL3xpo60BbtU1EfVo1GC3pXy1ubie9M5ofSa+iZJOCIpQHZBehpY+XfucL7AH KljNfBGYaJMoAHkGcabEahHxJSCgVRjlQvkdYI8oAQcHzUEV1sY0Mr+G3TZUYE5f sN7bcrI7mJwiBF2UyJw3LmTSosZ+xUxUQPZjoQaTKVFEcEHQLuT6dPANlc37z3Uo ph4fUp0t655i+Fvn4FR+RmSVz5n9dMdc0e6jyIKf4tGMrzKP9xQYzOI/BpjYZc1D V9XBmga7po16CVWqhgluJmIup25dJQ== =A0LR -----END PGP SIGNATURE----- --Sig_/H7u=8lRjpqON5EppSwhwCen--