[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Thu, 3 Mar 2016 08:32:13 -0800
From: Tony Lindgren <tony@...mide.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Krzysztof Kozlowski <k.kozlowski@...sung.com>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Michael Turquette <mturquette@...libre.com>,
James Liao <jamesjj.liao@...iatek.com>,
Stephen Boyd <sboyd@...eaurora.org>
Subject: Re: linux-next: manual merge of the samsung-krzk tree with the omap
tree
* Stephen Rothwell <sfr@...b.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
Powered by blists - more mailing lists