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

[Stephen Rothwell]

Hi all,

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

error[E0277]: the trait bound `core::result::Result<core::pin::Pin<Box<Th1520PwmPlatformDriver, Kmalloc>>, kernel::error::Error>: PinInit<Th1520PwmPlatformDriver, kernel::error::Error>` is not satisfied
   --> drivers/pwm/pwm_th1520.rs:331:10
    |
331 |     ) -> Result<Pin<KBox<Self>>> {
    |          ^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
    |
    = help: the trait `PinInit<Th1520PwmPlatformDriver, kernel::error::Error>` is not implemented for `Result<Pin<Box<Th1520PwmPlatformDriver, Kmalloc>>, Error>`
            but trait `PinInit<core::pin::Pin<Box<Th1520PwmPlatformDriver, Kmalloc>>, kernel::error::Error>` is implemented for it
    = help: for that trait implementation, expected `core::pin::Pin<Box<Th1520PwmPlatformDriver, Kmalloc>>`, found `Th1520PwmPlatformDriver`
note: required by a bound in `kernel::platform::Driver::{synthetic#0}`
   --> rust/kernel/platform.rs:196:15
    |
196 |     ) -> impl PinInit<Self, Error>;
    |               ^^^^^^^^^^^^^^^^^^^^ required by this bound in `Driver::{synthetic#0}`

error: aborting due to 1 previous error

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

Caused by commit

  fb3957af9ec6 ("pwm: Add Rust driver for T-HEAD TH1520 SoC")

presumably interacting with something merged earlier in my tree.
If someone could provide me with an appropriate merge resolution, I will
apply it.

I have used the pwm tree from next-20251024 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpP4rRwZOWSL.pgp
Description: OpenPGP digital signature