linux-next: manual merge of the clk tree with the mips tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi all,

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

  drivers/clk/Kconfig

between commit:

  ce6e11884659 ("CLK: microchip: Add Microchip PIC32 clock driver.")

from the mips tree and commit:

  0bbd72b4c64f ("clk: Add Oxford Semiconductor OXNAS Standard Clocks")

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 90518cd7fc9c,2dd371deb23b..000000000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -197,9 -197,12 +197,15 @@@ config COMMON_CLK_PX
  	---help---
  	  Support for the Marvell PXA SoC.
  
 +config COMMON_CLK_PIC32
 +	def_bool COMMON_CLK && MACH_PIC32
 +
+ config COMMON_CLK_OXNAS
+ 	bool "Clock driver for the OXNAS SoC Family"
+ 	select MFD_SYSCON
+ 	---help---
+ 	  Support for the OXNAS SoC Family clocks.
+ 
  source "drivers/clk/bcm/Kconfig"
  source "drivers/clk/hisilicon/Kconfig"
  source "drivers/clk/mvebu/Kconfig"