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:35:46 +0200 [thread overview]
Message-ID: <87zfatwmy5.fsf@t14s.mail-host-address-is-not-set> (raw)
In-Reply-To: <aMligBYh0Z4V5Biv@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.rs
>
> between commit:
>
> 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.rs
> index c0ec06b843555,61ea35bba7d50..0000000000000
> --- a/rust/kernel/block/mq.rs
> +++ b/rust/kernel/block/mq.rs
> @@@ -89,7 -82,7 +89,7 @@@
> //! Arc::pin_init(TagSet::new(1, 256, 1), flags::GFP_KERNEL)?;
> //! let mut disk = gen_disk::GenDiskBuilder::new()
> //! .capacity_sectors(4096)
> - //! .build(format_args!("myblk"), tagset, ())?;
> -//! .build(fmt!("myblk"), tagset)?;
> ++//! .build(fmt!("myblk"), tagset, ())?;
> //!
> //! # Ok::<(), kernel::error::Error>(())
> //! ```
Thanks, looks good to me.
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] <NPR3YlvOAsbhpBeoDGNoFA19ooiEuqrTmHWORPHaia9baa5oTQT9ZIeOn_U9cvByr0CSZ1L5XlX3UMWdVizKGQ==@protonmail.internalid>
2025-09-16 13:13 ` Mark Brown
2025-09-17 7:35 ` Andreas Hindborg [this message]
[not found] <tIE_kvneh6miIKUKHYGGt286j3LmCrKMfENd03aIk-ojsDOR1vkjVpf9RSrCM_ZheU65PMmUalkvqToq_Ttxew==@protonmail.internalid>
2025-09-16 13:21 ` Mark Brown
2025-09-17 7:42 ` 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=87zfatwmy5.fsf@t14s.mail-host-address-is-not-set \
--to=a.hindborg@kernel.org \
--cc=axboe@kernel.dk \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=tamird@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®