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

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
parents 115c0cc2 7a5f93ea

drivers/gpu/drm/drm_panic_qr.rs

+0 −1
Original line number Diff line number Diff line
@@ -929,7 +929,6 @@ fn draw_all(&mut self, data: impl Iterator<Item = u8>) { 
/// * `tmp` must be valid for reading and writing for `tmp_size` bytes.

///

/// They must remain valid for the duration of the function call.



#[no_mangle]

pub unsafe extern "C" fn drm_panic_qr_generate(

    url: *const i8,

rust/Makefile

+14 −1
Original line number Diff line number Diff line
@@ -280,9 +280,22 @@ endif 
# architecture instead of generating `usize`.

bindgen_c_flags_final = $(bindgen_c_flags_lto) -fno-builtin -D__BINDGEN__



# Each `bindgen` release may upgrade the list of Rust target versions. By

# default, the highest stable release in their list is used. Thus we need to set

# a `--rust-target` to avoid future `bindgen` releases emitting code that

# `rustc` may not understand. On top of that, `bindgen` does not support passing

# an unknown Rust target version.

#

# Therefore, the Rust target for `bindgen` can be only as high as the minimum

# Rust version the kernel supports and only as high as the greatest stable Rust

# target supported by the minimum `bindgen` version the kernel supports (that

# is, if we do not test the actual `rustc`/`bindgen` versions running).

#

# Starting with `bindgen` 0.71.0, we will be able to set any future Rust version

# instead, i.e. we will be able to set here our minimum supported Rust version.

quiet_cmd_bindgen = BINDGEN $@

      cmd_bindgen = \

	$(BINDGEN) $< $(bindgen_target_flags) \

	$(BINDGEN) $< $(bindgen_target_flags) --rust-target 1.68 \

		--use-core --with-derive-default --ctypes-prefix ffi --no-layout-tests \

		--no-debug '.*' --enable-function-attribute-detection \

		-o $@ -- $(bindgen_c_flags_final) -DMODULE \