linux-kernel - linux-next: manual merge of the rust tree with the drm-misc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250716201656.4f0ea8d7@canb.auug.org.au>
Date: Wed, 16 Jul 2025 20:16:56 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miguel Ojeda <ojeda@...nel.org>, Simona Vetter <simona.vetter@...ll.ch>
Cc: Alice Ryhl <aliceryhl@...gle.com>, Danilo Krummrich <dakr@...nel.org>,
 Intel Graphics <intel-gfx@...ts.freedesktop.org>, DRI
 <dri-devel@...ts.freedesktop.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the rust tree with the drm-misc tree

Hi all,

Today's linux-next merge of the rust tree got a conflict in:

  rust/kernel/drm/gem/mod.rs

between commit:

  917b10d90990 ("drm: rust: rename as_ref() to from_raw() for drm constructors")

from the drm-misc tree and commit:

  8802e1684378 ("rust: types: add Opaque::cast_from")

from the rust tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc rust/kernel/drm/gem/mod.rs
index a24c9a2fc201,6f914ae0a5aa..000000000000
--- a/rust/kernel/drm/gem/mod.rs
+++ b/rust/kernel/drm/gem/mod.rs
@@@ -124,12 -124,10 +124,10 @@@ impl<T: DriverObject> IntoGEMObject fo
          self.obj.get()
      }
  
 -    unsafe fn as_ref<'a>(self_ptr: *mut bindings::drm_gem_object) -> &'a Self {
 +    unsafe fn from_raw<'a>(self_ptr: *mut bindings::drm_gem_object) -> &'a Self {
-         let self_ptr: *mut Opaque<bindings::drm_gem_object> = self_ptr.cast();
- 
          // SAFETY: `obj` is guaranteed to be in an `Object<T>` via the safety contract of this
          // function
-         unsafe { &*crate::container_of!(self_ptr, Object<T>, obj) }
+         unsafe { &*crate::container_of!(Opaque::cast_from(self_ptr), Object<T>, obj) }
      }
  }
  

Content of type "application/pgp-signature" skipped