Merge tag 'v5.12-rc7' into driver-core-next

We need the driver core fix in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/base/dd.c
index 2f00d1d5b414da3adec9d709c8bb56cb64613c15,37a5e5f8b2219e3a50d7d587a6d94c9d8da35971..ecd7cf848daff7ea3522cb18f568f2203c5a522b
--- 1/drivers/base/dd.c
--- 2/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@@ -299,10 -292,8 +299,10 @@@ int driver_deferred_probe_check_state(s
  
  static void deferred_probe_timeout_work_func(struct work_struct *work)
  {
-       struct device_private *private, *p;
+       struct device_private *p;
  
 +      fw_devlink_drivers_done();
 +
        driver_deferred_probe_timeout = 0;
        driver_deferred_probe_trigger();
        flush_work(&deferred_probe_work);

diff --cc drivers/clk/clk.c
Simple merge

diff --cc drivers/of/property.c
index 2bb3158c9e43d1188ad0e0562f1b9b52498946ae,78427c85bef38737d850905a1adb143dbfbb930b..aab6383f02198928f47319f9e70ef8b076dd2c00
--- 1/drivers/of/property.c
--- 2/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1268,10 -1260,18 +1268,19 @@@ DEFINE_SIMPLE_PROP(pinctrl5, "pinctrl-5
  DEFINE_SIMPLE_PROP(pinctrl6, "pinctrl-6", NULL)
  DEFINE_SIMPLE_PROP(pinctrl7, "pinctrl-7", NULL)
  DEFINE_SIMPLE_PROP(pinctrl8, "pinctrl-8", NULL)
 +DEFINE_SIMPLE_PROP(remote_endpoint, "remote-endpoint", NULL)
  DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
  DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
- DEFINE_SUFFIX_PROP(gpios, "-gpios", "#gpio-cells")
+ 
+ static struct device_node *parse_gpios(struct device_node *np,
+                                      const char *prop_name, int index)
+ {
+       if (!strcmp_suffix(prop_name, ",nr-gpios"))
+               return NULL;
+ 
+       return parse_suffix_prop_cells(np, prop_name, index, "-gpios",
+                                      "#gpio-cells");
+ }
  
  static struct device_node *parse_iommu_maps(struct device_node *np,
                                            const char *prop_name, int index)