Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1348566

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

Show all headers | View raw

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"

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the samsung-krzk tree with the omap  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-02 23:20 +0100
  Re: linux-next: manual merge of the samsung-krzk tree with the omap  tree Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-03-03 00:50 +0100
  Re: linux-next: manual merge of the samsung-krzk tree with the omap  tree Tony Lindgren <tony@atomide.com> - 2016-03-03 17:40 +0100

csiph-web