From: Mark Brown <broonie@kernel•org>
To: Miguel Ojeda <ojeda@kernel•org>
Cc: Alexandre Courbot <acourbot@nvidia•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tamir Duberstein <tamird@gmail•com>
Subject: linux-next: manual merge of the rust tree with the drm-rust tree
Date: Tue, 16 Sep 2025 14:00:56 +0100 [thread overview]
Message-ID: <aMlfiBynRQrbW3BT@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1751 bytes --]
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),* $(,)* }) =>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-16 13:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-16 13:00 Mark Brown [this message]
2025-09-24 12:56 ` linux-next: manual merge of the rust tree with the drm-rust tree Miguel Ojeda
-- strict thread matches above, loose matches on Subject: below --
2025-09-16 13:09 Mark Brown
2025-09-28 14:39 ` Miguel Ojeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aMlfiBynRQrbW3BT@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=acourbot@nvidia$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ojeda@kernel$(echo .)org \
--cc=tamird@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox