Hi all,

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

  rust/Makefile

between commit:

  e3de46f775ec ("rust: kbuild: skip `--remap-path-prefix` for `rustdoc`")

from the kbuild tree and commit:

  d7659acca7a3 ("rust: add pin-init crate build infrastructure")

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 089473a89d46,e761a8cc3bd5..000000000000
--- a/rust/Makefile
+++ b/rust/Makefile
@@@ -175,9 -199,9 +203,9 @@@ quiet_cmd_rustdoc_test_kernel = RUSTDO
  	rm -rf $(objtree)/$(obj)/test/doctests/kernel; \
  	mkdir -p $(objtree)/$(obj)/test/doctests/kernel; \
  	OBJTREE=$(abspath $(objtree)) \
 -	$(RUSTDOC) --test $(rust_flags) \
 +	$(RUSTDOC) --test $(filter-out --remap-path-prefix=%,$(rust_flags)) \
- 		-L$(objtree)/$(obj) --extern ffi --extern kernel \
- 		--extern build_error --extern macros \
+ 		-L$(objtree)/$(obj) --extern ffi --extern pin_init \
+ 		--extern kernel --extern build_error --extern macros \
  		--extern bindings --extern uapi \
  		--no-run --crate-name kernel -Zunstable-options \
  		--sysroot=/dev/null \

Hi all,

On Mon, 17 Mar 2025 20:38:06 +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:
> 
>   e3de46f775ec ("rust: kbuild: skip `--remap-path-prefix` for `rustdoc`")
> 
> from the kbuild tree and commit:
> 
>   d7659acca7a3 ("rust: add pin-init crate build infrastructure")
> 
> 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 089473a89d46,e761a8cc3bd5..000000000000
> --- a/rust/Makefile
> +++ b/rust/Makefile
> @@@ -175,9 -199,9 +203,9 @@@ quiet_cmd_rustdoc_test_kernel = RUSTDO
>   	rm -rf $(objtree)/$(obj)/test/doctests/kernel; \
>   	mkdir -p $(objtree)/$(obj)/test/doctests/kernel; \
>   	OBJTREE=$(abspath $(objtree)) \
>  -	$(RUSTDOC) --test $(rust_flags) \
>  +	$(RUSTDOC) --test $(filter-out --remap-path-prefix=%,$(rust_flags)) \
> - 		-L$(objtree)/$(obj) --extern ffi --extern kernel \
> - 		--extern build_error --extern macros \
> + 		-L$(objtree)/$(obj) --extern ffi --extern pin_init \
> + 		--extern kernel --extern build_error --extern macros \
>   		--extern bindings --extern uapi \
>   		--no-run --crate-name kernel -Zunstable-options \
>   		--sysroot=/dev/null \

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

-- 
Cheers,
Stephen Rothwell

On Mon, Mar 17, 2025 at 10:38 AM 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:
>
>   e3de46f775ec ("rust: kbuild: skip `--remap-path-prefix` for `rustdoc`")
>
> from the kbuild tree and commit:
>
>   d7659acca7a3 ("rust: add pin-init crate build infrastructure")
>
> 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.

Looks good to me, thanks!

Cheers,
Miguel