From: Daniel Gomez <da.gomez@kernel•org>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail•com>,
Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Miguel Ojeda <ojeda@kernel•org>,
Luis Chamberlain <mcgrof@kernel•org>,
Petr Pavlu <petr.pavlu@suse•com>,
Sami Tolvanen <samitolvanen@google•com>,
Daniel Gomez <da.gomez@samsung•com>,
Andreas Hindborg <a.hindborg@kernel•org>,
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 modules tree
Date: Tue, 4 Nov 2025 09:52:40 +0100 [thread overview]
Message-ID: <13c0ac62-cfa9-4b96-9cfa-807def89593e@kernel.org> (raw)
In-Reply-To: <CANiq72kP0YMCEMjEVdTfVt4eokbXm6iRAk2PxmFZybNgJaFzGA@mail.gmail.com>
On 04/11/2025 00.59, Miguel Ojeda wrote:
> On Tue, Nov 4, 2025 at 12:55 AM Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>>
>> Today's linux-next merge of the rust tree got a conflict in:
>>
>> rust/kernel/str.rs
>>
>> between commit:
>>
>> 51d9ee90ea90 ("rust: str: add radix prefixed integer parsing functions")
>>
>> from the modules tree and commit:
>>
>> 3b83f5d5e78a ("rust: replace `CStr` with `core::ffi::CStr`")
>>
>> from the rust tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
>
> Looks good, thanks!
>
> Cheers,
> Miguel
Yes, looks good to me as weel. Thanks!
next prev parent reply other threads:[~2025-11-04 8:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-03 23:55 linux-next: manual merge of the rust tree with the modules tree Stephen Rothwell
2025-11-03 23:59 ` Miguel Ojeda
2025-11-04 8:52 ` Daniel Gomez [this message]
2025-12-05 2:31 ` 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=13c0ac62-cfa9-4b96-9cfa-807def89593e@kernel.org \
--to=da.gomez@kernel$(echo .)org \
--cc=a.hindborg@kernel$(echo .)org \
--cc=da.gomez@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mcgrof@kernel$(echo .)org \
--cc=miguel.ojeda.sandonis@gmail$(echo .)com \
--cc=ojeda@kernel$(echo .)org \
--cc=petr.pavlu@suse$(echo .)com \
--cc=samitolvanen@google$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--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