Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 13 Jul 2022 20:34:09 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc:     Adam Bratschi-Kaye <ark.email@gmail.com>,
        Alex Gaynor <alex.gaynor@gmail.com>,
        Antonio Terceiro <antonio.terceiro@linaro.org>,
        Boqun Feng <boqun.feng@gmail.com>,
        Boris-Chengbiao Zhou <bobo1239@web.de>,
        Borislav Petkov <bp@suse.de>, Daniel Xu <dxu@dxuuu.xyz>,
        Dariusz Sosnowski <dsosnowski@dsosnowski.pl>,
        David Gow <davidgow@google.com>,
        Douglas Su <d0u9.su@outlook.com>, Finn Behrens <me@kloenk.de>,
        Gary Guo <gary@garyguo.net>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Miguel Cano <macanroj@gmail.com>,
        Miguel Ojeda <ojeda@kernel.org>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>,
        Sven Van Asbroeck <thesven73@gmail.com>,
        Wedson Almeida Filho <wedsonaf@google.com>
Subject: linux-next: manual merge of the rust tree with Linus' tree
Message-ID: <20220713203409.559c5464@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fNNaP+bU4aiB=S243ECecbo";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/fNNaP+bU4aiB=S243ECecbo
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:

  f43b9876e857 ("x86/retbleed: Add fine grained Kconfig knobs")

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 1f40dad30d50,5ac9b324751d..000000000000
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@@ -21,12 -21,8 +21,13 @@@ ifdef CONFIG_CC_IS_CLAN
  RETPOLINE_CFLAGS	:=3D -mretpoline-external-thunk
  RETPOLINE_VDSO_CFLAGS	:=3D -mretpoline
  endif
+ RETPOLINE_RUSTFLAGS	:=3D -Ctarget-feature=3D+retpoline-external-thunk
 =20
 +ifdef CONFIG_RETHUNK
 +RETHUNK_CFLAGS		:=3D -mfunction-return=3Dthunk-extern
 +RETPOLINE_CFLAGS	+=3D $(RETHUNK_CFLAGS)
 +endif
 +
  export RETPOLINE_CFLAGS
  export RETPOLINE_VDSO_CFLAGS
 =20

--Sig_/fNNaP+bU4aiB=S243ECecbo
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLOn6EACgkQAVBC80lX
0GxWbggApRFxsIZ5bbLd57tMBcT91GmCHHxjQXU+QhS6MfV8XfB1CHB7x8r/FhKh
3cPu9tusxUqBJ0cxzCWaNVGn3KoxtONylfQYaSWrGFYV142d8V7T5c/MAoCBmSX/
4JTkzLFVfipaB8k0CWk6XhQCtSQA6O1xlCkG230HU7k28I6Gmd7W/+FgkpD1GG11
qcPQSu8jaoXNNiX3Zed1zcIkpp1tOXx8CEj77Wk/pfmOUsPuZZwZJNByhR5gpxaY
fVhD0RJAnzXTl5ooGd+xj1NkH9Qi+dO8CufScGdBPdS1fZmwxYx0OQcZmQzerMgj
ewtxpiZBgEafxg8KKCYYF10EXXR+Gw==
=I9eX
-----END PGP SIGNATURE-----

--Sig_/fNNaP+bU4aiB=S243ECecbo--