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
Date: Wed, 13 Jul 2022 20:34:09 +1000 [thread overview]
Message-ID: <20220713203409.559c5464@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]
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.
--
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 := -mretpoline-external-thunk
RETPOLINE_VDSO_CFLAGS := -mretpoline
endif
+ RETPOLINE_RUSTFLAGS := -Ctarget-feature=+retpoline-external-thunk
+ifdef CONFIG_RETHUNK
+RETHUNK_CFLAGS := -mfunction-return=thunk-extern
+RETPOLINE_CFLAGS += $(RETHUNK_CFLAGS)
+endif
+
export RETPOLINE_CFLAGS
export RETPOLINE_VDSO_CFLAGS
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-07-13 10:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-13 10:34 Stephen Rothwell [this message]
2022-07-13 10:50 ` linux-next: manual merge of the rust tree with Linus' tree Miguel Ojeda
2022-07-13 11:39 ` Peter Zijlstra
2022-07-15 1:13 ` Miguel Ojeda
2022-07-15 9:01 ` Peter Zijlstra
2022-07-15 11:01 ` Miguel Ojeda
-- strict thread matches above, loose matches on Subject: below --
2022-10-04 8:05 Stephen Rothwell
2022-09-12 7:24 Stephen Rothwell
2022-07-25 8:41 Stephen Rothwell
2022-07-25 8:52 ` Miguel Ojeda
2021-12-10 18:18 broonie
2021-11-03 3:19 Stephen Rothwell
2021-11-03 10:30 ` Miguel Ojeda
2021-11-03 21:01 ` Stephen Rothwell
2021-11-04 12:19 ` Miguel Ojeda
2021-11-04 20:31 ` Stephen Rothwell
2021-11-05 11:00 ` Miguel Ojeda
2021-07-19 6:16 Stephen Rothwell
2021-07-12 0:37 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220713203409.559c5464@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alex.gaynor@gmail.com \
--cc=antonio.terceiro@linaro.org \
--cc=ark.email@gmail.com \
--cc=bobo1239@web.de \
--cc=boqun.feng@gmail.com \
--cc=bp@suse.de \
--cc=d0u9.su@outlook.com \
--cc=davidgow@google.com \
--cc=dsosnowski@dsosnowski.pl \
--cc=dxu@dxuuu.xyz \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=macanroj@gmail.com \
--cc=me@kloenk.de \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=mpe@ellerman.id.au \
--cc=ojeda@kernel.org \
--cc=peterz@infradead.org \
--cc=thesven73@gmail.com \
--cc=wedsonaf@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).