Subject: linux-next: manual merge of the rust tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 25 Jul 2022 18:41:07 +1000

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.

-- 
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	:= -mretpoline-external-thunk
  RETPOLINE_VDSO_CFLAGS	:= -mretpoline
  endif
 +
 +ifdef CONFIG_RETHUNK
 +RETHUNK_CFLAGS		:= -mfunction-return=thunk-extern
 +RETPOLINE_CFLAGS	+= $(RETHUNK_CFLAGS)
 +endif
 +
+ RETPOLINE_RUSTFLAGS	:= -Ctarget-feature=+retpoline-external-thunk
+ 
 +export RETHUNK_CFLAGS
  export RETPOLINE_CFLAGS
  export RETPOLINE_VDSO_CFLAGS