* linux-next: manual merge of the clk tree with the driver-core tree
@ 2014-07-30 8:57 Stephen Rothwell
2014-07-30 22:35 ` Greg KH
2014-07-30 22:40 ` Mike Turquette
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2014-07-30 8:57 UTC (permalink / raw)
To: Mike Turquette, Greg KH
Cc: linux-next, linux-kernel, Sylwester Nawrocki, Kim Phillips
[-- Attachment #1: Type: text/plain, Size: 877 bytes --]
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@canb.auug.org.au
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the clk tree with the driver-core tree
2014-07-30 8:57 linux-next: manual merge of the clk tree with the driver-core tree Stephen Rothwell
@ 2014-07-30 22:35 ` Greg KH
2014-07-30 22:40 ` Mike Turquette
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2014-07-30 22:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mike Turquette, linux-next, linux-kernel, Sylwester Nawrocki,
Kim Phillips
On Wed, Jul 30, 2014 at 06:57:08PM +1000, Stephen Rothwell wrote:
> 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).
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the clk tree with the driver-core tree
2014-07-30 8:57 linux-next: manual merge of the clk tree with the driver-core tree Stephen Rothwell
2014-07-30 22:35 ` Greg KH
@ 2014-07-30 22:40 ` Mike Turquette
1 sibling, 0 replies; 3+ messages in thread
From: Mike Turquette @ 2014-07-30 22:40 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH
Cc: linux-next, linux-kernel, Sylwester Nawrocki, Kim Phillips
Quoting Stephen Rothwell (2014-07-30 01:57:08)
> 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).
Looks good to me.
Thanks,
Mike
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> 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"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-07-30 22:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-30 8:57 linux-next: manual merge of the clk tree with the driver-core tree Stephen Rothwell
2014-07-30 22:35 ` Greg KH
2014-07-30 22:40 ` Mike Turquette
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).