From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Mike Turquette <mturquette@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Heiko Stübner" <heiko@sntech•de>
Subject: linux-next: manual merge of the akpm tree with the clk tree
Date: Tue, 30 Sep 2014 19:37:52 +1000 [thread overview]
Message-ID: <20140930193752.3f0ae731@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/clk/rockchip/clk.h between commit f6fba5f6967d ("clk: rockchip:
add new clock-type for the cpuclk") from the clk tree and commit "clk:
rockchip: add restart handler" from the akpm 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/clk/rockchip/clk.h
index f4791fbb3da9,2f0236a00664..000000000000
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@@ -361,11 -329,7 +361,12 @@@ void rockchip_clk_register_branches(str
unsigned int nr_clk);
void rockchip_clk_register_plls(struct rockchip_pll_clock *pll_list,
unsigned int nr_pll, int grf_lock_offset);
+void rockchip_clk_register_armclk(unsigned int lookup_id, const char *name,
+ const char **parent_names, u8 num_parents,
+ const struct rockchip_cpuclk_reg_data *reg_data,
+ const struct rockchip_cpuclk_rate_table *rates,
+ int nrates);
+ void rockchip_register_restart_notifier(unsigned int reg);
void rockchip_clk_protect_critical(const char *clocks[], int nclocks);
#define ROCKCHIP_SOFTRST_HIWORD_MASK BIT(0)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-09-30 9:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20140930193752.3f0ae731@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=heiko@sntech$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@linaro$(echo .)org \
/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