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

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

diff --cc drivers/base/platform.c
index 0fb5f140f1b000737d3d90bc40733918351893a7,e1ba610482c0e5a807ec648e8948a6f6fce81073..2c36bf49094474cdb31d7ce9b7c756bb79ba6a21
--- 1/drivers/base/platform.c
--- 2/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@@ -447,7 -447,8 +447,7 @@@ void platform_device_del(struct platfor
  {
        int i;
  
-       if (pdev) {
+       if (!IS_ERR_OR_NULL(pdev)) {
 -              device_remove_properties(&pdev->dev);
                device_del(&pdev->dev);
  
                if (pdev->id_auto) {

diff --cc kernel/module.c
Simple merge