linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <521C7AF0.1020903@imgtec.com>
Date:	Tue, 27 Aug 2013 11:09:52 +0100
From:	James Hogan <james.hogan@...tec.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Mike Turquette <mturquette@...aro.org>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Soren Brinkmann <soren.brinkmann@...inx.com>,
	Michal Simek <michal.simek@...inx.com>
Subject: Re: linux-next: manual merge of the clk tree with Linus' tree

On 27/08/13 10:03, Stephen Rothwell wrote:
> 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).

The case you mentioned looks correct to me.

I can't see todays -next yet, but if by "choose CLK_SET_RATE_NO_REPARENT
over CLK_SET_RATE_PARENT" you mean one branch adds CLK_SET_RATE_PARENT,
clk-next adds CLK_SET_RATE_NO_REPARENT, and the resolution ends up with
only CLK_SET_RATE_NOREPARENT then that sounds wrong, as the two flags
are orthogonal.

Thanks
James


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