tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'rust-fixes-6.13' of https://github.com/Rust-for-Linux/linux

Pull rust fixes from Miguel Ojeda:
"Toolchain and infrastructure:

- Set bindgen's Rust target version to prevent issues when
pairing older rustc releases with newer bindgen releases,
such as bindgen >= 0.71.0 and rustc < 1.82 due to
unsafe_extern_blocks.

drm/panic:

- Remove spurious empty line detected by a new Clippy warning"

* tag 'rust-fixes-6.13' of https://github.com/Rust-for-Linux/linux:
rust: kbuild: set `bindgen`'s Rust target version
drm/panic: remove spurious empty line to clean warning

Linus Torvalds 78248507 115c0cc2

+14 -2
-1
drivers/gpu/drm/drm_panic_qr.rs
··· 929 929 /// * `tmp` must be valid for reading and writing for `tmp_size` bytes. 930 930 /// 931 931 /// They must remain valid for the duration of the function call. 932 - 933 932 #[no_mangle] 934 933 pub unsafe extern "C" fn drm_panic_qr_generate( 935 934 url: *const i8,
+14 -1
rust/Makefile
··· 280 280 # architecture instead of generating `usize`. 281 281 bindgen_c_flags_final = $(bindgen_c_flags_lto) -fno-builtin -D__BINDGEN__ 282 282 283 + # Each `bindgen` release may upgrade the list of Rust target versions. By 284 + # default, the highest stable release in their list is used. Thus we need to set 285 + # a `--rust-target` to avoid future `bindgen` releases emitting code that 286 + # `rustc` may not understand. On top of that, `bindgen` does not support passing 287 + # an unknown Rust target version. 288 + # 289 + # Therefore, the Rust target for `bindgen` can be only as high as the minimum 290 + # Rust version the kernel supports and only as high as the greatest stable Rust 291 + # target supported by the minimum `bindgen` version the kernel supports (that 292 + # is, if we do not test the actual `rustc`/`bindgen` versions running). 293 + # 294 + # Starting with `bindgen` 0.71.0, we will be able to set any future Rust version 295 + # instead, i.e. we will be able to set here our minimum supported Rust version. 283 296 quiet_cmd_bindgen = BINDGEN $@ 284 297 cmd_bindgen = \ 285 - $(BINDGEN) $< $(bindgen_target_flags) \ 298 + $(BINDGEN) $< $(bindgen_target_flags) --rust-target 1.68 \ 286 299 --use-core --with-derive-default --ctypes-prefix ffi --no-layout-tests \ 287 300 --no-debug '.*' --enable-function-attribute-detection \ 288 301 -o $@ -- $(bindgen_c_flags_final) -DMODULE \