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

[Mark Brown]

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: signature.asc
Description: PGP signature