[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20250401112657.5df1001c@canb.auug.org.au>
Date: Tue, 1 Apr 2025 11:26:57 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Huacai Chen <chenhuacai@...ngson.cn>
Cc: Miguel Ojeda <ojeda@...nel.org>, Huacai Chen <chenhuacai@...nel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
Mailing List <linux-next@...r.kernel.org>, Thomas Weißschuh <linux@...ssschuh.net>, WANG Rui <wangrui@...ngson.cn>
Subject: Re: linux-next: manual merge of the rust tree with the loongarch
tree
Hi all,
On Mon, 31 Mar 2025 16:07:26 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> rust/Makefile
>
> between commit:
>
> 13c23cb4ed09 ("rust: Fix enabling Rust and building with GCC for LoongArch")
>
> from the loongarch tree and commit:
>
> 6b2dab17d6fa ("rust: pass correct target to bindgen on Usermode Linux")
>
> 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 rust/Makefile
> index 1750affda774,b9cc810764e9..000000000000
> --- a/rust/Makefile
> +++ b/rust/Makefile
> @@@ -251,8 -274,7 +279,9 @@@ bindgen_skip_c_flags := -mno-fp-ret-in-
> # Derived from `scripts/Makefile.clang`.
> BINDGEN_TARGET_x86 := x86_64-linux-gnu
> BINDGEN_TARGET_arm64 := aarch64-linux-gnu
> +BINDGEN_TARGET_arm := arm-linux-gnueabi
> +BINDGEN_TARGET_loongarch := loongarch64-linux-gnusf
> + BINDGEN_TARGET_um := $(BINDGEN_TARGET_$(SUBARCH))
> BINDGEN_TARGET := $(BINDGEN_TARGET_$(SRCARCH))
>
> # All warnings are inhibited since GCC builds are very experimental,
This is now a conflict between the loongarch tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists