Merge v5.7-rc5 into driver-core-next

We want the driver core fixes in here and this resolves a merge issue
with drivers/base/dd.c

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

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/base/dd.c
index efe6df5,94037be..48ca81c
--- 1/drivers/base/dd.c
--- 2/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@@ -266,8 -258,8 +258,8 @@@ int driver_deferred_probe_check_state(s
                return -ENODEV;
        }
  
-       if (!driver_deferred_probe_timeout) {
-               dev_WARN(dev, "deferred probe timeout, ignoring dependency\n");
+       if (!driver_deferred_probe_timeout && initcalls_done) {
 -              dev_warn(dev, "deferred probe timeout, ignoring dependency");
++              dev_warn(dev, "deferred probe timeout, ignoring dependency\n");
                return -ETIMEDOUT;
        }
  
@@@ -283,7 -275,8 +275,8 @@@ static void deferred_probe_timeout_work
        flush_work(&deferred_probe_work);
  
        list_for_each_entry_safe(private, p, &deferred_probe_pending_list, deferred_probe)
 -              dev_info(private->device, "deferred probe pending");
 +              dev_info(private->device, "deferred probe pending\n");
+       wake_up(&probe_timeout_waitqueue);
  }
  static DECLARE_DELAYED_WORK(deferred_probe_timeout_work, deferred_probe_timeout_work_func);
  

diff --cc drivers/base/platform.c
Simple merge