[drm-rust-next PATCH 0/2] Fix sync::aref imports

[drm-rust-next PATCH 0/2] Fix sync::aref imports

[Alice Ryhl]

A few imports of types::ARef were merged into drm-rust-next, but this
old path is being removed in rust-next this cycle. Thus update them.

Signed-off-by: Alice Ryhl <aliceryhl@google.com>
---
Alice Ryhl (2):
      rust: workqueue: use new sync::aref path for imports
      rust: drm: use new sync::aref path for imports

 rust/kernel/drm/gem/mod.rs | 2 +-
 rust/kernel/workqueue.rs   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
---
base-commit: 206bada308d0d715d62ac841784af34a2ca22ff6
change-id: 20260326-drm-rust-next-fix-aref-595e7bd5e70c

Best regards,
-- 
Alice Ryhl <aliceryhl@google.com>

[PATCH drm-rust-next 1/2] rust: workqueue: use new sync::aref path for imports

[Alice Ryhl]

ARef and AlwaysRefCounted are being moved to sync::aref, and the
re-exports under types are planned to be removed. Thus, update imports
to the new path.

Signed-off-by: Alice Ryhl <aliceryhl@google.com>
---
 rust/kernel/workqueue.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs
index 4ee4ff567197..019feafd3459 100644
--- a/rust/kernel/workqueue.rs
+++ b/rust/kernel/workqueue.rs
@@ -189,10 +189,12 @@
     alloc::{AllocError, Flags},
     container_of,
     prelude::*,
-    sync::Arc,
-    sync::LockClassKey,
+    sync::{
+        aref::{ARef, AlwaysRefCounted},
+        Arc, LockClassKey,
+    },
     time::Jiffies,
-    types::{ARef, AlwaysRefCounted, Opaque},
+    types::Opaque,
 };
 use core::{marker::PhantomData, ptr::NonNull};
 

-- 
2.53.0.1018.g2bb0e51243-goog

[PATCH drm-rust-next 2/2] rust: drm: use new sync::aref path for imports

[Alice Ryhl]

ARef and AlwaysRefCounted are being moved to sync::aref, and the
re-exports under types are planned to be removed. Thus, update imports
to the new path.

Signed-off-by: Alice Ryhl <aliceryhl@google.com>
---
 rust/kernel/drm/gem/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/kernel/drm/gem/mod.rs b/rust/kernel/drm/gem/mod.rs
index ed974bfdc861..6cc441ee5b63 100644
--- a/rust/kernel/drm/gem/mod.rs
+++ b/rust/kernel/drm/gem/mod.rs
@@ -39,7 +39,7 @@ impl $( <$( $tparam_id:ident ),+> )? for $type:ty
         )?
     ) => {
         // SAFETY: All GEM objects are refcounted.
-        unsafe impl $( <$( $tparam_id ),+> )? $crate::types::AlwaysRefCounted for $type
+        unsafe impl $( <$( $tparam_id ),+> )? $crate::sync::aref::AlwaysRefCounted for $type
         where
             Self: IntoGEMObject,
             $( $( $bind_param : $bind_trait ),+ )?

-- 
2.53.0.1018.g2bb0e51243-goog

Re: [drm-rust-next PATCH 0/2] Fix sync::aref imports

[Danilo Krummrich]

On 3/26/26 4:25 PM, Alice Ryhl wrote:
> Alice Ryhl (2):
>       rust: workqueue: use new sync::aref path for imports
>       rust: drm: use new sync::aref path for imports

Acked-by: Danilo Krummrich <dakr@kernel.org>

You may want to use kernel formatting style though. :P

Re: [drm-rust-next PATCH 0/2] Fix sync::aref imports

[Alice Ryhl]

On Thu, Mar 26, 2026 at 4:34 PM Danilo Krummrich <dakr@kernel.org> wrote:
>
> On 3/26/26 4:25 PM, Alice Ryhl wrote:
> > Alice Ryhl (2):
> >       rust: workqueue: use new sync::aref path for imports
> >       rust: drm: use new sync::aref path for imports
>
> Acked-by: Danilo Krummrich <dakr@kernel.org>
>
> You may want to use kernel formatting style though. :P

lol I forgot

Re: [drm-rust-next PATCH 0/2] Fix sync::aref imports

[Gary Guo]

On Thu Mar 26, 2026 at 3:25 PM GMT, Alice Ryhl wrote:
> A few imports of types::ARef were merged into drm-rust-next, but this
> old path is being removed in rust-next this cycle. Thus update them.
>
> Signed-off-by: Alice Ryhl <aliceryhl@google.com>
> ---
> Alice Ryhl (2):
>       rust: workqueue: use new sync::aref path for imports
>       rust: drm: use new sync::aref path for imports
>
>  rust/kernel/drm/gem/mod.rs | 2 +-
>  rust/kernel/workqueue.rs   | 8 +++++---
>  2 files changed, 6 insertions(+), 4 deletions(-)
> ---
> base-commit: 206bada308d0d715d62ac841784af34a2ca22ff6
> change-id: 20260326-drm-rust-next-fix-aref-595e7bd5e70c
>
> Best regards,

Reviewed-by: Gary Guo <gary@garyguo.net>

(with import style fixed up)

Re: [drm-rust-next PATCH 0/2] Fix sync::aref imports

[Alice Ryhl]

On Thu, Mar 26, 2026 at 4:25 PM Alice Ryhl <aliceryhl@google.com> wrote:
>
> A few imports of types::ARef were merged into drm-rust-next, but this
> old path is being removed in rust-next this cycle. Thus update them.
>
> Signed-off-by: Alice Ryhl <aliceryhl@google.com>
> ---
> Alice Ryhl (2):
>       rust: workqueue: use new sync::aref path for imports
>       rust: drm: use new sync::aref path for imports
>
>  rust/kernel/drm/gem/mod.rs | 2 +-
>  rust/kernel/workqueue.rs   | 8 +++++---
>  2 files changed, 6 insertions(+), 4 deletions(-)

I'm applying this now to avoid a linux-next break tonight. Thanks for
the reviews Danilo and Gary.

Alice

Re: [drm-rust-next PATCH 0/2] Fix sync::aref imports

[Danilo Krummrich]

On 3/26/26 4:49 PM, Alice Ryhl wrote:
> On Thu, Mar 26, 2026 at 4:25 PM Alice Ryhl <aliceryhl@google.com> wrote:
>>
>> A few imports of types::ARef were merged into drm-rust-next, but this
>> old path is being removed in rust-next this cycle. Thus update them.
>>
>> Signed-off-by: Alice Ryhl <aliceryhl@google.com>
>> ---
>> Alice Ryhl (2):
>>       rust: workqueue: use new sync::aref path for imports
>>       rust: drm: use new sync::aref path for imports
>>
>>  rust/kernel/drm/gem/mod.rs | 2 +-
>>  rust/kernel/workqueue.rs   | 8 +++++---
>>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> I'm applying this now to avoid a linux-next break tonight. Thanks for
> the reviews Danilo and Gary.

Sounds good, thanks.