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@groups.io
<bounce+27952+69393+4905953+8761045@groups.io> 代表 Zhiguang Liu
发送时间: 2020年12月23日 10:53
收件人: devel@edk2.groups.io; abner.chang@hpe.com; Mark Salter
<msalter@redhat.com>
抄送: Leif Lindholm <leif@nuviainc.com>; Schaefer, Daniel
<daniel.schaefer@hpe.com>; Chen, Gilbert <gilbert.chen@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



 

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

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

> Chang

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

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

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

> <daniel.schaefer@hpe.com <mailto:daniel.schaefer@hpe.com> >; Chen, Gilbert
<gilbert.chen@hpe.com <mailto:gilbert.chen@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 < <mailto:abner.chang@hpe.com>
abner.chang@hpe.com>

> 

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

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

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

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

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

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

> > < <mailto:daniel.schaefer@hpe.com> daniel.schaefer@hpe.com>; Chen,
Gilbert < <mailto:gilbert.chen@hpe.com> gilbert.chen@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

> 

> 

> 

> 

>