linux-kernel - linux-next: manual merge of the clk tree with Linus' 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130827190304.c3f2f891f20d078d66b703b1@canb.auug.org.au>
Date:	Tue, 27 Aug 2013 19:03:04 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mike Turquette <mturquette@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	James Hogan <james.hogan@...tec.com>,
	Soren Brinkmann <soren.brinkmann@...inx.com>,
	Michal Simek <michal.simek@...inx.com>
Subject: linux-next: manual merge of the clk tree with Linus' tree

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
drivers/clk/zynq/clkc.c between commits 252957cc3a2d ("clk/zynq/clkc: Add
dedicated spinlock for the SWDT") and 765b7d4c4cb3
("clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes") from
Linus' tree and commit 819c1de344c5 ("clk: add CLK_SET_RATE_NO_REPARENT
flag") from the clk tree.

I fixed it up (see below and in a couple of places I chose
CLK_SET_RATE_NO_REPARENT over CLK_SET_RATE_PARENT, which may, of course,
be wrong) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/clk/zynq/clkc.c
index 089d3e3,e05c9e3..0000000
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@@ -293,8 -294,9 +295,9 @@@ static void __init zynq_clk_setup(struc
  			swdt_ext_clk_mux_parents[i + 1] = dummy_nm;
  	}
  	clks[swdt] = clk_register_mux(NULL, clk_output_name[swdt],
- 			swdt_ext_clk_mux_parents, 2, CLK_SET_RATE_PARENT,
- 			SLCR_SWDT_CLK_SEL, 0, 1, 0, &swdtclk_lock);
+ 			swdt_ext_clk_mux_parents, 2, CLK_SET_RATE_PARENT |
+ 			CLK_SET_RATE_NO_REPARENT, SLCR_SWDT_CLK_SEL, 0, 1, 0,
 -			&gem0clk_lock);
++			&swdtclk_lock);

  	/* DDR clocks */
  	clk = clk_register_divider(NULL, "ddr2x_div", "ddrpll", 0,

Content of type "application/pgp-signature" skipped