linux-next: manual merge of the samsung-krzk tree with the omap tree

linux-next: manual merge of the samsung-krzk tree with the omap tree

[Stephen Rothwell]

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).

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/clk/Kconfig
index 5bf16ccc010b,de707b2bfb73..000000000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -202,12 -202,9 +202,10 @@@ config COMMON_CLK_CDCE70
  
  source "drivers/clk/bcm/Kconfig"
  source "drivers/clk/hisilicon/Kconfig"
+ source "drivers/clk/mvebu/Kconfig"
  source "drivers/clk/qcom/Kconfig"
+ source "drivers/clk/samsung/Kconfig"
+ source "drivers/clk/tegra/Kconfig"
 +source "drivers/clk/ti/Kconfig"
  
  endmenu
- 
- source "drivers/clk/mvebu/Kconfig"
- 
- source "drivers/clk/samsung/Kconfig"
- source "drivers/clk/tegra/Kconfig"

Re: linux-next: manual merge of the samsung-krzk tree with the omap tree

[Krzysztof Kozlowski]

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

Re: linux-next: manual merge of the samsung-krzk tree with the omap tree

[Tony Lindgren]

* 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