On 03.03.2016 07:16, Stephen Rothwell wrote:
> Hi Krzysztof,
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>
> drivers/clk/Kconfig
>
> between commit:
>
> 21330497f303 ("clk: ti: Add support for dm814x ADPLL")
>
> from the omap tree and commit:
>
> b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")
>
> from the samsung-krzk tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Thanks!
The conflicting commit actually comes from clk tree, merged here as a
dependency for other patches.
Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
