* [cip-dev] Getting older -cip-rebase versions
@ 2019-12-29 17:25 Pavel Machek
2020-01-06 0:39 ` nobuhiro1.iwamatsu at toshiba.co.jp
0 siblings, 1 reply; 6+ messages in thread
From: Pavel Machek @ 2019-12-29 17:25 UTC (permalink / raw)
To: cip-dev
Hi!
To prepare -cip-rt-rebase, I'd like to start with -cip-rebase. That
seems to be easy with latest version, but not with the older ones:
pavel at duo:~/cip/k$ git show v4.19.91-cip17-rebase
tag v4.19.91-cip17-rebase
commit 0c809da57d1f66315f0d75cab818cf1121ba652c (tag: v4.19.91-cip17-rebase, origin/linux-4.19.y-cip-rebase)
Author: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Date: Sat Dec 28 05:55:06 2019 +0900
CIP: Bump version suffix to -cip17 after merge from stable
pavel at duo:~/cip/k$ git show v4.19.88-cip16-rebase
fatal: ambiguous argument 'v4.19.88-cip16-rebase': unknown revision or path not in the working tree.
Is there way to get to that version? Would it be possible to keep
those tags in future?
Thanks,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191229/eabe499a/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [cip-dev] Getting older -cip-rebase versions
2019-12-29 17:25 [cip-dev] Getting older -cip-rebase versions Pavel Machek
@ 2020-01-06 0:39 ` nobuhiro1.iwamatsu at toshiba.co.jp
2020-01-07 12:06 ` [cip-dev] Difference between v4.19.88-cip16-rebase..v4.19.88-cip16 was " Pavel Machek
0 siblings, 1 reply; 6+ messages in thread
From: nobuhiro1.iwamatsu at toshiba.co.jp @ 2020-01-06 0:39 UTC (permalink / raw)
To: cip-dev
Hi Pavel,
> -----Original Message-----
> From: cip-dev [mailto:cip-dev-bounces at lists.cip-project.org] On Behalf
> Of Pavel Machek
> Sent: Monday, December 30, 2019 2:26 AM
> To: iwamatsu at nigauri.org; cip-dev at lists.cip-project.org
> Subject: [cip-dev] Getting older -cip-rebase versions
>
> Hi!
>
> To prepare -cip-rt-rebase, I'd like to start with -cip-rebase. That seems
> to be easy with latest version, but not with the older ones:
>
> pavel at duo:~/cip/k$ git show v4.19.91-cip17-rebase tag
> v4.19.91-cip17-rebase commit 0c809da57d1f66315f0d75cab818cf1121ba652c
> (tag: v4.19.91-cip17-rebase, origin/linux-4.19.y-cip-rebase)
> Author: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> Date: Sat Dec 28 05:55:06 2019 +0900
>
> CIP: Bump version suffix to -cip17 after merge from stable
>
> pavel at duo:~/cip/k$ git show v4.19.88-cip16-rebase
> fatal: ambiguous argument 'v4.19.88-cip16-rebase': unknown revision or
> path not in the working tree.
>
> 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.
Best regards,
Nobuhiro
^ permalink raw reply [flat|nested] 6+ messages in thread
* [cip-dev] Difference between v4.19.88-cip16-rebase..v4.19.88-cip16 was Re: Getting older -cip-rebase versions
2020-01-06 0:39 ` nobuhiro1.iwamatsu at toshiba.co.jp
@ 2020-01-07 12:06 ` Pavel Machek
2020-01-08 4:02 ` nobuhiro1.iwamatsu at toshiba.co.jp
0 siblings, 1 reply; 6+ messages in thread
From: Pavel Machek @ 2020-01-07 12:06 UTC (permalink / raw)
To: cip-dev
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.
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20200107/f8706a16/attachment.sig>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [cip-dev] Difference between v4.19.88-cip16-rebase..v4.19.88-cip16 was Re: Getting older -cip-rebase versions
2020-01-07 12:06 ` [cip-dev] Difference between v4.19.88-cip16-rebase..v4.19.88-cip16 was " Pavel Machek
@ 2020-01-08 4:02 ` nobuhiro1.iwamatsu at toshiba.co.jp
2020-01-10 18:29 ` Ben Hutchings
0 siblings, 1 reply; 6+ messages in thread
From: nobuhiro1.iwamatsu at toshiba.co.jp @ 2020-01-08 4:02 UTC (permalink / raw)
To: cip-dev
Hi Paval,
Thanks for your email!
> -----Original Message-----
> From: Pavel Machek [mailto:pavel at ucw.cz]
> Sent: Tuesday, January 7, 2020 9:06 PM
> To: iwamatsu nobuhiro(?? ?? ????????)
> <nobuhiro1.iwamatsu@toshiba.co.jp>
> Cc: cip-dev at lists.cip-project.org
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [cip-dev] Difference between v4.19.88-cip16-rebase..v4.19.88-cip16 was Re: Getting older -cip-rebase versions
2020-01-08 4:02 ` nobuhiro1.iwamatsu at toshiba.co.jp
@ 2020-01-10 18:29 ` Ben Hutchings
2020-01-13 11:23 ` Chris Paterson
0 siblings, 1 reply; 6+ messages in thread
From: Ben Hutchings @ 2020-01-10 18:29 UTC (permalink / raw)
To: cip-dev
On Wed, 2020-01-08 at 04:02 +0000, nobuhiro1.iwamatsu at toshiba.co.jp 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.
--
Ben Hutchings, Software Developer Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
^ permalink raw reply [flat|nested] 6+ messages in thread
* [cip-dev] Difference between v4.19.88-cip16-rebase..v4.19.88-cip16 was Re: Getting older -cip-rebase versions
2020-01-10 18:29 ` Ben Hutchings
@ 2020-01-13 11:23 ` Chris Paterson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Paterson @ 2020-01-13 11:23 UTC (permalink / raw)
To: cip-dev
> From: cip-dev <cip-dev-bounces@lists.cip-project.org> On Behalf Of Ben
> Hutchings
> Sent: 10 January 2020 18:30
>
> On Wed, 2020-01-08 at 04:02 +0000, nobuhiro1.iwamatsu at toshiba.co.jp
> 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
> cip-dev at lists.cip-project.org
> https://lists.cip-project.org/mailman/listinfo/cip-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-01-13 11:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-29 17:25 [cip-dev] Getting older -cip-rebase versions Pavel Machek
2020-01-06 0:39 ` nobuhiro1.iwamatsu at toshiba.co.jp
2020-01-07 12:06 ` [cip-dev] Difference between v4.19.88-cip16-rebase..v4.19.88-cip16 was " Pavel Machek
2020-01-08 4:02 ` nobuhiro1.iwamatsu at toshiba.co.jp
2020-01-10 18:29 ` Ben Hutchings
2020-01-13 11:23 ` Chris Paterson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.