<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="ProgId" content="Word.Document"> <meta name="Generator" content="Microsoft Word 15"> <meta name="Originator" content="Microsoft Word 15"> <link rel="File-List" href="cid:filelist.xml@01D6D8B3.F4171F70"><link rel="Edit-Time-Data" href="cid:editdata.mso"><style></style> </head> <body lang="EN-US" link="#0563C1" vlink="#954F72" style="tab-interval:.5in"> <div class="WordSection1"> Liming,<o:p></o:p> <o:p> </o:p> Since this change was just made, we should consider editing history to fix this. Can you help with this?<o:p></o:p> <o:p> </o:p> This should have never happened. I will check settings to see if I can disable merge commits on edk2-platforms.<o:p></o:p> <o:p> </o:p> Mike<o:p></o:p> <o:p> </o:p> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming Sent: Tuesday, December 22, 2020 10:42 PM To: devel@edk2.groups.io; Liu, Zhiguang <zhiguang.liu@intel.com>; abner.chang@hpe.com; 'Mark Salter' <msalter@redhat.com> Cc: 'Leif Lindholm' <leif@nuviainc.com>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com>; 'Chen, Gilbert' <gilbert.chen@hpe.com> Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p> </div> </div> <o:p> </o:p> Zhiguang:<o:p></o:p> df24ce325872020e80d8f7bee93407f4c1517845 is the merge commit. It is not a real commit. <o:p></o:p> <o:p> </o:p> Anber:<o:p></o:p> <pre>Please make sure git pull as rebase way. You can configure git by the command git config --global pull.rebase true<o:p></o:p></pre> <o:p> </o:p> Thanks<o:p></o:p> Liming<o:p></o:p> <o:p> </o:p> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> 发件人: <a href="mailto:bounce+27952+69393+4905953+8761045@groups.io">bounce+27952+69393+4905953+8761045@groups.io</a> <<a href="mailto:bounce+27952+69393+4905953+8761045@groups.io">bounce+27952+69393+4905953+8761045@groups.io</a>> 代表 Zhiguang Liu 发送时间: 2020年12月23日 10:53 收件人: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>; <a href="mailto:abner.chang@hpe.com">abner.chang@hpe.com</a>; Mark Salter <<a href="mailto:msalter@redhat.com">msalter@redhat.com</a>> 抄送: Leif Lindholm <<a href="mailto:leif@nuviainc.com">leif@nuviainc.com</a>>; Schaefer, Daniel <<a href="mailto:daniel.schaefer@hpe.com">daniel.schaefer@hpe.com</a>>; Chen, Gilbert <<a href="mailto:gilbert.chen@hpe.com">gilbert.chen@hpe.com</a>> 主题: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p> </div> </div> <o:p> </o:p> Hi Abner,<o:p></o:p> <o:p> </o:p> The git history for edk2-platforms master branch looks strange.<o:p></o:p> And the commit message of df24ce325872020e80d8f7bee93407f4c1517845 is missing<o:p></o:p> Can you help fix it?<o:p></o:p> <o:p> </o:p> Thanks<o:p></o:p> Zhiguang<o:p></o:p> <img border="0" width="1375" height="160" id="Picture_x0020_1" src="cid:image002.jpg@01D6D8B3.F3EF2510"><o:p></o:p> <o:p> </o:p> > -----Original Message-----<o:p></o:p> > From: <a href="mailto:devel@edk2.groups.io"> devel@edk2.groups.io</a> <<a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>> On Behalf Of Abner<o:p></o:p> > Chang<o:p></o:p> > Sent: Tuesday, December 22, 2020 2:36 PM<o:p></o:p> > To: Mark Salter <<a href="mailto:msalter@redhat.com">msalter@redhat.com</a>>; <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a><o:p></o:p> > Cc: Leif Lindholm <<a href="mailto:leif@nuviainc.com">leif@nuviainc.com</a>>; Schaefer, Daniel<o:p></o:p> > <<a href="mailto:daniel.schaefer@hpe.com">daniel.schaefer@hpe.com</a>>; Chen, Gilbert <<a href="mailto:gilbert.chen@hpe.com">gilbert.chen@hpe.com</a>><o:p></o:p> > Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p> > <o:p></o:p> > Entire patch set looks good to me. Thanks for fixing this.<o:p></o:p> > Reviewed-by: Abner Chang <<a href="mailto:abner.chang@hpe.com">abner.chang@hpe.com</a>><o:p></o:p> > <o:p></o:p> > > -----Original Message-----<o:p></o:p> > > From: Mark Salter [<a href="mailto:msalter@redhat.com">mailto:msalter@redhat.com</a>]<o:p></o:p> > > Sent: Tuesday, December 22, 2020 4:39 AM<o:p></o:p> > > To: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a><o:p></o:p> > > Cc: Leif Lindholm <<a href="mailto:leif@nuviainc.com">leif@nuviainc.com</a>>; Chang, Abner (HPS SW/FW<o:p></o:p> > > Technologist) <<a href="mailto:abner.chang@hpe.com">abner.chang@hpe.com</a>>; Schaefer, Daniel<o:p></o:p> > > <<a href="mailto:daniel.schaefer@hpe.com">daniel.schaefer@hpe.com</a>>; Chen, Gilbert <<a href="mailto:gilbert.chen@hpe.com">gilbert.chen@hpe.com</a>><o:p></o:p> > > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p> > ><o:p></o:p> > > I ran into some errors while compiling for RISC-V/SiFive target.<o:p></o:p> > > These were trivial things arising from edk2 commits:<o:p></o:p> > ><o:p></o:p> > > bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field<o:p></o:p> > > ProcessorManufacturer<o:p></o:p> > > 9c1f455f5f0e MdePkg: Remove code wrapped by<o:p></o:p> > > DISABLE_NEW_DEPRECATED_INTERFACES<o:p></o:p> > ><o:p></o:p> > > Mark Salter (2):<o:p></o:p> > > Silicon/RISC-V: Update old SMBIOS struct filed name<o:p></o:p> > > Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces<o:p></o:p> > ><o:p></o:p> > > .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c | 9 ++++++---<o:p></o:p> > > .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c | 2 +-<o:p></o:p> > > .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c | 2 +-<o:p></o:p> > > 3 files changed, 8 insertions(+), 5 deletions(-)<o:p></o:p> > ><o:p></o:p> > > --<o:p></o:p> > > 2.29.2<o:p></o:p> > <o:p></o:p> > <o:p></o:p> > <o:p></o:p> > <o:p></o:p> > <o:p></o:p> <o:p> </o:p> <div> </o:p> </div> </div> </body> </html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/69400">View/Reply Online (#69400)</a> | | <a target="_blank" href="https://groups.io/mt/79175833/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>