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

diff --cc drivers/base/platform.c
index d51514b79efedc4ad446e5ce6dd87a8ee9d2fb6d,3f8077ce585ca52ea99bf7251b446fb53f1cc7ca..42ca90ce540b7ce2e885692696318a9e34367ee6
--- 1/drivers/base/platform.c
--- 2/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@@ -20,10 -20,13 +20,14 @@@
  #include <linux/err.h>
  #include <linux/slab.h>
  #include <linux/pm_runtime.h>
+ #include <linux/idr.h>
  
  #include "base.h"
 +#include "power/power.h"
  
+ /* For automatically allocated device IDs */
+ static DEFINE_IDA(platform_devid_ida);
+ 
  #define to_platform_driver(drv)       (container_of((drv), struct platform_driver, \
                                 driver))
  

diff --cc drivers/base/power/main.c
Simple merge

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

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