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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB654C433EF for ; Mon, 23 May 2022 04:24:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233803AbiEWEYj (ORCPT ); Mon, 23 May 2022 00:24:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229595AbiEWEYh (ORCPT ); Mon, 23 May 2022 00:24:37 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94486236; Sun, 22 May 2022 21:24:36 -0700 (PDT) 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 4L643j53gWz4xXg; Mon, 23 May 2022 14:24:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1653279874; bh=hszSGSEAWYFbEEGQMO1SFV7XS8z86K6y58+ZDF+bDu0=; h=Date:From:To:Cc:Subject:From; b=dcJSr6zm3JToIwAOPBc0mCrU3K7XFQzdmKbEy7CYTfBlx2u2vXXuUwvuMObh3hFuv ByzKZC87h9K9qQtnXppHuay9emJYbgilNO2hubbfEK8iy9QyAcrdQpsDwoRkvoT80P muXV+HJBFy2p+Ni9zTz5PMKt+fZghho0fy9FqnI8yVl/+f4RGwQ+dcazMgI4YJ4vFG DBres6aKVr66Z1jz8rQsVIwvbLVyrVN8BSbnIYUDILXLmbTC5SslEhJPAww3bR6cvo Cro7+v2YAr7YzSPUTJcoG/DSnsHI5LmuB28OQiEZPYIlTTV6hM09y0NRrRELgPuiWd 3pqwficJKYx5Q== Date: Mon, 23 May 2022 14:24:31 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Josh Poimboeuf , Linux Kernel Mailing List , Linux Next Mailing List , Masahiro Yamada Subject: linux-next: manual merge of the tip tree with the kbuild tree Message-ID: <20220523142431.10ff2f77@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/eB6BtpQ0AHS=obKOXHznCjx"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/eB6BtpQ0AHS=obKOXHznCjx 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: scripts/Makefile.build between commit: 0212301af7bb ("kbuild: do not create *.prelink.o for Clang LTO or IBT") from the kbuild tree and commit: 753da4179d08 ("objtool: Remove --lto and --vmlinux in favor of --link") from the tip tree. I am not sure if I fixed this up correctly, please check the final result when linux-next is released. I fixed it up (I used the former 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_/eB6BtpQ0AHS=obKOXHznCjx Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKLDH8ACgkQAVBC80lX 0GwdTAf/c6FzAJfisb6g7dTTTyHS/8MuDFYYhhSiHl9naP8p8QU+GyZMzUSFU7Ru sYGotjAHR3V8h/zG4ogT3KN7NLTcFMdS7Iy1BE3QMNZ4YeyUOk6WcdZmnBoWFq3s nBd7JfANZCe5clge10zqcRBKS49vrggFYqEeyBvNZn4JFxMdgRqvToOdykUegOXq 8gR/ynGFnYXjl0vkwyTmXTxaKrlJYn2U/2h1oFXbOqci9Tbme54y1UlYXM9lOWRt 0RLGXHQ0RffU7HH/PE3V99AkUaeFTQefYazE3n8lgH0wq+DbSxYoEX30C+aLL0N1 +nC4n0GG9aVs6/3JkS76RxyjkUXquw== =sdy5 -----END PGP SIGNATURE----- --Sig_/eB6BtpQ0AHS=obKOXHznCjx--