Re: [GIT PULL] Rust for 6.16

[Boqun Feng <boqun.feng@gmail.com>]

On Wed, Jun 04, 2025 at 09:18:36PM -0700, Linus Torvalds wrote:
> On Wed, 4 Jun 2025 at 19:54, Miguel Ojeda <ojeda@kernel.org> wrote:
> >
> > There are a few conflicts, including semantic ones, but they are all
> > easy to apply. The resolutions in the latest linux-next are fine; I also
> > did a test merge -- please check either to catch the semantic ones
> 
> Hmm. I don't understand why the suggested merge adds those
> 
>         let self_ptr: *mut Opaque<bindings::drm_gem_object> = self_ptr.cast();
> 
>         let ptr: *mut Opaque<bindings::drm_gem_object> = obj.cast();
> 
> cases to rust/kernel/drm/gem/mod.rs, and it built cleanly for me
> without those changes, but that may be because my build doesn't
> trigger this.
> 
> But in the name of safety, and because I didn't understand that
> change, I modified my merge to do what you did.
> 

FWIW, I think this thread has the explanation:

	https://lore.kernel.org/regressions/CANiq72mFL4dn+0JppLLfxyKnM+xYwKeduFw2j07hUfxWVVHdUw@mail.gmail.com/

I believe these changes are needed because in commit b20fbbc08a36
("rust: check type of `$ptr` in `container_of!`"), we enabled the
checking for `container_of!(ptr, struct, field)` that `ptr` must be the
same type of `&struct->field`. But the drm/gem code is added from a
different repo (probably the nova tree), so the adjustment has to be
done in a merge. Miguel can keep me honest on this one ;-)

Regards,
Boqun

>                  Linus