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

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

[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]

Hi all,

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

  include/linux/clk-provider.h

between commit:

  d54c1fd4a51e ("clk: Add Sunplus SP7021 clock driver")

from the clk tree and commit:

  27fc5ec673b5 ("clk: Introduce devm_clk_hw_register_gate_parent_data()")

from the clk-imx tree.

These add the same macro, but the letter has the docmenting comment wrong.

I fixed it up (I just used the former) 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 include/linux/clk-provider.h
index faad3cdc1e48,92b7c794c627..000000000000
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@@ -608,9 -608,9 +608,10 @@@ struct clk *clk_register_gate(struct de
  	__devm_clk_hw_register_gate((dev), NULL, (name), (parent_name), NULL, \
  			       NULL, (flags), (reg), (bit_idx),		      \
  			       (clk_gate_flags), (lock))
+ 
  /**
 - * devm_clk_hw_register_gate - register a gate clock with the clock framework
 + * devm_clk_hw_register_gate_parent_data - register a gate clock with the
 + * clock framework
   * @dev: device that is registering this clock
   * @name: name of this clock
   * @parent_data: parent clk data

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]