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 1674DC43334 for ; Mon, 25 Jul 2022 08:41:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233175AbiGYIlS (ORCPT ); Mon, 25 Jul 2022 04:41:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232638AbiGYIlP (ORCPT ); Mon, 25 Jul 2022 04:41:15 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E649714015; Mon, 25 Jul 2022 01:41:13 -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 4Lrtmh42zWz4x1b; Mon, 25 Jul 2022 18:41:08 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1658738472; bh=Xc9z+OS9WFCSWiBpxnyLpLzjfFMk6Dpyc1CkrC8qqzQ=; h=Date:From:To:Cc:Subject:From; b=lDbwRiug68dau1djnwFjwbiFayGSvaT9R/6kuu8McwLNhF8bte7Ehe2OUrycFC5QT HsapBREIp41AQd+HWWOcomUUhZV3LsJY/hCSSV6X4pPfwvbzPSFstg0BMwD6AwfTZm WTe7vPvJQSR/+0d8PFRegkqDYQlQx9tNcxNg01eh30yP9wMP4uzmvzFZJml34NflfV e7dm0wlLq77frRq9y5gQ2BiP9lwFU+MHRzpVSr5A8KHltHbbZNilQQ1xOO/Bf1DKjZ V7Ncm+ukVOLjiOAqfsD2PCYrzEGbbpqfG4YKL8KUl1tzgJttY9R1epNDPOjjzfc9kl XxSiWppq5CmWA== Date: Mon, 25 Jul 2022 18:41:07 +1000 From: Stephen Rothwell To: Miguel Ojeda Cc: Adam Bratschi-Kaye , Alex Gaynor , Antonio Terceiro , Boqun Feng , Boris-Chengbiao Zhou , Daniel Xu , Dariusz Sosnowski , David Gow , Douglas Su , Finn Behrens , Gary Guo , Josh Poimboeuf , Linux Kernel Mailing List , Linux Next Mailing List , Michael Ellerman , Miguel Cano , Miguel Ojeda , Peter Zijlstra , Sven Van Asbroeck , Wedson Almeida Filho Subject: linux-next: manual merge of the rust tree with Linus' tree Message-ID: <20220725184107.429e33bf@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/_x9SLabwJlwQ/4l7UmTbugN"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/_x9SLabwJlwQ/4l7UmTbugN Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the rust tree got a conflict in: arch/x86/Makefile between commit: efc72a665a61 ("lkdtm: Disable return thunks in rodata.c") from Linus' tree and commit: 0ea4b9a1bece ("Kbuild: add Rust support") from the rust tree. I fixed it up (see below) 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 diff --cc arch/x86/Makefile index 7854685c5f25,5ac9b324751d..000000000000 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@@ -21,13 -21,8 +21,15 @@@ ifdef CONFIG_CC_IS_CLAN RETPOLINE_CFLAGS :=3D -mretpoline-external-thunk RETPOLINE_VDSO_CFLAGS :=3D -mretpoline endif + +ifdef CONFIG_RETHUNK +RETHUNK_CFLAGS :=3D -mfunction-return=3Dthunk-extern +RETPOLINE_CFLAGS +=3D $(RETHUNK_CFLAGS) +endif + + RETPOLINE_RUSTFLAGS :=3D -Ctarget-feature=3D+retpoline-external-thunk +=20 +export RETHUNK_CFLAGS export RETPOLINE_CFLAGS export RETPOLINE_VDSO_CFLAGS =20 --Sig_/_x9SLabwJlwQ/4l7UmTbugN Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLeVyMACgkQAVBC80lX 0Gwetgf/Y8wHZHNv6ZGH1fGxOuRPsltj4JJ1bcKWavRdnnqbfkZikSL4+9nrEo5A MR2uVFFVpq1KQnKryTvRRvxnZil3Ll7Lp6YczbiGSgJSH2LBx3D9lJNTA+kM8Cdo UVl3vCs3Bv32UvS664WxvHVut2TW5eUH4kSAKRi98Xs59nGtY2j0eNQz42pNRzIB qsi39bGkzRsNkbqayKBb4XPHRpuQQk4SfsA3Vc0AlGeL3xiq3sKdgzLXxVQNRDAg 6PdvzENcTNkQwtXso/x+sQc8gt4lxUOOGGAQTWTor+YQVIzEmzKzi7NhlcdOyfT7 psN1c0nCT5lVfbTqUkEQYrINdMWXog== =hhbw -----END PGP SIGNATURE----- --Sig_/_x9SLabwJlwQ/4l7UmTbugN--