[staging-next] linux_6_12: patch to fix build with Rust 1.85 (#388427)
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr.rs
|
||||
index 447740d79d3d..da405d18d8a8 100644
|
||||
--- a/drivers/gpu/drm/drm_panic_qr.rs
|
||||
+++ b/drivers/gpu/drm/drm_panic_qr.rs
|
||||
@@ -931,7 +931,7 @@ fn draw_all(&mut self, data: impl Iterator<Item = u8>) {
|
||||
/// 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,
|
||||
+ url: *const core::ffi::c_char,
|
||||
data: *mut u8,
|
||||
data_len: usize,
|
||||
data_size: usize,
|
||||
@@ -76,4 +76,9 @@
|
||||
name = "export-rt-sched-migrate";
|
||||
patch = ./export-rt-sched-migrate.patch;
|
||||
};
|
||||
|
||||
linux-612-rust-185 = {
|
||||
name = "linux-612-rust-185";
|
||||
patch = ./linux-612-rust-185.patch;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -194,6 +194,7 @@ in {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.linux-612-rust-185
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user