linux-kernel - linux-next: manual merge of the rust tree with the drm-nova 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-next>] [day] [month] [year] [list]

Message-ID: <aNLN45NdHatkNUwg@finisterre.sirena.org.uk>
Date: Tue, 23 Sep 2025 18:42:11 +0200
From: Mark Brown <broonie@...nel.org>
To: Miguel Ojeda <ojeda@...nel.org>
Cc: Alexandre Courbot <acourbot@...dia.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the rust tree with the drm-nova tree

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;

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)