Merge pull request torvalds#509 from nbdd0121/rust

rust: remove kernel/trait.rs
ojeda · Oct 5, 2021 · 238b5b6 · 238b5b6
2 parents f5e9a8b + a9976fe
commit 238b5b6
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 29 deletions.
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
@@ -54,7 +54,6 @@ pub mod power;
 pub mod security;
 pub mod str;
 pub mod task;
-pub mod traits;
 
 pub mod linked_list;
 mod raw_list;

diff --git a/rust/kernel/prelude.rs b/rust/kernel/prelude.rs
@@ -24,5 +24,3 @@ pub use super::{pr_alert, pr_crit, pr_debug, pr_emerg, pr_err, pr_info, pr_notic
 pub use super::static_assert;
 
 pub use super::{Error, KernelModule, Result};
-
-pub use crate::traits::TryPin;
diff --git a/rust/kernel/traits.rs b/rust/kernel/traits.rs