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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the clk tree with the samsung-krzk tree
Date	2016-02-16 05:20 +0100
Message-ID	<r2Fhf-2BN-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi all,

Today's linux-next merge of the clk tree got a conflict in:

  drivers/clk/Kconfig
  drivers/clk/samsung/Kconfig

between commit:

  fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks")

from the samsung-krzk tree and commit:

  b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")

from the clk tree.

I fixed it up (they both had similar effects) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell

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

Thread

linux-next: manual merge of the clk tree with the samsung-krzk tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-16 05:20 +0100
  Re: linux-next: manual merge of the clk tree with the samsung-krzk tree Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-02-16 05:40 +0100

csiph-web