Inserting patch into history was Re: [PATCH v2 5.10.y-cip 15/15] clk: renesas: r9a07g044: Mark IA55_CLK and DMAC_ACLK critical


Pavel Machek
 

Hi!

Is it possible to rearrange this patch before [1] and after [2]?

[1] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?h=linux-5.10.y-cip&id=dcbef66029571fbada7522b2db0790e5ff054c66

[2]https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?h=linux-5.10.y-cip&id=e2568c0c7de565a5688544907422ca470844df87
Wow.

It means changing history. We usually try to avoid that, as it will
cause problems for people using git head. But we did not yet do a
release with those commits, so it is not completely out of question.

How important is that? At the very least I'll need to know that rest
of the kernel team is okay with it.

commit e2568c0c7de565a5688544907422ca470844df87
Author: Biju Das <biju.das.jz@bp.renesas.com>
Date: Mon Dec 20 13:31:30 2021 +0000

commit dcbef66029571fbada7522b2db0790e5ff054c66
Author: Biju Das <biju.das.jz@bp.renesas.com>
Date: Thu Dec 16 12:54:46 2021 +0000

clk: renesas: rzg2l: Fix clk status function

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


Jan Kiszka
 

On 10.01.22 19:33, Pavel Machek wrote:
Hi!

Is it possible to rearrange this patch before [1] and after [2]?

[1] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?h=linux-5.10.y-cip&id=dcbef66029571fbada7522b2db0790e5ff054c66

[2]https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?h=linux-5.10.y-cip&id=e2568c0c7de565a5688544907422ca470844df87
Wow.
It means changing history. We usually try to avoid that, as it will
cause problems for people using git head. But we did not yet do a
release with those commits, so it is not completely out of question.
How important is that? At the very least I'll need to know that rest
of the kernel team is okay with it.
commit e2568c0c7de565a5688544907422ca470844df87
Author: Biju Das <biju.das.jz@bp.renesas.com>
Date: Mon Dec 20 13:31:30 2021 +0000
commit dcbef66029571fbada7522b2db0790e5ff054c66
Author: Biju Das <biju.das.jz@bp.renesas.com>
Date: Thu Dec 16 12:54:46 2021 +0000
clk: renesas: rzg2l: Fix clk status function
Best regards,
Pavel
Patch application in unfortunate order is a very common issue in upstream: dependencies are missed, patches take different routes through different maintainer trees, bugs get fixed only after the patch was applied. In none of these cases, a maintainer did a force-push so far (to my best knowledge), why should CIP do that?

Jan

--
Siemens AG, Technology
Competence Center Embedded Linux


Biju Das <biju.das.jz@...>
 

Hi Pavel,

Thanks for the feedback.

Subject: Inserting patch into history was Re: [PATCH v2 5.10.y-cip 15/15]
clk: renesas: r9a07g044: Mark IA55_CLK and DMAC_ACLK critical

Hi!

Is it possible to rearrange this patch before [1] and after [2]?

[1]
https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/comm
it/?h=linux-5.10.y-cip&id=dcbef66029571fbada7522b2db0790e5ff054c66

[2]https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/c
ommit/?h=linux-5.10.y-cip&id=e2568c0c7de565a5688544907422ca470844df87
Wow.

It means changing history. We usually try to avoid that, as it will cause
problems for people using git head. But we did not yet do a release with
those commits, so it is not completely out of question.
I thought it is simple.

Since we haven't made any release, history modification and force pushing is not required,
as this patch will be part of upcoming release.


How important is that?
Some how this patch, becomes out of order from our internal huge cherry-picked patchset from mainline,
which we use for testing before posting to ML.

It will stop booting after[1], without this.

Any way, this patch is going to be part of upcoming release. So History modification and
Force pushing is not required.

Regards,
Biju

At the very least I'll need to know that rest of
the kernel team is okay with it.

commit e2568c0c7de565a5688544907422ca470844df87
Author: Biju Das <biju.das.jz@bp.renesas.com>
Date: Mon Dec 20 13:31:30 2021 +0000

commit dcbef66029571fbada7522b2db0790e5ff054c66
Author: Biju Das <biju.das.jz@bp.renesas.com>
Date: Thu Dec 16 12:54:46 2021 +0000

clk: renesas: rzg2l: Fix clk status function

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


Pavel Machek
 

Hi!

Subject: Inserting patch into history was Re: [PATCH v2 5.10.y-cip 15/15]
clk: renesas: r9a07g044: Mark IA55_CLK and DMAC_ACLK critical

Hi!

Is it possible to rearrange this patch before [1] and after [2]?

[1]
https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/comm
it/?h=linux-5.10.y-cip&id=dcbef66029571fbada7522b2db0790e5ff054c66

[2]https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/c
ommit/?h=linux-5.10.y-cip&id=e2568c0c7de565a5688544907422ca470844df87
Wow.

It means changing history. We usually try to avoid that, as it will cause
problems for people using git head. But we did not yet do a release with
those commits, so it is not completely out of question.
I thought it is simple.

Since we haven't made any release, history modification and force pushing is not required,
as this patch will be part of upcoming release.
Ok, good. Patches passed testing (zynqmp board has problems but they
are not kernel related) and I have pushed them.

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