linux-next: manual merge of the clk tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  drivers/clk/Kconfig

between commit:

  aa091a6a91df ("clk: lan966x: Fix linking error")

from Linus' tree and commit:

  7cd5c56054f8 ("clk: COMMON_CLK_LAN966X should depend on SOC_LAN966")

from the clk tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/clk/Kconfig
index d4d67fbae869,d8c5f30487a9..000000000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -231,8 -241,7 +241,9 @@@ config COMMON_CLK_GEMIN
  
  config COMMON_CLK_LAN966X
  	bool "Generic Clock Controller driver for LAN966X SoC"
+ 	depends on SOC_LAN966 || COMPILE_TEST
 +	depends on HAS_IOMEM
 +	depends on OF
  	help
  	  This driver provides support for Generic Clock Controller(GCK) on
  	  LAN966X SoC. GCK generates and supplies clock to various peripherals

Attachment: pgpePNi73MzLM.pgp
Description: OpenPGP digital signature