From: Andreas Hindborg <a.hindborg@kernel•org>
To: Mark Brown <broonie@kernel•org>, Miguel Ojeda <ojeda@kernel•org>
Cc: Jens Axboe <axboe@kernel•dk>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tamir Duberstein <tamird@gmail•com>
Subject: Re: linux-next: manual merge of the rust tree with the block tree
Date: Wed, 17 Sep 2025 09:42:16 +0200 [thread overview]
Message-ID: <87wm5xwmnb.fsf@t14s.mail-host-address-is-not-set> (raw)
In-Reply-To: <aMlkUu2MzRYxh96v@sirena.org.uk>
"Mark Brown" <broonie@kernel•org> writes:
> Hi all,
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> rust/kernel/block/mq/gen_disk.rs
>
> between commits:
>
> f4b72f1558be1 ("rust: block: normalize imports for `gen_disk.rs`")
> c3a54220b54a1 ("rust: block: use `NullTerminatedFormatter`")
> 90d952fac8ac1 ("rust: block: add `GenDisk` private data support")
>
> from the block tree and commit:
>
> e0be3d34f1089 ("rust: block: 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/block/mq/gen_disk.rs
> index 46ec802699706,be92d0e5f0312..0000000000000
> --- a/rust/kernel/block/mq/gen_disk.rs
> +++ b/rust/kernel/block/mq/gen_disk.rs
> @@@ -3,19 -3,12 +3,19 @@@
> //! Generic disk abstraction.
> //!
> //! C header: [`include/linux/blkdev.h`](srctree/include/linux/blkdev.h)
> - //! C header: [`include/linux/blk_mq.h`](srctree/include/linux/blk_mq.h)
> + //! C header: [`include/linux/blk-mq.h`](srctree/include/linux/blk-mq.h)
>
> -use crate::block::mq::{raw_writer::RawWriter, Operations, TagSet};
> -use crate::fmt::{self, Write};
> -use crate::{bindings, error::from_err_ptr, error::Result, sync::Arc};
> -use crate::{error, static_lock_class};
> +use crate::{
> + bindings,
> + block::mq::{Operations, TagSet},
> + error::{self, from_err_ptr, Result},
> ++ fmt::{self, Write};
> + prelude::*,
> + static_lock_class,
> + str::NullTerminatedFormatter,
> + sync::Arc,
> + types::{ForeignOwnable, ScopeGuard},
> +};
> - use core::fmt::{self, Write};
>
> /// A builder for [`GenDisk`].
> ///
This looks good to me, thanks!
Best regards,
Andreas Hindborg
next prev parent reply other threads:[~2025-09-17 7:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <tIE_kvneh6miIKUKHYGGt286j3LmCrKMfENd03aIk-ojsDOR1vkjVpf9RSrCM_ZheU65PMmUalkvqToq_Ttxew==@protonmail.internalid>
2025-09-16 13:21 ` linux-next: manual merge of the rust tree with the block tree Mark Brown
2025-09-17 7:42 ` Andreas Hindborg [this message]
[not found] <NPR3YlvOAsbhpBeoDGNoFA19ooiEuqrTmHWORPHaia9baa5oTQT9ZIeOn_U9cvByr0CSZ1L5XlX3UMWdVizKGQ==@protonmail.internalid>
2025-09-16 13:13 ` Mark Brown
2025-09-17 7:35 ` Andreas Hindborg
2024-07-09 7:52 Stephen Rothwell
2024-07-09 7:53 ` Miguel Ojeda
2024-07-23 23:19 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-06-14 3:21 Stephen Rothwell
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=87wm5xwmnb.fsf@t14s.mail-host-address-is-not-set \
--to=a.hindborg@kernel$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=broonie@kernel$(echo .)org \
--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