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

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

[Stephen Rothwell]

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

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Alexandre Belloni]

Hi Stephen and Stephen,

On 12/02/2019 13:02:38-0800, Stephen Boyd wrote:
> Quoting Stephen Rothwell (2019-02-10 21:17:31)
> > 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.
> > 
> 
> Thanks. Looks good to me.

Actually, that was my mistake and I removed it from the RTC tree. I'm
really intending for "clk: at91: fix masterck name" to go through the
clk tree. I simply forgot to remove the patch from this branch after
testing it...

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com