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

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 913 bytes --]

Hi all,

Today's linux-next merge of the rust tree got a conflict in:

  drivers/gpu/nova-core/regs/macros.rs

between commit:

  6ecd6b73e0845 ("gpu: nova-core: register: improve `Debug` implementation")

from the drm-nova tree and commit:

  4b4d06a7630e1 ("gpu: nova-core: use `kernel::{fmt,prelude::fmt!}`")

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.

diff --cc drivers/gpu/nova-core/regs/macros.rs
index 754c14ee7f401,6b9df4205f469..0000000000000
--- a/drivers/gpu/nova-core/regs/macros.rs
+++ b/drivers/gpu/nova-core/regs/macros.rs

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Miguel Ojeda]

On Tue, Sep 23, 2025 at 6:42 PM Mark Brown <broonie@kernel.org> wrote:
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good from inspection -- I will confirm in my CI runs.

Thanks!

Cheers,
Miguel

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1272 bytes --]

Hi all,

Today's linux-next merge of the rust tree got a conflict in:

  drivers/gpu/nova-core/vbios.rs

between commit:

  93296e9d9528f ("gpu: nova-core: vbios: store reference to Device where relevant")

from the drm-nova tree and commit:

  f3f6b3664302e ("gpu: nova-core: use Alignment for alignment-related operations")

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.

diff --cc drivers/gpu/nova-core/vbios.rs
index e6a0607142056,091642d6a5a15..0000000000000
--- a/drivers/gpu/nova-core/vbios.rs
+++ b/drivers/gpu/nova-core/vbios.rs
@@@ -8,8 -8,9 +8,9 @@@ use crate::firmware::FalconUCodeDescV3
  use core::convert::TryFrom;
  use kernel::device;
  use kernel::error::Result;
 -use kernel::pci;
  use kernel::prelude::*;
+ use kernel::ptr::{Alignable, Alignment};
 +use kernel::types::ARef;
  
  /// The offset of the VBIOS ROM in the BAR0 space.
  const ROM_OFFSET: usize = 0x300000;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]