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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C0AFC4332F for ; Thu, 28 Oct 2021 09:09:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24404610C7 for ; Thu, 28 Oct 2021 09:09:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230060AbhJ1JL7 (ORCPT ); Thu, 28 Oct 2021 05:11:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229626AbhJ1JL6 (ORCPT ); Thu, 28 Oct 2021 05:11:58 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee2:21ea]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBCC8C061570; Thu, 28 Oct 2021 02:09:31 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Hg09y6rtTz4xcC; Thu, 28 Oct 2021 20:09:26 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1635412170; bh=6bxZMa6u3BdmZNcWDX7MjL0GNbyqtdo/SRu92As+UL8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=hG3JmjhWcSB4EDi4Xu/QR5Tt6PY/1DrDw866wpE3S/pNzUfAjEMtxtmfnG+M6v4EM YP62Kxpl5SeM5fjMy8yyPz6nJwJxKWEtJ6vbbrN1MlWnuXR3LEtpOqVgkyu76wFUv2 rQq4MDBMefCm+2CO8+bCe7k0dR/ND5zOCY3RYCkNqwOBV7XSaGhxlFe74ChZIprNFx PLndJv2nnFE83pVkiksk4sclFxafYnis1QesBSHeGLYsijZ9VZiPOb7fhSneawIs9G iEPcfHkmvebuZgAtDU/eEbO1pXSz+983PQnjryYUqkb4F9P6s/mm5CjOq7Gqn44a+Y vzXUlFO/5/Vkg== Date: Thu, 28 Oct 2021 20:09:25 +1100 From: Stephen Rothwell To: Miguel Ojeda , Masahiro Yamada Cc: Adam Bratschi-Kaye , Alex Gaynor , Ayaan Zaidi , Boqun Feng , Boris-Chengbiao Zhou , Douglas Su , Finn Behrens , Fox Chen , Gary Guo , Geoffrey Thomas , Linux Kernel Mailing List , Linux Next Mailing List , Michael Ellerman , Miguel Ojeda , Sumera Priyadarsini , Sven Van Asbroeck , Wedson Almeida Filho , Yuki Okushi Subject: Re: linux-next: manual merge of the rust tree with the kbuild tree Message-ID: <20211028200925.64f16df2@canb.auug.org.au> In-Reply-To: <20211015182404.0355bef6@canb.auug.org.au> References: <20211015182404.0355bef6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/vvi=bl.Rr0pN0CqAV8ZNVTF"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/vvi=bl.Rr0pN0CqAV8ZNVTF Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Fri, 15 Oct 2021 18:24:04 +1100 Stephen Rothwell = wrote: > > Today's linux-next merge of the rust tree got a conflict in: >=20 > Makefile >=20 > between commit: >=20 > 09708df61f2b ("kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug= ") >=20 > from the kbuild tree and commit: >=20 > dc08d49444e9 ("Kbuild: add Rust support") >=20 > from the rust tree. >=20 > I fixed it up (I used the Makefile conflicting part from the former and > applied the patch 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. The fixup patch now looks like this: From: Stephen Rothwell Date: Fri, 15 Oct 2021 18:16:09 +1100 Subject: [PATCH] Kbuild: fix for "kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug" Signed-off-by: Stephen Rothwell --- scripts/Makefile.debug | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/Makefile.debug b/scripts/Makefile.debug index 9f39b0130551..c664af3ccc6b 100644 --- a/scripts/Makefile.debug +++ b/scripts/Makefile.debug @@ -1,4 +1,5 @@ DEBUG_CFLAGS :=3D +DEBUG_RUSTFLAGS :=3D =20 ifdef CONFIG_DEBUG_INFO_SPLIT DEBUG_CFLAGS +=3D -gsplit-dwarf @@ -10,6 +11,12 @@ ifndef CONFIG_AS_IS_LLVM KBUILD_AFLAGS +=3D -Wa,-gdwarf-2 endif =20 +ifdef CONFIG_DEBUG_INFO_REDUCED +DEBUG_RUSTFLAGS +=3D -Cdebuginfo=3D1 +else +DEBUG_RUSTFLAGS +=3D -Cdebuginfo=3D2 +endif + ifndef CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT dwarf-version-$(CONFIG_DEBUG_INFO_DWARF4) :=3D 4 dwarf-version-$(CONFIG_DEBUG_INFO_DWARF5) :=3D 5 @@ -31,3 +38,6 @@ endif =20 KBUILD_CFLAGS +=3D $(DEBUG_CFLAGS) export DEBUG_CFLAGS + +KBUILD_RUSTFLAGS +=3D $(DEBUG_RUSTFLAGS) +export DEBUG_RUSTFLAGS --=20 2.33.0 --=20 Cheers, Stephen Rothwell --Sig_/vvi=bl.Rr0pN0CqAV8ZNVTF Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmF6aMUACgkQAVBC80lX 0Gwa0Qf+LZYWYOrgNlZxCXHxfx0/2s9nJjvXc+upbheQHszM6ho9nOolaMchN+RF h4lA7IeYvbvOArK5LM3wIxPAIb0vUTNooXrW2+u+NkSLEroUMfcSXfeLcxaD5Pd8 longZPyCobQ6lIEZXLXFe4q2cJP4Fj/1SJQccyCCXLgJ+rVHlljqRv1wZ041KXU8 jkcgEWIpOETLgKwIp/qSJah6EyTfFNwr6F1beE2BgGNhzjTkdFsI0t9+W8CTfa14 JRT3+FjEXmcPDSgAIpPZxTfkhppm9ZenlMp9a8F6WhPxNGVb/ym2seXyqTFGPBuc S0R/Div6hklj/wppqNzlKxZeW+tcoQ== =3618 -----END PGP SIGNATURE----- --Sig_/vvi=bl.Rr0pN0CqAV8ZNVTF--