lkml.org 
[lkml]   [2016]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the samsung-krzk tree with the omap tree
* Stephen Rothwell <sfr@canb.auug.org.au> [160302 14:16]:
> 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 yes that's correct thanks!

Regards,

Tony

\
 
 \ /
  Last update: 2016-03-03 18:01    [W:1.490 / U:0.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site