linux-next: build failure after merge of the rust tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]

Hi all,

After merging the rust tree, today's linux-next build (x86_64
allmodconfig) failed like this:

error[E0603]: trait import `PinInit` is private
   --> rust/kernel/time/hrtimer.rs:71:19
    |
71  | use crate::{init::PinInit, prelude::*, time::Ktime, types::Opaque};
    |                   ^^^^^^^ private trait import
    |
note: the trait import `PinInit` is defined here...
   --> rust/kernel/init.rs:141:64
    |
141 | use pin_init::{init_from_closure, pin_init_from_closure, Init, PinInit};
    |                                                                ^^^^^^^
note: ...and refers to the trait `PinInit` which is defined here
   --> rust/pin-init/src/lib.rs:1003:1
    |
    = note: you could import this directly
help: import `PinInit` directly
    |
71  | use crate::{pin_init::PinInit, prelude::*, time::Ktime, types::Opaque};
    |             ~~~~~~~~~~~~~~~~~

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0603`.

Presumably this is caused by my merge resolutions :-(  Please have a
look and let me know what te resolutions should be.

I have used the rust tree from next-20250314 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]