From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andreas Hindborg <a.hindborg@kernel•org>
Cc: "Andrew Morton" <akpm@linux-foundation•org>,
"Danilo Krummrich" <dakr@kernel•org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Miguel Ojeda" <miguel.ojeda.sandonis@gmail•com>
Subject: Re: linux-next: build failure after merge of the rust-xarray tree
Date: Tue, 29 Apr 2025 17:44:51 +1000 [thread overview]
Message-ID: <20250429174451.42a368af@canb.auug.org.au> (raw)
In-Reply-To: <877c344gmp.fsf@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
Hi Andreas,
On Mon, 28 Apr 2025 14:25:50 +0200 Andreas Hindborg <a.hindborg@kernel•org> wrote:
>
> The diff below should solve the conflict.
I have applied that from today and it all builds fine. Thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-04-29 7:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <tAJ0jyptJ0jLaRp9siDw8y2iw3S7GeuC05Uncum-qihlIKfCfEVhQbGNuTengQ0kWpnNp7OoTITxbEdf6nDTCw==@protonmail.internalid>
2025-04-28 10:39 ` linux-next: build failure after merge of the rust-xarray tree Stephen Rothwell
2025-04-28 10:41 ` Stephen Rothwell
2025-04-28 12:25 ` Andreas Hindborg
2025-04-29 7:44 ` Stephen Rothwell [this message]
2025-04-29 15:33 ` Miguel Ojeda
2025-05-01 8:32 ` Stephen Rothwell
2025-05-01 9:02 ` Miguel Ojeda
2025-04-30 10:23 Stephen Rothwell
2025-04-30 10:42 ` Viresh Kumar
2025-05-01 8:29 ` Stephen Rothwell
2025-05-01 9:41 ` Andreas Hindborg
2025-05-01 10:24 ` Viresh Kumar
2025-05-01 12:19 ` Stephen Rothwell
2025-05-02 5:17 ` Viresh Kumar
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=20250429174451.42a368af@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=a.hindborg@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dakr@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miguel.ojeda.sandonis@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