[edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Zhiguang Liu zhiguang.liu at intel.com
Wed Dec 23 07:28:46 UTC 2020 

Hi Liming,

edk2-platform mirror repo is already impacted.
I use git cherry-pick to sync to mirror, but to cherry-pick a merge, it needs to specify the parent number manually.
Pls see the below git cherry-pick option for reference.

--mainline parent-number
Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent.
Thanks
Zhiguang


From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of gaoliming
Sent: Wednesday, December 23, 2020 3:05 PM
To: Kinney, Michael D <michael.d.kinney at intel.com>; devel at edk2.groups.io; Liu, Zhiguang <zhiguang.liu at intel.com>; abner.chang at hpe.com; 'Mark Salter' <msalter at redhat.com>; Li, Aaron <aaron.li at intel.com>
Cc: 'Leif Lindholm' <leif at nuviainc.com>; 'Schaefer, Daniel' <daniel.schaefer at hpe.com>; 'Chen, Gilbert' <gilbert.chen at hpe.com>
Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Mike:
 Edit history means to do force push. It may impact edk2-platform mirror repo.

And, there is one more commit about FitGen from Aaron besides Abner patches.

Thanks
Liming
发件人: Kinney, Michael D <michael.d.kinney at intel.com<mailto:michael.d.kinney at intel.com>>
发送时间: 2020年12月23日 14:44
收件人: devel at edk2.groups.io<mailto:devel at edk2.groups.io>; gaoliming at byosoft.com.cn<mailto:gaoliming at byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu at intel.com<mailto:zhiguang.liu at intel.com>>; abner.chang at hpe.com<mailto:abner.chang at hpe.com>; 'Mark Salter' <msalter at redhat.com<mailto:msalter at redhat.com>>
抄送: 'Leif Lindholm' <leif at nuviainc.com<mailto:leif at nuviainc.com>>; 'Schaefer, Daniel' <daniel.schaefer at hpe.com<mailto:daniel.schaefer at hpe.com>>; 'Chen, Gilbert' <gilbert.chen at hpe.com<mailto:gilbert.chen at hpe.com>>
主题: RE: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Liming,

Since this change was just made, we should consider editing history to fix this.  Can you help with this?

This should have never happened.  I will check settings to see if I can disable merge commits on edk2-platforms.

Mike

From: devel at edk2.groups.io<mailto:devel at edk2.groups.io> <devel at edk2.groups.io<mailto:devel at edk2.groups.io>> On Behalf Of gaoliming
Sent: Tuesday, December 22, 2020 10:42 PM
To: devel at edk2.groups.io<mailto:devel at edk2.groups.io>; Liu, Zhiguang <zhiguang.liu at intel.com<mailto:zhiguang.liu at intel.com>>; abner.chang at hpe.com<mailto:abner.chang at hpe.com>; 'Mark Salter' <msalter at redhat.com<mailto:msalter at redhat.com>>
Cc: 'Leif Lindholm' <leif at nuviainc.com<mailto:leif at nuviainc.com>>; 'Schaefer, Daniel' <daniel.schaefer at hpe.com<mailto:daniel.schaefer at hpe.com>>; 'Chen, Gilbert' <gilbert.chen at hpe.com<mailto:gilbert.chen at hpe.com>>
Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Zhiguang:
df24ce325872020e80d8f7bee93407f4c1517845 is the merge commit. It is not a real commit.

Anber:

Please make sure git pull as rebase way. You can configure git by the command git config --global pull.rebase true

Thanks
Liming

发件人: bounce+27952+69393+4905953+8761045 at groups.io<mailto:bounce+27952+69393+4905953+8761045 at groups.io> <bounce+27952+69393+4905953+8761045 at groups.io<mailto:bounce+27952+69393+4905953+8761045 at groups.io>> 代表 Zhiguang Liu
发送时间: 2020年12月23日 10:53
收件人: devel at edk2.groups.io<mailto:devel at edk2.groups.io>; abner.chang at hpe.com<mailto:abner.chang at hpe.com>; Mark Salter <msalter at redhat.com<mailto:msalter at redhat.com>>
抄送: Leif Lindholm <leif at nuviainc.com<mailto:leif at nuviainc.com>>; Schaefer, Daniel <daniel.schaefer at hpe.com<mailto:daniel.schaefer at hpe.com>>; Chen, Gilbert <gilbert.chen at hpe.com<mailto:gilbert.chen at hpe.com>>
主题: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors


Hi Abner,



The git history for edk2-platforms master branch looks strange.

And the commit message of df24ce325872020e80d8f7bee93407f4c1517845 is missing

Can you help fix it?



Thanks

Zhiguang

[cid:image001.jpg at 01D6D940.4B7213B0]



> -----Original Message-----

> From: devel at edk2.groups.io<mailto:devel at edk2.groups.io> <devel at edk2.groups.io<mailto:devel at edk2.groups.io>> On Behalf Of Abner

> Chang

> Sent: Tuesday, December 22, 2020 2:36 PM

> To: Mark Salter <msalter at redhat.com<mailto:msalter at redhat.com>>; devel at edk2.groups.io<mailto:devel at edk2.groups.io>

> Cc: Leif Lindholm <leif at nuviainc.com<mailto:leif at nuviainc.com>>; Schaefer, Daniel

> <daniel.schaefer at hpe.com<mailto:daniel.schaefer at hpe.com>>; Chen, Gilbert <gilbert.chen at hpe.com<mailto:gilbert.chen at hpe.com>>

> Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

>

> Entire patch set looks good to me. Thanks for fixing this.

> Reviewed-by: Abner Chang <abner.chang at hpe.com<mailto:abner.chang at hpe.com>>

>

> > -----Original Message-----

> > From: Mark Salter [mailto:msalter at redhat.com]

> > Sent: Tuesday, December 22, 2020 4:39 AM

> > To: devel at edk2.groups.io<mailto:devel at edk2.groups.io>

> > Cc: Leif Lindholm <leif at nuviainc.com<mailto:leif at nuviainc.com>>; Chang, Abner (HPS SW/FW

> > Technologist) <abner.chang at hpe.com<mailto:abner.chang at hpe.com>>; Schaefer, Daniel

> > <daniel.schaefer at hpe.com<mailto:daniel.schaefer at hpe.com>>; Chen, Gilbert <gilbert.chen at hpe.com<mailto:gilbert.chen at hpe.com>>

> > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

> >

> > I ran into some errors while compiling for RISC-V/SiFive target.

> > These were trivial things arising from edk2 commits:

> >

> >   bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field

> > ProcessorManufacturer

> >   9c1f455f5f0e MdePkg: Remove code wrapped by

> > DISABLE_NEW_DEPRECATED_INTERFACES

> >

> > Mark Salter (2):

> >   Silicon/RISC-V: Update old SMBIOS struct filed name

> >   Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces

> >

> >  .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---

> >  .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c    | 2 +-

> >  .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c   | 2 +-

> >  3 files changed, 8 insertions(+), 5 deletions(-)

> >

> > --

> > 2.29.2

>

>

>

>

>





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#69405): https://edk2.groups.io/g/devel/message/69405
Mute This Topic: https://groups.io/mt/79176180/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20201223/e589227c/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image001.jpg
Type: image/jpeg
Size: 60061 bytes
Desc: image001.jpg
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20201223/e589227c/attachment.jpg>

More information about the edk2-devel-archive mailing list