diff options
| author | Thierry Reding <treding@nvidia.com> | 2026-04-30 09:32:16 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2026-04-30 09:32:16 +0200 |
| commit | 0323c465e031e4e62e3f2a5e534d9a8392e3d3cd (patch) | |
| tree | 3558576e9fe69a78932d24e0124af43f324fed99 | |
| parent | ef355c128d7ecf369e37c4bf8b939fbb3d32ff5b (diff) | |
| parent | 15e8bae5d930c91b8739a87d75db0a6efca3cb32 (diff) | |
| download | linux-next-0323c465e031e4e62e3f2a5e534d9a8392e3d3cd.tar.gz | |
Merge branch 'drm-rust-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | rust/kernel/drm/gem/shmem.rs | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bde3ccb67a227..f2eb9378e520c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8194,10 +8194,9 @@ F: include/uapi/drm/nouveau_drm.h CORE DRIVER FOR NVIDIA GPUS [RUST] M: Danilo Krummrich <dakr@kernel.org> M: Alexandre Courbot <acourbot@nvidia.com> -L: nouveau@lists.freedesktop.org +L: nova-gpu@lists.linux.dev S: Supported W: https://rust-for-linux.com/nova-gpu-driver -Q: https://patchwork.freedesktop.org/project/nouveau/ B: https://gitlab.freedesktop.org/drm/nova/-/issues C: irc://irc.oftc.net/nouveau T: git https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-next @@ -8206,10 +8205,9 @@ F: drivers/gpu/nova-core/ DRM DRIVER FOR NVIDIA GPUS [RUST] M: Danilo Krummrich <dakr@kernel.org> -L: nouveau@lists.freedesktop.org +L: nova-gpu@lists.linux.dev S: Supported W: https://rust-for-linux.com/nova-gpu-driver -Q: https://patchwork.freedesktop.org/project/nouveau/ B: https://gitlab.freedesktop.org/drm/nova/-/issues C: irc://irc.oftc.net/nouveau T: git https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-next diff --git a/rust/kernel/drm/gem/shmem.rs b/rust/kernel/drm/gem/shmem.rs index d025fb0351954..e1b648920d2f6 100644 --- a/rust/kernel/drm/gem/shmem.rs +++ b/rust/kernel/drm/gem/shmem.rs @@ -19,10 +19,8 @@ use crate::{ }, error::to_result, prelude::*, - types::{ - ARef, - Opaque, // - }, // + sync::aref::ARef, + types::Opaque, // }; use core::{ ops::{ |