linux-kernel - linux-next: manual merge of the akpm tree with the clk tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20140930193752.3f0ae731@canb.auug.org.au>
Date:	Tue, 30 Sep 2014 19:37:52 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Mike Turquette <mturquette@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Heiko Stübner <heiko@...ech.de>
Subject: linux-next: manual merge of the akpm tree with the clk tree

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@...b.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)

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)