Rust fixes for the upcoming 1.89 release

[firmware-kpd]

Pull request for series with
subject: Rust fixes for the upcoming 1.89 release
version: 1
url: https://patchwork.kernel.org/project/firmware/list/?series=981737

[firmware-kpd]

Upstream branch: 8f5ae30
series: https://patchwork.kernel.org/project/firmware/list/?series=981737
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/firmware/list/?series=981737
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: objtool/rust: add one more `noreturn` Rust function for Rust 1.89.0
Using index info to reconstruct a base tree...
M	tools/objtool/check.c
Falling back to patching base and 3-way merge...
Auto-merging tools/objtool/check.c
No changes -- Patch already applied.
Applying: rust: use `#[used(compiler)]` to fix build and `modpost` with Rust >= 1.89.0
Using index info to reconstruct a base tree...
M	rust/Makefile
M	rust/kernel/firmware.rs
M	rust/kernel/kunit.rs
M	rust/kernel/lib.rs
M	rust/macros/module.rs
M	scripts/Makefile.build
Falling back to patching base and 3-way merge...
Auto-merging scripts/Makefile.build
CONFLICT (content): Merge conflict in scripts/Makefile.build
Auto-merging rust/macros/module.rs
Auto-merging rust/kernel/lib.rs
Auto-merging rust/kernel/kunit.rs
Auto-merging rust/kernel/firmware.rs
Auto-merging rust/Makefile
Patch failed at 0002 rust: use `#[used(compiler)]` to fix build and `modpost` with Rust >= 1.89.0'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc scripts/Makefile.build
index d0ee33a487be9,ba71b27aa3634..0000000000000
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@@ -317,7 -316,7 +317,11 @@@ $(obj)/%.lst: $(obj)/%.c FORC
  #
  # Please see https://github.com/Rust-for-Linux/linux/issues/2 for details on
  # the unstable features in use.
++<<<<<<< HEAD
 +rust_allowed_features := asm_const,asm_goto,arbitrary_self_types,lint_reasons,offset_of_nested,raw_ref_op,used_with_arg
++=======
+ rust_allowed_features := asm_const,asm_goto,arbitrary_self_types,lint_reasons,raw_ref_op,used_with_arg
++>>>>>>> rust: use `#[used(compiler)]` to fix build and `modpost` with Rust >= 1.89.0
  
  # `--out-dir` is required to avoid temporaries being created by `rustc` in the
  # current working directory, which may be not accessible in the out-of-tree