Difference between v4.19.88-cip16-rebase..v4.19.88-cip16 was Re: Getting older -cip-rebase versions

Commit Message

Pavel Machek Jan. 7, 2020, 12:06 p.m. UTC

Hi!

> > Is there way to get to that version? Would it be possible to keep those
> > tags in future?
> 
> Please use 'git fetch --tags' .
> With git normal commands, you can only get tags that are reachable from the branch.
> In this case, execute as above.

Thanks a lot for the pointer.

I'm trying to prepare -cip-rt release, and I ran into differences I
could not explain. After some head scratching, I realized they are in
-cip, too:

Comments

Nobuhiro Iwamatsu Jan. 8, 2020, 4:02 a.m. UTC | #1

Hi Paval,

Thanks for your email!

> -----Original Message-----
> From: Pavel Machek [mailto:[e-mail]]
> Sent: Tuesday, January 7, 2020 9:06 PM
> To: iwamatsu nobuhiro(岩松 信洋 ○ＳＷＣ□ＯＳＴ)
> <[e-mail]>
> Cc: [e-mail]
> Subject: Difference between v4.19.88-cip16-rebase..v4.19.88-cip16 was
> Re: [cip-dev] Getting older -cip-rebase versions
> 
> Hi!
> 
> > > Is there way to get to that version? Would it be possible to keep
> > > those tags in future?
> >
> > Please use 'git fetch --tags' .
> > With git normal commands, you can only get tags that are reachable from
> the branch.
> > In this case, execute as above.
> 
> Thanks a lot for the pointer.
> 
> I'm trying to prepare -cip-rt release, and I ran into differences I could
> not explain. After some head scratching, I realized they are in -cip,
> too:
> 
> diff v4.19.88-cip16-rebase..v4.19.88-cip16.

That's my bad.
I missed to cherry-pick b03f03030171c862ff1f6968e5413e5d8c4f651a and 
fixing merge conflict on -rebase branch.

> 
> One more line of difference exists in newer version: git diff
> v4.19.91-cip17-rebase..v4.19.91-cip17
> 

This is the same.
I missed to fixing merge conflict on -cip branch.

> Any idea what is going on there? Which version is ok and which should
> be adjusted?

I already fixed these issue on local repository.
Since first issue is on -rebase branch, I don't think it will have a big impact.
Second issue is on cip branch, I will need to do force push and re-tag.

Also, to avoid the same problem, I will add a step to check the differences when rebase and merge.

> 
> Best regards,
> 
> 	Pavel
> 

Best regards,
  Nobuhiro

Ben Hutchings Jan. 10, 2020, 6:29 p.m. UTC | #2

On Wed, 2020-01-08 at 04:02 +0000, [e-mail] wrote:
[...]
> > Any idea what is going on there? Which version is ok and which should
> > be adjusted?
> 
> I already fixed these issue on local repository.
> Since first issue is on -rebase branch, I don't think it will have a big impact.
> Second issue is on cip branch, I will need to do force push and re-tag.
> 
> Also, to avoid the same problem, I will add a step to check the differences when rebase and merge.

Anyone who has pulled the wrong tags already won't see updated tags. 
So at this point I would suggest using new names for the fixed tags
(e.g. -rebase-2).

Maybe it is worthwhile to test in CI for the -rc repository that the
rebased branches match the corresponding non-rebased branches?  (It is
probably not reasonable to require that this is true at other times.)

Ben.

Chris Paterson Jan. 13, 2020, 11:23 a.m. UTC | #3

> From: cip-dev <[e-mail]> On Behalf Of Ben
> Hutchings
> Sent: 10 January 2020 18:30
> 
> On Wed, 2020-01-08 at 04:02 +0000, [e-mail]
> wrote:
> [...]
> > > Any idea what is going on there? Which version is ok and which should
> > > be adjusted?
> >
> > I already fixed these issue on local repository.
> > Since first issue is on -rebase branch, I don't think it will have a big impact.
> > Second issue is on cip branch, I will need to do force push and re-tag.
> >
> > Also, to avoid the same problem, I will add a step to check the differences
> when rebase and merge.
> 
> Anyone who has pulled the wrong tags already won't see updated tags.
> So at this point I would suggest using new names for the fixed tags
> (e.g. -rebase-2).
> 
> Maybe it is worthwhile to test in CI for the -rc repository that the
> rebased branches match the corresponding non-rebased branches?  (It is
> probably not reasonable to require that this is true at other times.)

Sounds like a plan. I'll add it to my backlog, unless anyone else is keen.

Kind regards, Chris

> 
> Ben.
> 
> --
> Ben Hutchings, Software Developer                         Codethink Ltd
> https://www.codethink.co.uk/                 Dale House, 35 Dale Street
>                                      Manchester, M1 2HF, United Kingdom
> 
> _______________________________________________
> cip-dev mailing list
> [e-mail]
> https://lists.cip-project.org/mailman/listinfo/cip-dev

Patch

diff v4.19.88-cip16-rebase..v4.19.88-cip16.

One more line of difference exists in newer version: git diff
v4.19.91-cip17-rebase..v4.19.91-cip17

Any idea what is going on there? Which version is ok and which should
be adjusted?

Best regards,
									Pavel

diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
index 86228e0596cb..570093ce77be 100644
--- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
@@ -1550,56 +1550,267 @@ 
 				};
 			};
 
+			rcar_sound,ssiu {
+				ssiu00: ssiu-0 {
+					dmas = <&audma0 0x15>, <&audma1 0x16>;
+					dma-names = "rx", "tx";
+				};
...
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7264.c
@@ -1766,7 +1766,6 @@  static const struct pinmux_cfg_reg pinmux_config_regs[] = {
 		PF0MD_000, PF0MD_001, PF0MD_010, PF0MD_011,
 		PF0MD_100, PF0MD_101, 0, 0,
 		0, 0, 0, 0, 0, 0, 0, 0 ))
-	 }
 	},
 
 	{ PINMUX_CFG_REG("PFIOR0", 0xfffe38b2, 16, 1, GROUP(


-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany