Merge remote-tracking branch 'driver-core/driver-core-next'

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

diff --cc drivers/base/dd.c
index aeb744891e44e290890c713cfa7cc9e33d699bc3,49a4a12fafef176506a46063b390a194b29e9db4..e843fdbe492514d83fd1f66cfc8678b10099e877
--- 1/drivers/base/dd.c
--- 2/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@@ -328,12 -319,11 +328,13 @@@ probe_failed
        driver_sysfs_remove(dev);
        dev->driver = NULL;
        dev_set_drvdata(dev, NULL);
 +      if (dev->pm_domain && dev->pm_domain->dismiss)
 +              dev->pm_domain->dismiss(dev);
  
-       if (ret == -EPROBE_DEFER) {
+       switch (ret) {
+       case -EPROBE_DEFER:
                /* Driver requested deferred probing */
-               dev_info(dev, "Driver %s requests probe deferral\n", drv->name);
+               dev_dbg(dev, "Driver %s requests probe deferral\n", drv->name);
                driver_deferred_probe_add(dev);
                /* Did a trigger occur while probing? Need to re-trigger if yes */
                if (local_trigger_count != atomic_read(&deferred_trigger_count))

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

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

diff --cc include/linux/device.h
Simple merge