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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 7 Jun 2019 09:13:09 +1000

Hi all,

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

  drivers/clk/bcm/Kconfig

between commit:

  ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig")

from Linus' tree and commit:

  5d59f12a19e6 ("clk: bcm: Make BCM2835 clock drivers selectable")

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/bcm/Kconfig
index 29ee7b776cd4,0eb281d597fc..000000000000
--- a/drivers/clk/bcm/Kconfig
+++ b/drivers/clk/bcm/Kconfig
@@@ -1,4 -1,12 +1,14 @@@
 +# SPDX-License-Identifier: GPL-2.0-only
++
+ config CLK_BCM2835
+ 	bool "Broadcom BCM2835 clock support"
+ 	depends on ARCH_BCM2835 || ARCH_BRCMSTB || COMPILE_TEST
+ 	depends on COMMON_CLK
+ 	default ARCH_BCM2835 || ARCH_BRCMSTB
+ 	help
+ 	  Enable common clock framework support for Broadcom BCM2835
+ 	  SoCs.
+ 
  config CLK_BCM_63XX
  	bool "Broadcom BCM63xx clock support"
  	depends on ARCH_BCM_63XX || COMPILE_TEST