diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2026-02-19 22:08:53 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2026-02-19 22:08:53 +0300 |
| commit | b0a67f310bfa5e13d66c9f6b4bd88ea504a576a9 (patch) | |
| tree | f203082c07e790f8d4214075b8c81ace9717bd40 /samples | |
| parent | 4c51f90d45dca71e7974ed5a7c40b9c04a6c6762 (diff) | |
| parent | 8bf22c33e7a172fbc72464f4cc484d23a6b412ba (diff) | |
| download | linux-b0a67f310bfa5e13d66c9f6b4bd88ea504a576a9.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf before 7.0-rc1
Cross-merge BPF and other fixes after downstream PR.
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/rust/rust_driver_usb.rs | 10 | ||||
| -rw-r--r-- | samples/rust/rust_misc_device.rs | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/samples/rust/rust_driver_usb.rs b/samples/rust/rust_driver_usb.rs index 4eaad14867b2..ab72e99e1274 100644 --- a/samples/rust/rust_driver_usb.rs +++ b/samples/rust/rust_driver_usb.rs @@ -3,7 +3,15 @@ //! Rust USB driver sample. -use kernel::{device, device::Core, prelude::*, sync::aref::ARef, usb}; +use kernel::{ + device::{ + self, + Core, // + }, + prelude::*, + sync::aref::ARef, + usb, // +}; struct SampleDriver { _intf: ARef<usb::Interface>, diff --git a/samples/rust/rust_misc_device.rs b/samples/rust/rust_misc_device.rs index 3ef8da543abf..87a1fe63533a 100644 --- a/samples/rust/rust_misc_device.rs +++ b/samples/rust/rust_misc_device.rs @@ -96,7 +96,6 @@ //! ``` use kernel::{ - c_str, device::Device, fs::{File, Kiocb}, ioctl::{_IO, _IOC_SIZE, _IOR, _IOW}, @@ -131,7 +130,7 @@ impl kernel::InPlaceModule for RustMiscDeviceModule { pr_info!("Initialising Rust Misc Device Sample\n"); let options = MiscDeviceOptions { - name: c_str!("rust-misc-device"), + name: c"rust-misc-device", }; try_pin_init!(Self { |