Re: linux-next: manual merge of the driver-core tree with the drm-rust tree

[Danilo Krummrich]

On Sun Jul 26, 2026 at 11:57 PM CEST, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
>   drivers/gpu/nova-core/gpu.rs
>
> between commit:
>
>   f1aab4b1ab829 ("gpu: nova-core: avoid repeated calls to pci::Device::as_ref")
>
> from the drm-rust tree and commit:
>
>   f7acb19abcd86 ("rust: device: make lifetime on `Core` and `CoreInternal` invariant")
>
> from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

LGTM, thanks!