Commit 24389907 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rust-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux 

Pull rust fixes from Miguel Ojeda:

 - Fix objtool warning due to future Rust 1.85.0 (to be released in a
   few days)

 - Clean future Rust 1.86.0 (to be released 2025-04-03) Clippy warning

* tag 'rust-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
  rust: rbtree: fix overindented list item
  objtool/rust: add one more `noreturn` Rust function
parents d4401484 2e4f982c

tools/objtool/check.c

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ static bool is_rust_noreturn(const struct symbol *func) 
	       str_ends_with(func->name, "_4core9panicking18panic_bounds_check")			||

	       str_ends_with(func->name, "_4core9panicking19assert_failed_inner")			||

	       str_ends_with(func->name, "_4core9panicking36panic_misaligned_pointer_dereference")	||

	       strstr(func->name, "_4core9panicking13assert_failed")					||

	       strstr(func->name, "_4core9panicking11panic_const24panic_const_")			||

	       (strstr(func->name, "_4core5slice5index24slice_") &&

		str_ends_with(func->name, "_fail"));

rust/kernel/rbtree.rs

+1 −1

File changed.

Contains only whitespace changes.