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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220725184107.429e33bf@canb.auug.org.au>
Date:   Mon, 25 Jul 2022 18:41:07 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
Cc:     Adam Bratschi-Kaye <ark.email@...il.com>,
        Alex Gaynor <alex.gaynor@...il.com>,
        Antonio Terceiro <antonio.terceiro@...aro.org>,
        Boqun Feng <boqun.feng@...il.com>,
        Boris-Chengbiao Zhou <bobo1239@....de>,
        Daniel Xu <dxu@...uu.xyz>,
        Dariusz Sosnowski <dsosnowski@...snowski.pl>,
        David Gow <davidgow@...gle.com>,
        Douglas Su <d0u9.su@...look.com>, Finn Behrens <me@...enk.de>,
        Gary Guo <gary@...yguo.net>,
        Josh Poimboeuf <jpoimboe@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michael Ellerman <mpe@...erman.id.au>,
        Miguel Cano <macanroj@...il.com>,
        Miguel Ojeda <ojeda@...nel.org>,
        Peter Zijlstra <peterz@...radead.org>,
        Sven Van Asbroeck <thesven73@...il.com>,
        Wedson Almeida Filho <wedsonaf@...gle.com>
Subject: linux-next: manual merge of the rust tree with Linus' tree

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
  

Content of type "application/pgp-signature" skipped