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

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

[Mark Brown]

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

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. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/pwm/pwm_th1520.rs
index e4387f4fedd9b,543bd8dea846b..0000000000000
--- a/drivers/pwm/pwm_th1520.rs
+++ b/drivers/pwm/pwm_th1520.rs
@@@ -20,16 -20,24 +20,22 @@@
  //!   this method is not used in this driver.
  //!
  
 -use core::ops::Deref;
  use kernel::{
      clk::Clk,
-     device::{Bound, Core, Device},
+     device::{
+         Bound,
+         Core,
+         Device, //
+     },
 -    devres,
      io::{
 -        mem::IoMem,
 +        mem::DevresIoMem,
          Io, //
      },
-     of, platform,
+     of,
+     platform,
      prelude::*,
-     pwm, time,
+     pwm,
+     time, //
  };
  
  const TH1520_MAX_PWM_NUM: u32 = 6;

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

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

[Danilo Krummrich]

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!