Re: linux-next: manual merge of the pwm tree with the rust tree

Hi Mark,

The conflict should be between PWM and either drm-rust or driver-core, which
both share commit 7488dc14b05aa ("rust: io: mem: return DevresLt from
IoMem/ExclusiveIoMem::into_devres()") through a shared signed tag, depending on
what you merge first (I think it is drm-rust).

On Tue Aug 11, 2026 at 5:21 PM CEST, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the pwm tree got a conflict in:
>
>   drivers/pwm/pwm_th1520.rs
>
> between commit:
>
>   7488dc14b05aa ("rust: io: mem: return DevresLt from IoMem/ExclusiveIoMem::into_devres()")
>
> from the rust tree and commit:
>
>   b4e94b0418ad6 ("pwm: th1520: use vertical import style")
>
> from the pwm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Looks good to me, thanks!