Re: linux-next: manual merge of the rust tree with the arm tree

[Stephen Rothwell]

Hi all,

On Thu, 27 Mar 2025 17:20:55 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> Today's linux-next merge of the rust tree got a conflict in:
> 
>   rust/Makefile
> 
> between commit:
> 
>   ccb8ce526807 ("ARM: 9441/1: rust: Enable Rust support for ARMv7")
> 
> from the arm 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 7f4b77de833f,b9cc810764e9..000000000000
> --- a/rust/Makefile
> +++ b/rust/Makefile
> @@@ -250,7 -274,7 +278,8 @@@ 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_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 arm tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpRWt8Mh1sh6.pgp
Description: OpenPGP digital signature