Fix merge conflicts

Author: Sylfrena

rust/kernel/file_operations.rs

@@ -7,13 +7,16 @@
 use core::convert::{TryFrom, TryInto};
 use core::{marker, mem, ptr};
 
+use alloc::boxed::Box;
+
 use crate::{
     bindings, c_types,
     error::{Error, KernelResult},
     file::File,
     io_buffer::{IoBufferReader, IoBufferWriter},
     iov_iter::IovIter,
-    sync::{CondVar, Ref, RefCounted},
+    sync::CondVar,
+    types::PointerWrapper,
     user_ptr::{UserSlicePtr, UserSlicePtrReader, UserSlicePtrWriter},
 };
 
@@ -552,7 +555,7 @@ pub trait FileOperations: Send + Sync + Sized {
     const TO_USE: ToUse;
 
     /// The pointer type that will be used to hold ourselves.
-    type Wrapper: PointerWrapper<Self> = Box<Self>;
+    type Wrapper: PointerWrapper = Box<Self>;
 
     /// Cleans up after the last reference to the file goes away.
     ///