Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1334991 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-02-16 05:20 +0100 |
| Last post | 2016-02-16 05:40 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the clk tree with the samsung-krzk tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-16 05:20 +0100
Re: linux-next: manual merge of the clk tree with the samsung-krzk tree Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-02-16 05:40 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-02-16 05:20 +0100 |
| Subject | linux-next: manual merge of the clk tree with the samsung-krzk tree |
| Message-ID | <r2Fhf-2BN-1@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Krzysztof Kozlowski <k.kozlowski@samsung.com> |
|---|---|
| Date | 2016-02-16 05:40 +0100 |
| Message-ID | <r2FAB-2Jt-1@gated-at.bofh.it> |
| In reply to | #1334991 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web