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

[Stephen Rothwell]

Hi all,

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

  drivers/clk/at91/sama5d2.c

between commit:

  77977b800451 ("clk: at91: enable AUDIOPLL as source for PCKx on SAMA5D2")

from the clk tree and commit:

  34d2ff2a6019 ("clk: at91: fix masterck name")

from the rtc 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/at91/sama5d2.c
index ade063622531,cd0ef7274fdb..000000000000
--- a/drivers/clk/at91/sama5d2.c
+++ b/drivers/clk/at91/sama5d2.c
@@@ -240,8 -240,7 +240,8 @@@ static void __init sama5d2_pmc_setup(st
  	parent_names[1] = "mainck";
  	parent_names[2] = "plladivck";
  	parent_names[3] = "utmick";
- 	parent_names[4] = "mck";
+ 	parent_names[4] = "masterck";
 +	parent_names[5] = "audiopll_pmcck";
  	for (i = 0; i < 3; i++) {
  		char name[6];

Attachment: pgpEQw0Rt30CL.pgp
Description: OpenPGP digital signature