* linux-next: manual merge of the rust tree with the drm-rust tree
@ 2025-09-16 13:00 Mark Brown
2025-09-24 12:56 ` Miguel Ojeda
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2025-09-16 13:00 UTC (permalink / raw)
To: Miguel Ojeda
Cc: Alexandre Courbot, Linux Kernel Mailing List,
Linux Next Mailing List, Tamir Duberstein
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the rust tree with the drm-rust tree
@ 2025-09-16 13:09 Mark Brown
2025-09-28 14:39 ` Miguel Ojeda
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2025-09-16 13:09 UTC (permalink / raw)
To: Miguel Ojeda
Cc: Danilo Krummrich, Linux Kernel Mailing List,
Linux Next Mailing List, Tamir Duberstein
[-- Attachment #1: Type: text/plain, Size: 1382 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
rust/kernel/alloc/kvec.rs
between commit:
779db37373a38 ("rust: alloc: kvec: implement AsPageIter for VVec")
from the drm-rust tree and commit:
1f96115f502ab ("rust: alloc: 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 rust/kernel/alloc/kvec.rs
index 38ed271b1d045,dfc101e03f358..0000000000000
--- a/rust/kernel/alloc/kvec.rs
+++ b/rust/kernel/alloc/kvec.rs
@@@ -3,14 -3,13 +3,14 @@@
//! Implementation of [`Vec`].
use super::{
- allocator::{KVmalloc, Kmalloc, Vmalloc},
+ allocator::{KVmalloc, Kmalloc, Vmalloc, VmallocPageIter},
layout::ArrayLayout,
- AllocError, Allocator, Box, Flags,
+ AllocError, Allocator, Box, Flags, NumaNode,
};
+use crate::page::AsPageIter;
+ use crate::fmt;
use core::{
borrow::{Borrow, BorrowMut},
- fmt,
marker::PhantomData,
mem::{ManuallyDrop, MaybeUninit},
ops::Deref,
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the rust tree with the drm-rust tree
2025-09-16 13:00 Mark Brown
@ 2025-09-24 12:56 ` Miguel Ojeda
0 siblings, 0 replies; 4+ messages in thread
From: Miguel Ojeda @ 2025-09-24 12:56 UTC (permalink / raw)
To: Mark Brown
Cc: Miguel Ojeda, Linux Kernel Mailing List, Linux Next Mailing List,
Tamir Duberstein, Danilo Krummrich, Alexandre Courbot
On Tue, Sep 16, 2025 at 3:01 PM Mark Brown <broonie@kernel•org> wrote:
>
> + use crate::util;
> + use crate::vbios::Vbios;
I think these two lines should not be added back; otherwise, we get a warning:
error: unused import: `crate::util`
--> drivers/gpu/nova-core/gpu.rs:11:5
|
11 | use crate::util;
| ^^^^^^^^^^^
|
= note: `-D unused-imports` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(unused_imports)]`
error: unused import: `crate::vbios::Vbios`
--> drivers/gpu/nova-core/gpu.rs:12:5
|
12 | use crate::vbios::Vbios;
| ^^^^^^^^^^^^^^^^^^^
Thanks!
Cheers,
Miguel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the rust tree with the drm-rust tree
2025-09-16 13:09 linux-next: manual merge of the rust tree with the drm-rust tree Mark Brown
@ 2025-09-28 14:39 ` Miguel Ojeda
0 siblings, 0 replies; 4+ messages in thread
From: Miguel Ojeda @ 2025-09-28 14:39 UTC (permalink / raw)
To: Mark Brown
Cc: Miguel Ojeda, Danilo Krummrich, Linux Kernel Mailing List,
Linux Next Mailing List, Tamir Duberstein
On Tue, Sep 16, 2025 at 3:10 PM Mark Brown <broonie@kernel•org> wrote:
>
> +use crate::page::AsPageIter;
> + use crate::fmt;
These should be the other way around to pass `rustfmt` (please see diff below).
I noticed now that we have cleared the other issues. If it could be
fixed in the merge commit, it would be great, thanks!
Cheers,
Miguel
diff --git a/rust/kernel/alloc/kvec.rs b/rust/kernel/alloc/kvec.rs
index 3d38d9bde582d..2cc147a4cb881 100644
--- a/rust/kernel/alloc/kvec.rs
+++ b/rust/kernel/alloc/kvec.rs
@@ -7,8 +7,8 @@
layout::ArrayLayout,
AllocError, Allocator, Box, Flags, NumaNode,
};
-use crate::page::AsPageIter;
use crate::fmt;
+use crate::page::AsPageIter;
use core::{
borrow::{Borrow, BorrowMut},
marker::PhantomData,
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-09-28 14:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-16 13:09 linux-next: manual merge of the rust tree with the drm-rust tree Mark Brown
2025-09-28 14:39 ` Miguel Ojeda
-- strict thread matches above, loose matches on Subject: below --
2025-09-16 13:00 Mark Brown
2025-09-24 12:56 ` Miguel Ojeda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox