lkml.org 
[lkml]   [2016]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the clk tree with the samsung-krzk tree
From
Date
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




\
 
 \ /
  Last update: 2016-02-16 05:41    [W:0.038 / U:0.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site