linux-kernel - Re: 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-id: <56C2A5CD.9040603@samsung.com>
Date:	Tue, 16 Feb 2016 13:30:05 +0900
From:	Krzysztof Kozlowski <k.kozlowski@...sung.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Mike Turquette <mturquette@...libre.com>,
	Stephen Boyd <sboyd@...eaurora.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	James Liao <jamesjj.liao@...iatek.com>,
	Sylwester Nawrocki <s.nawrocki@...sung.com>,
	Arnd Bergmann <arnd@...db.de>
Subject: Re: linux-next: manual merge of the clk tree with the samsung-krzk tree

On 16.02.2016 13:11, Stephen Rothwell wrote:
> 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).

Thanks!

Stephen, Mike,
James' b9e65ebc654d looks like a simpler approach to the same problem -
moving Samsung common clocks under COMMON_CLK.

If you agree I can rebase my patch on top of it so only COMPILE_TEST
would be added.

However my third patch in that set ("arm64: EXYNOS: Consolidate
ARCH_EXYNOS7 symbol into ARCH_EXYNOS" [0]) depends on it, so maybe you
could prepare a tag with everything? James patch + two of mine (also
"clk: samsung: Don't build ARMv8 clock drivers on ARMv7")?

Best regards,
Krzysztof

[0] http://www.spinics.net/lists/devicetree/msg111893.html