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

Stephen Rothwell
2025-12-05T03:22:59Z

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

Hi all,

On Mon, 10 Nov 2025 12:24:26 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> rust/kernel/debugfs/file_ops.rs
>
> between commit:
>
> 9c804d9cf2db ("rust: debugfs: support for binary large objects")
>
> from the driver-core tree and commit:
>
> 3f0dd5fad9ac ("rust: debugfs: 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.
>
>
> diff --cc rust/kernel/debugfs/file_ops.rs
> index 6c8928902a0b,9ad5e3fa6f69..000000000000
> --- a/rust/kernel/debugfs/file_ops.rs
> +++ b/rust/kernel/debugfs/file_ops.rs
> @@@ -1,9 -1,9 +1,10 @@@
> // SPDX-License-Identifier: GPL-2.0
> // Copyright (C) 2025 Google LLC.
>
> -use super::{Reader, Writer};
> +use super::{BinaryReader, BinaryWriter, Reader, Writer};
> use crate::debugfs::callback_adapters::Adapter;
> + use crate::fmt;
> +use crate::fs::file;
> use crate::prelude::*;
> use crate::seq_file::SeqFile;
> use crate::seq_print;

This is now a conflict between the driver-core tree and Linus' tree.