linux-kernel - linux-next: manual merge of the clk tree with the sunxi 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: <20160301150700.650fbd3e@canb.auug.org.au>
Date:	Tue, 1 Mar 2016 15:07:00 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mike Turquette <mturquette@...libre.com>,
	Stephen Boyd <sboyd@...eaurora.org>,
	Maxime Ripard <maxime.ripard@...e-electrons.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Chen-Yu Tsai <wens@...e.org>
Subject: linux-next: manual merge of the clk tree with the sunxi tree

Hi all,

Today's linux-next merge of the clk tree got a conflict in:

  drivers/clk/sunxi/clk-sun6i-ar100.c

between commit:

  3ca2377b6fed ("clk: sunxi: rewrite sun6i-ar100 using factors clk")

from the sunxi tree and commit:

  36bf2811416c ("clk: sunxi: Use proper type for of_clk_get_parent_count() return value")

from the clk tree.

I fixed it up (the former removed the code updated by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell