linux-next: manual merge of the clk tree with the driver-core tree

[Stephen Rothwell]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
drivers/base/platform.c between commit 3d713e0e382e ("driver core:
platform: add device binding path 'driver_override'") from the
driver-core tree and commit 86be408bfbd8 ("clk: Support for clock
parents and rates assigned from device tree") from the clk tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/base/platform.c
index 7cc7440b014d,ac47643b1b69..000000000000
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@@ -23,7 -23,7 +23,8 @@@
  #include <linux/pm_runtime.h>
  #include <linux/idr.h>
  #include <linux/acpi.h>
 +#include <linux/limits.h>
+ #include <linux/clk/clk-conf.h>
  
  #include "base.h"
  #include "power/power.h"

Attachment: signature.asc
Description: PGP signature