linux-next: manual merge of the rust tree with the driver-core tree

Stephen Rothwell
2025-11-14T04:18:05Z

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

Hi all,

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

rust/kernel/pci/id.rs

between commit:

d8407396f128 ("rust: pci: use "kernel vertical" style for imports")

from the driver-core tree and commit:

0e947bc22b0b ("rust: pci: use `kernel::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.

--
Cheers,
Stephen Rothwell

diff --cc rust/kernel/pci/id.rs
index a1de70b2176a,5f5d59ff49fc..000000000000
--- a/rust/kernel/pci/id.rs
+++ b/rust/kernel/pci/id.rs
@@@ -4,11 -4,7 +4,11 @@@
//!
//! This module contains PCI class codes, Vendor IDs, and supporting types.

-use crate::{bindings, error::code::EINVAL, error::Error, fmt, prelude::*};
+use crate::{
+ bindings,
++ fmt,
+ prelude::*, //
+};
- use core::fmt;

/// PCI device class codes.
///