From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Turquette <mturquette@linaro•org>, Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sylwester Nawrocki <s.nawrocki@samsung•com>,
Kim Phillips <kim.phillips@freescale•com>
Subject: linux-next: manual merge of the clk tree with the driver-core tree
Date: Wed, 30 Jul 2014 18:57:08 +1000 [thread overview]
Message-ID: <20140730185708.12a99f00@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2014-07-30 8:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-30 8:57 Stephen Rothwell [this message]
2014-07-30 22:35 ` linux-next: manual merge of the clk tree with the driver-core tree Greg KH
2014-07-30 22:40 ` Mike Turquette
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140730185708.12a99f00@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=kim.phillips@freescale$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@linaro$(echo .)org \
--cc=s.nawrocki@samsung$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox