]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
next-20250314/rust
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Mar 2025 10:55:50 +0000 (21:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Mar 2025 10:55:50 +0000 (21:55 +1100)
# Conflicts:
# drivers/gpu/drm/drm_panic_qr.rs

1  2 
Documentation/rust/testing.rst
MAINTAINERS
drivers/gpu/drm/drm_panic.c
drivers/gpu/drm/drm_panic_qr.rs
drivers/net/phy/qt2025.rs
lib/vsprintf.c
rust/kernel/task.rs
rust/macros/module.rs
samples/rust/rust_driver_faux.rs
samples/rust/rust_driver_pci.rs
scripts/rustdoc_test_gen.rs

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
index 5d21f6d10bcb58d1d96906c362d194eaac08fd7a,ecd87e8ffe05a13626370053fe1f8ca2d87cc731..f2a99681b9985878ae9fdad84bc8896c4718e662
@@@ -27,7 -26,8 +27,7 @@@
  //! * <https://github.com/erwanvivien/fast_qr>
  //! * <https://github.com/bjguillot/qr>
  
- use kernel::str::CStr;
 -use core::cmp;
+ use kernel::{prelude::*, str::CStr};
  
  #[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd)]
  struct Version(usize);
Simple merge
diff --cc lib/vsprintf.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge