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

[Stephen Rothwell]

Hi all,

On Tue, 1 Jul 2025 15:51:59 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/gpu/nova-core/driver.rs
> 
> between commit:
> 
>   94a08721435c ("gpu: nova-core: increase BAR0 size to 16MB")
> 
> from the drm-nova tree and commit:
> 
>   f5d3ef25d238 ("rust: devres: get rid of Devres' inner Arc")
> 
> from the driver-core 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.
> 
> 
> diff --cc drivers/gpu/nova-core/driver.rs
> index 518ef8739550,110f2b355db4..000000000000
> --- a/drivers/gpu/nova-core/driver.rs
> +++ b/drivers/gpu/nova-core/driver.rs
> @@@ -1,6 -1,6 +1,6 @@@
>   // SPDX-License-Identifier: GPL-2.0
>   
> - use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*, sizes::SZ_16M};
>  -use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*, sync::Arc};
> ++use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*, sizes::SZ_16M, sync::Arc};
>   
>   use crate::gpu::Gpu;
>   

This is now a conflict between the drm tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpsxPNBnhTtR.pgp
Description: OpenPGP digital signature