From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFDE2C07E9D for ; Mon, 26 Sep 2022 23:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230327AbiIZXNC (ORCPT ); Mon, 26 Sep 2022 19:13:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230298AbiIZXM7 (ORCPT ); Mon, 26 Sep 2022 19:12:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3512DABF36; Mon, 26 Sep 2022 16:12:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AD9BD614B9; Mon, 26 Sep 2022 23:12:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8218C433D6; Mon, 26 Sep 2022 23:12:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664233978; bh=i+4cYWvvbX6eB0hVVJ0oMScoDAoRVCjurrZ2ldB88mI=; h=From:To:Cc:Subject:Date:From; b=EXll/xeeQCl+YhmYZ6UqxFaW/iha5aafiybSf8zR9XSfb+TYeKvsKHt0v35nZDvrf pKzPxYe/iRJ299NKHCGS40Cj6wVGkQ/hq49Pu9X0MrSJTppWoE1hEYGU9CZ9HtBdMs rGbjCMzhKZR+j/+0QeI+37zgIo3wgACx0tIS3fHTzZqJX9x22CxBJOVIq0EJzI+Fvr Bzk5+cfJuBgZj6i/C84k4DSrMAdBqteleTWMWKWbUGRQjsGoDwkWDPsocH8Erqen1N Q28/YGaWQaC6fJtTWEkHKGSjPgbM+QbHeHeKaidGwpJ6HIgw6WGeZl0ykOvQu3dzKe eUDfBo7qwcB3Q== From: broonie@kernel.org To: Miguel Ojeda Cc: Adam Bratschi-Kaye , Alex Gaynor , Antonio Terceiro , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Boqun Feng , Boris-Chengbiao Zhou , Daniel Xu , Dariusz Sosnowski , Douglas Su , Finn Behrens , Gary Guo , Linux Kernel Mailing List , Linux Next Mailing List , Martin Rodriguez Reboredo , Masahiro Yamada , Michael Ellerman , Miguel Ojeda , Nick Desaulniers , Sven Van Asbroeck , Wedson Almeida Filho Subject: linux-next: manual merge of the rust tree with the kbuild tree Date: Tue, 27 Sep 2022 00:12:46 +0100 Message-Id: <20220926231246.1140133-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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