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
| ||
|
Date: Tue, 27 Sep 2022 00:12:46 +0100 From: broonie@...nel.org 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>, Björn Roy Baron <bjorn3_gh@...tonmail.com>, Boqun Feng <boqun.feng@...il.com>, Boris-Chengbiao Zhou <bobo1239@....de>, Daniel Xu <dxu@...uu.xyz>, Dariusz Sosnowski <dsosnowski@...snowski.pl>, Douglas Su <d0u9.su@...look.com>, Finn Behrens <me@...enk.de>, Gary Guo <gary@...yguo.net>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, Martin Rodriguez Reboredo <yakoyoku@...il.com>, Masahiro Yamada <masahiroy@...nel.org>, Michael Ellerman <mpe@...erman.id.au>, Miguel Ojeda <ojeda@...nel.org>, Nick Desaulniers <ndesaulniers@...gle.com>, Sven Van Asbroeck <thesven73@...il.com>, Wedson Almeida Filho <wedsonaf@...gle.com> Subject: linux-next: manual merge of the rust tree with the kbuild tree Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the rust tree got a conflict in: Makefile between commit: a6036a41bffba ("kbuild: drop support for CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3") from the kbuild tree and commit: 4f6a738b5c348 ("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. diff --cc Makefile index 2dba99828e893,a105cb893b4ca..0000000000000 --- a/Makefile +++ b/Makefile @@@ -757,10 -819,20 +821,17 @@@ KBUILD_CFLAGS += $(call cc-disable-warn ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE KBUILD_CFLAGS += -O2 + KBUILD_RUSTFLAGS += -Copt-level=2 -else ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3 -KBUILD_CFLAGS += -O3 -KBUILD_RUSTFLAGS += -Copt-level=3 else ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE KBUILD_CFLAGS += -Os + KBUILD_RUSTFLAGS += -Copt-level=s endif
Powered by blists - more mailing lists