linux-kernel - Re: linux-next: manual merge of the driver-core tree with the drm-rust 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: <aRs1hb001g4n6vBX@google.com>
Date: Mon, 17 Nov 2025 14:47:33 +0000
From: Alice Ryhl <aliceryhl@...gle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Greg KH <greg@...ah.com>, Danilo Krummrich <dakr@...nel.org>, 
	"Rafael J. Wysocki" <rafael@...nel.org>, Alexandre Courbot <acourbot@...dia.com>, 
	Alistair Popple <apopple@...dia.com>, 
	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 driver-core tree with the
 drm-rust tree

On Mon, Nov 17, 2025 at 04:06:21PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/gpu/nova-core/driver.rs
> 
> between commit:
> 
>   1101c442410c ("gpu: nova-core: Set correct DMA mask")
> 
> from the drm-rust tree and commits:
> 
>   0242623384c7 ("rust: driver: let probe() return impl PinInit<Self, Error>")
>   e4e679c8608e ("rust: auxiliary: unregister on parent device unbind")
> 
> from the driver-core tree.
> 
> I fixed it up (I think - 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.

Thanks! Looks good.

Alice