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

[Danilo Krummrich]

On Wed Jul 16, 2025 at 12:16 PM CEST, Stephen Rothwell wrote:
> 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.

Looks good to me, thanks!