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

Message-ID: <aMlfiBynRQrbW3BT@sirena.org.uk>
Date: Tue, 16 Sep 2025 14:00:56 +0100
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>,
	Tamir Duberstein <tamird@...il.com>
Subject: linux-next: manual merge of the rust tree with the drm-rust tree

Hi all,

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

  drivers/gpu/nova-core/gpu.rs

between commits:

  b345c917d7c1e ("gpu: nova-core: add Chipset::name() method")
  e7c96980ea4d9 ("gpu: nova-core: move GSP boot code to its own module")

from the drm-rust 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/gpu.rs
index 5da9ad7264834,600cc90b5fabe..0000000000000
--- a/drivers/gpu/nova-core/gpu.rs
+++ b/drivers/gpu/nova-core/gpu.rs
@@@ -1,14 -1,17 +1,15 @@@
  // SPDX-License-Identifier: GPL-2.0
  
- use kernel::{device, devres::Devres, error::code::*, pci, prelude::*, sync::Arc};
+ use kernel::{device, devres::Devres, error::code::*, fmt, pci, prelude::*, sync::Arc};
  
  use crate::driver::Bar0;
 -use crate::falcon::{gsp::Gsp, sec2::Sec2, Falcon};
 -use crate::fb::FbLayout;
 +use crate::falcon::{gsp::Gsp as GspFalcon, sec2::Sec2 as Sec2Falcon, Falcon};
  use crate::fb::SysmemFlush;
 -use crate::firmware::fwsec::{FwsecCommand, FwsecFirmware};
 -use crate::firmware::{Firmware, FIRMWARE_VERSION};
  use crate::gfw;
 +use crate::gsp::Gsp;
  use crate::regs;
- use core::fmt;
+ use crate::util;
+ use crate::vbios::Vbios;
  
  macro_rules! define_chipset {
      ({ $($variant:ident = $value:expr),* $(,)* }) =>

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