linux-kernel - linux-next: manual merge of the clk tree with the samsung-krzk 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20160216151131.3e1d4cb5@canb.auug.org.au>
Date:	Tue, 16 Feb 2016 15:11:31 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mike Turquette <mturquette@...libre.com>,
	Stephen Boyd <sboyd@...eaurora.org>,
	Krzysztof Kozlowski <k.kozlowski@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	James Liao <jamesjj.liao@...iatek.com>
Subject: linux-next: manual merge of the clk tree with the samsung-krzk tree

Hi all,

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

  drivers/clk/Kconfig
  drivers/clk/samsung/Kconfig

between commit:

  fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks")

from the samsung-krzk tree and commit:

  b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")

from the clk tree.

I fixed it up (they both had similar effects) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell