linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-Id: <DBDES17FT4ZZ.GVIUKUE5R9SE@kernel.org>
Date: Wed, 16 Jul 2025 12:31:04 +0200
From: "Danilo Krummrich" <dakr@...nel.org>
To: "Stephen Rothwell" <sfr@...b.auug.org.au>
Cc: "Miguel Ojeda" <ojeda@...nel.org>, "Simona Vetter"
 <simona.vetter@...ll.ch>, "Alice Ryhl" <aliceryhl@...gle.com>, "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: Re: linux-next: manual merge of the rust tree with the drm-misc
 tree

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!