From: Andreas Hindborg <a.hindborg@kernel.org>
To: "Viresh Kumar" <viresh.kumar@linaro.org>
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
"Tamir Duberstein" <tamird@gmail.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the rust-xarray tree
Date: Thu, 01 May 2025 11:41:30 +0200 [thread overview]
Message-ID: <87selo1xdh.fsf@kernel.org> (raw)
In-Reply-To: <20250430104234.dmwnn5ih232kfk4z@vireshk-i7> (Viresh Kumar's message of "Wed, 30 Apr 2025 16:12:34 +0530")
"Viresh Kumar" <viresh.kumar@linaro.org> writes:
> On 30-04-25, 20:23, Stephen Rothwell wrote:
>> Caused by commit
>>
>> a68f46e83747 ("rust: types: add `ForeignOwnable::PointedTo`")
>>
>> interacting with commit
>>
>> 254df142ab42 ("rust: cpufreq: Add initial abstractions for cpufreq framework")
>>
>> from the cpufreq-arm tree.
>>
>> I don't know how to fix this up, so I have dropped the rust-xarray tree
>> for today.
>
> Probably this:
>
> diff --git a/rust/kernel/cpufreq.rs b/rust/kernel/cpufreq.rs
> index 49246e50f67e..82d20b999e6c 100644
> --- a/rust/kernel/cpufreq.rs
> +++ b/rust/kernel/cpufreq.rs
> @@ -630,7 +630,7 @@ pub fn data<T: ForeignOwnable>(&mut self) -> Option<<T>::Borrowed<'_>> {
> None
> } else {
> // SAFETY: The data is earlier set from [`set_data`].
> - Some(unsafe { T::borrow(self.as_ref().driver_data) })
> + Some(unsafe { T::borrow(self.as_ref().driver_data.cast()) })
> }
> }
>
> @@ -657,7 +657,7 @@ fn clear_data<T: ForeignOwnable>(&mut self) -> Option<T> {
> let data = Some(
> // SAFETY: The data is earlier set by us from [`set_data`]. It is safe to take
> // back the ownership of the data from the foreign interface.
> - unsafe { <T as ForeignOwnable>::from_foreign(self.as_ref().driver_data) },
> + unsafe { <T as ForeignOwnable>::from_foreign(self.as_ref().driver_data.cast()) },
> );
> self.as_mut_ref().driver_data = ptr::null_mut();
> data
>
>
> Andreas, is your xarray-next branch immmutable ? I can rebase over the
> change then.
I might add tags. But I guess now that Stephen carries the merge
resolution, we should be fine? Not sure what the preferred approach is
for this situation.
Best regards,
Andreas Hindborg
next prev parent reply other threads:[~2025-05-01 10:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-30 10:23 linux-next: build failure after merge of the rust-xarray tree Stephen Rothwell
2025-04-30 10:42 ` Viresh Kumar
2025-05-01 8:29 ` Stephen Rothwell
2025-05-01 9:41 ` Andreas Hindborg [this message]
2025-05-01 10:24 ` Viresh Kumar
2025-05-01 12:19 ` Stephen Rothwell
2025-05-02 5:17 ` Viresh Kumar
[not found] <tAJ0jyptJ0jLaRp9siDw8y2iw3S7GeuC05Uncum-qihlIKfCfEVhQbGNuTengQ0kWpnNp7OoTITxbEdf6nDTCw==@protonmail.internalid>
2025-04-28 10:39 ` Stephen Rothwell
2025-04-28 10:41 ` Stephen Rothwell
2025-04-28 12:25 ` Andreas Hindborg
2025-04-29 7:44 ` Stephen Rothwell
2025-04-29 15:33 ` Miguel Ojeda
2025-05-01 8:32 ` Stephen Rothwell
2025-05-01 9:02 ` Miguel Ojeda
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=87selo1xdh.fsf@kernel.org \
--to=a.hindborg@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tamird@gmail.com \
--cc=viresh.kumar@linaro.org \
/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