Re: [cip-dev] How to handle diffs created in -rebase branch

Re: [cip-dev] How to handle diffs created in -rebase branch

[nobuhiro1.iwamatsu]

# Add cip-dev@lists.cip-project.org to CC
Hi Pavel,

Thanks for your comment.

> -----Original Message-----
> From: Pavel Machek [mailto:pavel@denx.de]
> Sent: Tuesday, March 3, 2020 9:00 PM
> To: iwamatsu nobuhiro(岩松 信洋 ○ＳＷＣ□ＯＳＴ)
> <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: Re: How to handle diffs created in -rebase branch
> 
> Hi!
> 
> (I believe we should cc cip-dev for this discussion).

Yes, I added cip-dev to CC.

> 
> > > > Commit 9c075d325ec23a9bd99b7097f0b82ec04b007093 [1] has this fix
> > > > in
> > > v4.4.211, but commit edeed5f910db5962f4ecc097ad6d935a33041ee0 [2]
> > > deletes the file once and commit
> > > 5a0d157b6153b462eabd8afcf827877e885336b9 [3] recreated the file.
> > > > If we rebase this, since the order of commits is 2, 3,  1 to 1,
> 2,
> > > > 3, the above diffs was created.
> > >
> > > I believe commit [1] is good, and we should not undo its effects
> > > with other commits. Thus linux-4.4.y-cip is okay, and
> > > linux-4.4.y-cip-rebase should be fixed. One way would be to
> > > cherry-pick 1 into linux-4.4.y-cip-rebase.
> >
> > I see, but commit [1] was already applied to v4.4.211 by upstream. So
> > the same commit is apply twice. Is this understanding same your suggest?
> >
> >   1. commit [1] / in v4.4.211
> >   .....
> >   x. commit / release v4.4.213
> >   .....
> >   x + 1. commit [2] / Delete fix by commit [1] / CIP's commit
> >   x + 2. commit [3] / CIP's commit
> >   x + 3. cherry-pick commit [1] <--- your suggest
> >
> > -rebase branch is a branch that manages commits in the LTS tree and
> CIP tree.
> > So a fix like this one always makes a difference.
> > I think there are two measures.
> >
> >  1. Ignore differences because it is a branch that manages commits.
> >  2. If a difference occurs, commit to fix it. (Your suggestion)
> >
> > I think that both are useful, but I want to get consensus with you as
> > kernel maintainers of CIP.
> 
> It is important for me for both branches to end up with same result.

OK.

> 
> "If a difference occurs, commit to fix it" is an acceptable solution to
> it. But thinking about it some more, there may be even better one.
> 
> Central problem is that we delete fixed version of file, then re-create
> the file without the fix. We should simply modify the re-creating patch
> to create the fixed version.

I understood.

> 
> If you want, I can try to do just that; but at the moment, current versions
> do not seem to be on kernel.org:
> 
> 4.4.213-based:
> https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/lo
> g/?h=linux-4.4.y-cip
> 4.4.208-based:
> https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/lo
> g/?h=linux-4.4.y-cip-rebase

Yes, we haven't resolved this issue, so I haven't committed to the rebase branch yet.
And, I fixes suggested above.

Current tree:
   https://gitlab.com/iwamatsu/linux-cip/-/tree/rebase-check/linux-4.4.y-cip-rebase-base
Cause commit:
   https://gitlab.com/iwamatsu/linux-cip/-/commit/5b451956c2c67656f1c6dcb5caa9fd7b9ab75613
   - 5b451956c2c6 firmware: Restore support for built-in firmware

Fixed tree: 
   https://gitlab.com/iwamatsu/linux-cip/-/tree/rebase-check/linux-4.4.y-cip-rebase-fix0
Fixed commit:
   https://gitlab.com/iwamatsu/linux-cip/-/commit/d841fec71b9bf4117b9859d7ffba68210160c484
   - d841fec71b9b firmware: Restore support for built-in firmware

---
$ git diff rebase-check/linux-4.4.y-cip-rebase-base rebase-check/linux-4.4.y-cip-rebase-fix0
diff --git a/firmware/Makefile b/firmware/Makefile
index fa0808853883..c944cf092926 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -18,7 +18,7 @@ quiet_cmd_fwbin = MK_FW   $@
 		  PROGBITS=$(if $(CONFIG_ARM),%,@)progbits;		     \
 		  echo "/* Generated by firmware/Makefile */"		> $@;\
 		  echo "    .section .rodata"				>>$@;\
-		  echo "    .p2align $${ASM_ALIGN}"			>>$@;\
+		  echo "    .p2align 4"					>>$@;\
 		  echo "_fw_$${FWSTR}_bin:"				>>$@;\
 		  echo "    .incbin \"$(2)\""				>>$@;\
 		  echo "_fw_end:"					>>$@;\
---

Could you please check and comment on fixed commit?

Best regards,
  Nobuhiro
_______________________________________________
cip-dev mailing list
cip-dev@lists.cip-project.org
https://lists.cip-project.org/mailman/listinfo/cip-dev