On 7/22/15, 9:36 AM, "Ong, Boon Leong" <[email protected]> wrote:
>>When you apply backports, please do so using: >> >>$ git cherry-pick -x COMMIT >> >>This will identify the patch as a backport and include the master commit >>in the >>commit message, making it clear. Please resubmit the patches using this >>method. >> >Darren, > >I think that Anuj may not present the case clear enough. > >Let me explain on his behalf so we understand what is the gap here. >The event happened in this sequence: > >1) Zlib-qat has been merged into dizzy here >http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/commit/?h=dizzy&id=3e >e02a36e0d1126fda0c6ea6a1bef4db08b8be7a > This commit has a defect in the kernel module compilation ${CC}. > >2) Then, when Anuj took over to enable zlib-qat for master and fido for >River Forest platform, he cherry-pick the dizzy version > and add in some fixed as recorded in the commit below. > >http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/commit/?id=9511d55641 >60384b4e9f8a88f59d6f90f6ca0e0e I see. Either I forgot that we allowed a functional patch into dizzy without it first going to master, or Saul and I were not synched on this during the transition. Apologies for the confusion. In the future, please do this on master first, then backport to release branches. > >So, it is only possible to do git cherry-pick -x from master back to >dizzy if we first do git revert commit "3ee02a36". > >Darren, which do you prefer? >1) Git revert than git cherry-pick from master >2) send an incremental git commit to fix this ${CC} issue > >I must admit that we should have focus on master from start but >implementation has slipped due to turn-over. OK. Great. > >We are looking at having this patch accepted by tomorrow so that we can >generate BSP release this Friday for >Crystal Forest and Highland Forest for dizzy branch. I'll merge this to master as is. -- Darren Hart Intel Open Source Technology Center -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
