<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=Generator content="Microsoft Word 15 (filtered medium)"><!--[if !mso]><style>v\:* {behavior:url(#default#VML);}
o\:* {behavior:url(#default#VML);}
w\:* {behavior:url(#default#VML);}
.shape {behavior:url(#default#VML);}
</style><![endif]--><style><!--
/* Font Definitions */
@font-face
{font-family:宋体;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:等线;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:"\@宋体";
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"\@等线";
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Consolas;
panose-1:2 11 6 9 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"纯文本 字符";
margin:0cm;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
pre
{mso-style-priority:99;
mso-style-link:"HTML 预设格式 字符";
margin:0cm;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
span.HTML
{mso-style-name:"HTML 预设格式 字符";
mso-style-priority:99;
mso-style-link:"HTML 预设格式";
font-family:宋体;}
span.a
{mso-style-name:"纯文本 字符";
mso-style-priority:99;
mso-style-link:纯文本;
font-family:等线;}
span.EmailStyle31
{mso-style-type:personal-reply;
font-family:等线;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 129.75pt 72.0pt 129.7pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]--></head><body lang=ZH-CN link="#0563C1" vlink="#954F72" style='word-wrap:break-word'><div class=WordSection1><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'>Mike:<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'> Edit history means to do force push. It may impact edk2-platform mirror repo. <o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'><o:p> </o:p></span></p><p class=MsoNormal style='text-indent:5.25pt'><span lang=EN-US style='font-size:10.5pt;font-family:等线'>And, there is one more commit about FitGen from Aaron besides Abner patches. <o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'>Thanks<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'>Liming<o:p></o:p></span></p><div style='border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt'><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'><p class=MsoNormal><b><span style='font-family:等线'>发件人<span lang=EN-US>:</span></span></b><span lang=EN-US style='font-family:等线'> Kinney, Michael D <michael.d.kinney@intel.com> <br></span><b><span style='font-family:等线'>发送时间<span lang=EN-US>:</span></span></b><span lang=EN-US style='font-family:等线'> 2020</span><span style='font-family:等线'>年<span lang=EN-US>12</span>月<span lang=EN-US>23</span>日<span lang=EN-US> 14:44<br></span><b>收件人<span lang=EN-US>:</span></b><span lang=EN-US> devel@edk2.groups.io; gaoliming@byosoft.com.cn; Liu, Zhiguang <zhiguang.liu@intel.com>; abner.chang@hpe.com; 'Mark Salter' <msalter@redhat.com><br></span><b>抄送<span lang=EN-US>:</span></b><span lang=EN-US> 'Leif Lindholm' <leif@nuviainc.com>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com>; 'Chen, Gilbert' <gilbert.chen@hpe.com><br></span><b>主题<span lang=EN-US>:</span></b><span lang=EN-US> RE: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></span></span></p></div></div><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US style='mso-fareast-language:EN-US'>Liming,<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='mso-fareast-language:EN-US'><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US style='mso-fareast-language:EN-US'>Since this change was just made, we should consider editing history to fix this. Can you help with this?<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='mso-fareast-language:EN-US'><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US style='mso-fareast-language:EN-US'>This should have never happened. I will check settings to see if I can disable merge commits on edk2-platforms.<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='mso-fareast-language:EN-US'><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US style='mso-fareast-language:EN-US'>Mike<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='mso-fareast-language:EN-US'><o:p> </o:p></span></p><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'><p class=MsoNormal><b><span lang=EN-US>From:</span></b><span lang=EN-US> <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> <<a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>> <b>On Behalf Of </b>gaoliming<br><b>Sent:</b> Tuesday, December 22, 2020 10:42 PM<br><b>To:</b> <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>; Liu, Zhiguang <<a href="mailto:zhiguang.liu@intel.com">zhiguang.liu@intel.com</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>><br><b>Cc:</b> '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>><br><b>Subject:</b> </span><span style='font-family:宋体'>回复</span><span lang=EN-US>: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></span></p></div></div><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'>Zhiguang:<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:9.0pt;font-family:Consolas;color:#444D56;background:white'>df24ce325872020e80d8f7bee93407f4c1517845 is the merge commit. It is not a real commit. </span><span lang=EN-US style='font-size:10.5pt;font-family:等线'><o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'>Anber:<o:p></o:p></span></p><pre><span lang=EN-US style='font-size:10.5pt;font-family:等线'>Please make sure git pull as rebase way. You can configure git by the command </span><span lang=EN-US style='font-size:10.0pt;font-family:Consolas;color:#111111'>git config --global pull.rebase true</span><span lang=EN-US style='font-size:12.0pt;font-family:Consolas;color:#111111'><o:p></o:p></span></pre><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'>Thanks<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'>Liming<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US style='font-size:10.5pt;font-family:等线'><o:p> </o:p></span></p><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'><p class=MsoNormal><b><span style='font-family:等线'>发件人<span lang=EN-US>:</span></span></b><span lang=EN-US style='font-family:等线'> <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>> </span><b><span style='font-family:等线'>代表 </span></b><span lang=EN-US style='font-family:等线'>Zhiguang Liu<br></span><b><span style='font-family:等线'>发送时间<span lang=EN-US>:</span></span></b><span lang=EN-US style='font-family:等线'> 2020</span><span style='font-family:等线'>年<span lang=EN-US>12</span>月<span lang=EN-US>23</span>日<span lang=EN-US> 10:53<br></span><b>收件人<span lang=EN-US>:</span></b><span lang=EN-US> <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>><br></span><b>抄送<span lang=EN-US>:</span></b><span lang=EN-US> 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>><br></span><b>主题<span lang=EN-US>:</span></b><span lang=EN-US> Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></span></span></p></div></div><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoPlainText><span lang=EN-US>Hi Abner,<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US><o:p> </o:p></span></p><p class=MsoPlainText><span lang=EN-US>The git history for edk2-platforms master branch looks strange.<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>And the commit message of </span><span lang=EN-US style='font-size:9.0pt;font-family:Consolas;color:#444D56;background:white'>df24ce325872020e80d8f7bee93407f4c1517845</span><span lang=EN-US> is missing<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>Can you help fix it?<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US><o:p> </o:p></span></p><p class=MsoPlainText><span lang=EN-US>Thanks<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>Zhiguang<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US><img border=0 width=1375 height=160 style='width:14.325in;height:1.6666in' id="Picture_x0020_1" src="cid:image002.jpg@01D6D93D.06C00BD0"></span><span lang=EN-US><o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US><o:p> </o:p></span></p><p class=MsoPlainText><span lang=EN-US>> -----Original Message-----<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> 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></span></p><p class=MsoPlainText><span lang=EN-US>> Chang<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> Sent: Tuesday, December 22, 2020 2:36 PM<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> 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></span></p><p class=MsoPlainText><span lang=EN-US>> Cc: Leif Lindholm <<a href="mailto:leif@nuviainc.com">leif@nuviainc.com</a>>; Schaefer, Daniel<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> <<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></span></p><p class=MsoPlainText><span lang=EN-US>> Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> <o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> Entire patch set looks good to me. Thanks for fixing this.<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> Reviewed-by: Abner Chang <<a href="mailto:abner.chang@hpe.com"><span style='color:windowtext;text-decoration:none'>abner.chang@hpe.com</span></a>><o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> <o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > -----Original Message-----<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > From: Mark Salter [<a href="mailto:msalter@redhat.com"><span style='color:windowtext;text-decoration:none'>mailto:msalter@redhat.com</span></a>]<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > Sent: Tuesday, December 22, 2020 4:39 AM<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > To: <a href="mailto:devel@edk2.groups.io"><span style='color:windowtext;text-decoration:none'>devel@edk2.groups.io</span></a><o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > Cc: Leif Lindholm <<a href="mailto:leif@nuviainc.com"><span style='color:windowtext;text-decoration:none'>leif@nuviainc.com</span></a>>; Chang, Abner (HPS SW/FW<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > Technologist) <<a href="mailto:abner.chang@hpe.com"><span style='color:windowtext;text-decoration:none'>abner.chang@hpe.com</span></a>>; Schaefer, Daniel<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > <<a href="mailto:daniel.schaefer@hpe.com"><span style='color:windowtext;text-decoration:none'>daniel.schaefer@hpe.com</span></a>>; Chen, Gilbert <<a href="mailto:gilbert.chen@hpe.com"><span style='color:windowtext;text-decoration:none'>gilbert.chen@hpe.com</span></a>><o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> ><o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > I ran into some errors while compiling for RISC-V/SiFive target.<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > These were trivial things arising from edk2 commits:<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> ><o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > ProcessorManufacturer<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > 9c1f455f5f0e MdePkg: Remove code wrapped by<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > DISABLE_NEW_DEPRECATED_INTERFACES<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> ><o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > Mark Salter (2):<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > Silicon/RISC-V: Update old SMBIOS struct filed name<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> ><o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c | 9 ++++++---<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c | 2 +-<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c | 2 +-<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > 3 files changed, 8 insertions(+), 5 deletions(-)<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> ><o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > --<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> > 2.29.2<o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> <o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> <o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> <o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> <o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US>> <o:p></o:p></span></p><p class=MsoPlainText><span lang=EN-US><o:p> </o:p></span></p><div><p class=MsoNormal></o:p></span></p></div></div></div></body></html>
<div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links:<p> You receive all messages sent to this group. <p> <a target="_blank" href="https://edk2.groups.io/g/devel/message/69402">View/Reply Online (#69402)</a> | | <a target="_blank" href="https://groups.io/mt/79175952/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a><br> <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]<br> <div width="1" style="color:white;clear:both">_._,_._,_</div>