From 10964ee2ece94edd663ddea1783018781e108764 Mon Sep 17 00:00:00 2001
From: Lyude Paul <lyude@redhat.com>
Date: Tue, 25 Jun 2024 14:33:07 -0400
Subject: [PATCH] fixup! WIP: Match pattern that Gem and File use
---
rust/kernel/drm/kms.rs | 4 ----
1 file changed, 4 deletions(-)
diff --git a/rust/kernel/drm/kms.rs b/rust/kernel/drm/kms.rs
index cb0664a9a3cb4..1bc0468e55787 100644
--- a/rust/kernel/drm/kms.rs
+++ b/rust/kernel/drm/kms.rs
@@ -341,11 +341,7 @@ unsafe impl<T: RcModeObject> AlwaysRefCounted for T {
/// protected under this single lock. So long as this object is held, it is guaranteed that the lock
/// is held.
pub struct ModeConfigGuard<'a, T: KmsDriver> {
-<<<<<<< HEAD
dev: &'a Device<T>,
-=======
- pub(crate) dev: &'a Device<T>,
->>>>>>> 46d026eb2cf5a (WIP: Match pattern that Gem and File use)
}
impl<'a, T: KmsDriver> ModeConfigGuard<'a, T> {
--
GitLab