linux-next: manual merge of the rust tree with the arm64 tree

linux-next: manual merge of the rust tree with the arm64 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]

Hi all,

Today's linux-next merge of the rust tree got a conflict in:

  rust/Makefile

between commit:

  f82811e22b48 ("rust: Refactor the build target to allow the use of builtin targets")

from the arm64 tree and commit:

  ecab4115c44c ("kbuild: mark `rustc` (and others) invocations as recursive")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc rust/Makefile
index fe045dbc701e,a78fcf4004b0..000000000000
--- a/rust/Makefile
+++ b/rust/Makefile
@@@ -435,11 -434,8 +435,11 @@@ $(obj)/core.o: private skip_clippy = 
  $(obj)/core.o: private skip_flags = -Dunreachable_pub
  $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym))
  $(obj)/core.o: private rustc_target_flags = $(core-cfgs)
 -$(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs scripts/target.json FORCE
 +$(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs FORCE
- 	$(call if_changed_dep,rustc_library)
+ 	+$(call if_changed_dep,rustc_library)
 +ifneq ($(or $(CONFIG_X86_64),$(CONFIG_LOONGARCH)),)
 +$(obj)/core.o: scripts/target.json
 +endif
  
  $(obj)/compiler_builtins.o: private rustc_objcopy = -w -W '__*'
  $(obj)/compiler_builtins.o: $(src)/compiler_builtins.rs $(obj)/core.o FORCE

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Miguel Ojeda]

On Fri, Mar 1, 2024 at 5:38 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (see below) and can carry the fix as necessary. This

The resolution looks good -- thanks!

Cheers,
Miguel

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1907 bytes --]

Hi all,

On Fri, 1 Mar 2024 15:38:07 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
> 
>   rust/Makefile
> 
> between commit:
> 
>   f82811e22b48 ("rust: Refactor the build target to allow the use of builtin targets")
> 
> from the arm64 tree and commit:
> 
>   ecab4115c44c ("kbuild: mark `rustc` (and others) invocations as recursive")
> 
> 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc rust/Makefile
> index fe045dbc701e,a78fcf4004b0..000000000000
> --- a/rust/Makefile
> +++ b/rust/Makefile
> @@@ -435,11 -434,8 +435,11 @@@ $(obj)/core.o: private skip_clippy = 
>   $(obj)/core.o: private skip_flags = -Dunreachable_pub
>   $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym))
>   $(obj)/core.o: private rustc_target_flags = $(core-cfgs)
>  -$(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs scripts/target.json FORCE
>  +$(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs FORCE
> - 	$(call if_changed_dep,rustc_library)
> + 	+$(call if_changed_dep,rustc_library)
>  +ifneq ($(or $(CONFIG_X86_64),$(CONFIG_LOONGARCH)),)
>  +$(obj)/core.o: scripts/target.json
>  +endif
>   
>   $(obj)/compiler_builtins.o: private rustc_objcopy = -w -W '__*'
>   $(obj)/compiler_builtins.o: $(src)/compiler_builtins.rs $(obj)/core.o FORCE

This is now a conflict between the arm64 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]