linux-next: manual merge of the rust tree with the driver-core tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the rust tree got a conflict in:

  drivers/cpufreq/rcpufreq_dt.rs

between commit:

  d3393e845038 ("rust: device: Move property_present() to FwNode")

from the driver-core tree and commit:

  f411b7eddde8 ("rust: kernel: remove `fmt!`, fix clippy::uninlined-format-args")

from the rust 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/cpufreq/rcpufreq_dt.rs
index 9ad85fe6fd05,4608d2286fa1..000000000000
--- a/drivers/cpufreq/rcpufreq_dt.rs
+++ b/drivers/cpufreq/rcpufreq_dt.rs
@@@ -19,9 -18,8 +18,9 @@@ use kernel::
  
  /// Finds exact supply name from the OF node.
  fn find_supply_name_exact(dev: &Device, name: &str) -> Option<CString> {
-     let prop_name = CString::try_from_fmt(fmt!("{}-supply", name)).ok()?;
+     let prop_name = CString::try_from_fmt(fmt!("{name}-supply")).ok()?;
 -    dev.property_present(&prop_name)
 +    dev.fwnode()?
 +        .property_present(&prop_name)
          .then(|| CString::try_from_fmt(fmt!("{name}")).ok())
          .flatten()
  }

Attachment: pgpyNDA9xYwid.pgp
Description: OpenPGP digital signature