[meta-intel] [dizzy][PATCH 0/2] zlib-qat fixes for Highland Forest

Ong, Boon Leong boon.leong.ong at intel.com
Wed Jul 22 09:36:29 PDT 2015


>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=3ee02a36e0d1126fda0c6ea6a1bef4db08b8be7a 
    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=9511d5564160384b4e9f8a88f59d6f90f6ca0e0e 

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.

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. 






More information about the meta-intel mailing list