<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:SimSun;
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:DengXian;
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:"\@SimSun";
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;}
@font-face
{font-family:"\@DengXian";
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"Microsoft YaHei";
panose-1:2 11 5 3 2 2 4 2 2 4;}
@font-face
{font-family:"\@Microsoft YaHei";
panose-1:2 11 5 3 2 2 4 2 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
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:"Plain Text Char";
margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
pre
{mso-style-priority:99;
mso-style-link:"HTML Preformatted Char";
margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
span.HTMLPreformattedChar
{mso-style-name:"HTML Preformatted Char";
mso-style-priority:99;
mso-style-link:"HTML Preformatted";
font-family:Consolas;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:Consolas;}
span.EmailStyle29
{mso-style-type:personal-compose;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 129.75pt 1.0in 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="EN-US" link="#0563C1" vlink="#954F72">
<div class="WordSection1">
<p class="MsoNormal">Liming, Aaron’s patch has not been pushed.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b>From:</b> devel@edk2.groups.io <devel@edk2.groups.io> <b>
On Behalf Of </b>gaoliming<br>
<b>Sent:</b> Wednesday, December 23, 2020 3:05 PM<br>
<b>To:</b> Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io; Liu, Zhiguang <zhiguang.liu@intel.com>; abner.chang@hpe.com; 'Mark Salter' <msalter@redhat.com>; Li, Aaron <aaron.li@intel.com><br>
<b>Cc:</b> 'Leif Lindholm' <leif@nuviainc.com>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com>; 'Chen, Gilbert' <gilbert.chen@hpe.com><br>
<b>Subject:</b> <span lang="ZH-CN" style="font-family:"Microsoft YaHei",sans-serif">
回复</span>: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian">Mike:<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian"> Edit history means to do force push. It may impact edk2-platform mirror repo.
<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian"><o:p> </o:p></span></p>
<p class="MsoNormal" style="text-indent:5.25pt"><span style="font-size:10.5pt;font-family:DengXian">And, there is one more commit about FitGen from Aaron besides Abner patches.
<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian">Thanks<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian">Liming<o:p></o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt">
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span lang="ZH-CN" style="font-family:DengXian">发件人</span></b><b><span style="font-family:DengXian">:</span></b><span style="font-family:DengXian"> Kinney, Michael D <</span><a href="mailto:michael.d.kinney@intel.com"><span style="font-family:DengXian">michael.d.kinney@intel.com</span></a><span style="font-family:DengXian">>
<br>
<b><span lang="ZH-CN">发送时间</span>:</b> 2020<span lang="ZH-CN">年</span>12<span lang="ZH-CN">月</span>23<span lang="ZH-CN">日</span> 14:44<br>
<b><span lang="ZH-CN">收件人</span>:</b> </span><a href="mailto:devel@edk2.groups.io"><span style="font-family:DengXian">devel@edk2.groups.io</span></a><span style="font-family:DengXian">;
</span><a href="mailto:gaoliming@byosoft.com.cn"><span style="font-family:DengXian">gaoliming@byosoft.com.cn</span></a><span style="font-family:DengXian">; Liu, Zhiguang <</span><a href="mailto:zhiguang.liu@intel.com"><span style="font-family:DengXian">zhiguang.liu@intel.com</span></a><span style="font-family:DengXian">>;
</span><a href="mailto:abner.chang@hpe.com"><span style="font-family:DengXian">abner.chang@hpe.com</span></a><span style="font-family:DengXian">; 'Mark Salter' <</span><a href="mailto:msalter@redhat.com"><span style="font-family:DengXian">msalter@redhat.com</span></a><span style="font-family:DengXian">><br>
<b><span lang="ZH-CN">抄送</span>:</b> 'Leif Lindholm' <</span><a href="mailto:leif@nuviainc.com"><span style="font-family:DengXian">leif@nuviainc.com</span></a><span style="font-family:DengXian">>; 'Schaefer, Daniel' <</span><a href="mailto:daniel.schaefer@hpe.com"><span style="font-family:DengXian">daniel.schaefer@hpe.com</span></a><span style="font-family:DengXian">>;
'Chen, Gilbert' <</span><a href="mailto:gilbert.chen@hpe.com"><span style="font-family:DengXian">gilbert.chen@hpe.com</span></a><span style="font-family:DengXian">><br>
<b><span lang="ZH-CN">主题</span>:</b> RE: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">Liming,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span 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 style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span 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 style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">Mike<o:p></o:p></span></p>
<p class="MsoNormal"><span 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 0in 0in 0in">
<p class="MsoNormal"><b>From:</b> <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 lang="ZH-CN" style="font-family:SimSun">回复</span>: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian">Zhiguang:<o:p></o:p></span></p>
<p class="MsoNormal"><span 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 style="font-size:10.5pt;font-family:DengXian"><o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian">Anber:<o:p></o:p></span></p>
<pre><span style="font-size:10.5pt;font-family:DengXian">Please make sure git pull as rebase way. You can configure git by the command </span><span style="font-size:10.0pt;font-family:Consolas;color:#111111">git config --global pull.rebase true</span><span style="font-size:12.0pt;font-family:Consolas;color:#111111"><o:p></o:p></span></pre>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian">Thanks<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian">Liming<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:DengXian"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span lang="ZH-CN" style="font-family:DengXian">发件人</span></b><b><span style="font-family:DengXian">:</span></b><span style="font-family:DengXian">
</span><a href="mailto:bounce+27952+69393+4905953+8761045@groups.io"><span style="font-family:DengXian">bounce+27952+69393+4905953+8761045@groups.io</span></a><span style="font-family:DengXian"> <</span><a href="mailto:bounce+27952+69393+4905953+8761045@groups.io"><span style="font-family:DengXian">bounce+27952+69393+4905953+8761045@groups.io</span></a><span style="font-family:DengXian">>
<b><span lang="ZH-CN">代表 </span></b>Zhiguang Liu<br>
<b><span lang="ZH-CN">发送时间</span>:</b> 2020<span lang="ZH-CN">年</span>12<span lang="ZH-CN">月</span>23<span lang="ZH-CN">日</span> 10:53<br>
<b><span lang="ZH-CN">收件人</span>:</b> </span><a href="mailto:devel@edk2.groups.io"><span style="font-family:DengXian">devel@edk2.groups.io</span></a><span style="font-family:DengXian">;
</span><a href="mailto:abner.chang@hpe.com"><span style="font-family:DengXian">abner.chang@hpe.com</span></a><span style="font-family:DengXian">; Mark Salter <</span><a href="mailto:msalter@redhat.com"><span style="font-family:DengXian">msalter@redhat.com</span></a><span style="font-family:DengXian">><br>
<b><span lang="ZH-CN">抄送</span>:</b> Leif Lindholm <</span><a href="mailto:leif@nuviainc.com"><span style="font-family:DengXian">leif@nuviainc.com</span></a><span style="font-family:DengXian">>; Schaefer, Daniel <</span><a href="mailto:daniel.schaefer@hpe.com"><span style="font-family:DengXian">daniel.schaefer@hpe.com</span></a><span style="font-family:DengXian">>;
Chen, Gilbert <</span><a href="mailto:gilbert.chen@hpe.com"><span style="font-family:DengXian">gilbert.chen@hpe.com</span></a><span style="font-family:DengXian">><br>
<b><span lang="ZH-CN">主题</span>:</b> Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoPlainText">Hi Abner,<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">The git history for edk2-platforms master branch looks strange.<o:p></o:p></p>
<p class="MsoPlainText">And the commit message of <span style="font-size:9.0pt;font-family:Consolas;color:#444D56;background:white">
df24ce325872020e80d8f7bee93407f4c1517845</span> is missing<o:p></o:p></p>
<p class="MsoPlainText">Can you help fix it?<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Thanks<o:p></o:p></p>
<p class="MsoPlainText">Zhiguang<o:p></o:p></p>
<p class="MsoPlainText"><img border="0" width="1375" height="160" style="width:14.3229in;height:1.6666in" id="Picture_x0020_1" src="cid:image003.jpg@01D6D93E.B755EDB0"><o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">> -----Original Message-----<o:p></o:p></p>
<p class="MsoPlainText">> 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></p>
<p class="MsoPlainText">> Chang<o:p></o:p></p>
<p class="MsoPlainText">> Sent: Tuesday, December 22, 2020 2:36 PM<o:p></o:p></p>
<p class="MsoPlainText">> 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></p>
<p class="MsoPlainText">> Cc: Leif Lindholm <<a href="mailto:leif@nuviainc.com">leif@nuviainc.com</a>>; Schaefer, Daniel<o:p></o:p></p>
<p class="MsoPlainText">> <<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></p>
<p class="MsoPlainText">> Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> Entire patch set looks good to me. Thanks for fixing this.<o:p></o:p></p>
<p class="MsoPlainText">> 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></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> > -----Original Message-----<o:p></o:p></p>
<p class="MsoPlainText">> > 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></p>
<p class="MsoPlainText">> > Sent: Tuesday, December 22, 2020 4:39 AM<o:p></o:p></p>
<p class="MsoPlainText">> > 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></p>
<p class="MsoPlainText">> > 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></p>
<p class="MsoPlainText">> > 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></p>
<p class="MsoPlainText">> > <<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></p>
<p class="MsoPlainText">> > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors<o:p></o:p></p>
<p class="MsoPlainText">> ><o:p></o:p></p>
<p class="MsoPlainText">> > I ran into some errors while compiling for RISC-V/SiFive target.<o:p></o:p></p>
<p class="MsoPlainText">> > These were trivial things arising from edk2 commits:<o:p></o:p></p>
<p class="MsoPlainText">> ><o:p></o:p></p>
<p class="MsoPlainText">> > bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field<o:p></o:p></p>
<p class="MsoPlainText">> > ProcessorManufacturer<o:p></o:p></p>
<p class="MsoPlainText">> > 9c1f455f5f0e MdePkg: Remove code wrapped by<o:p></o:p></p>
<p class="MsoPlainText">> > DISABLE_NEW_DEPRECATED_INTERFACES<o:p></o:p></p>
<p class="MsoPlainText">> ><o:p></o:p></p>
<p class="MsoPlainText">> > Mark Salter (2):<o:p></o:p></p>
<p class="MsoPlainText">> > Silicon/RISC-V: Update old SMBIOS struct filed name<o:p></o:p></p>
<p class="MsoPlainText">> > Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces<o:p></o:p></p>
<p class="MsoPlainText">> ><o:p></o:p></p>
<p class="MsoPlainText">> > .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c | 9 ++++++---<o:p></o:p></p>
<p class="MsoPlainText">> > .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c | 2 +-<o:p></o:p></p>
<p class="MsoPlainText">> > .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c | 2 +-<o:p></o:p></p>
<p class="MsoPlainText">> > 3 files changed, 8 insertions(+), 5 deletions(-)<o:p></o:p></p>
<p class="MsoPlainText">> ><o:p></o:p></p>
<p class="MsoPlainText">> > --<o:p></o:p></p>
<p class="MsoPlainText">> > 2.29.2<o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"></o:p></span></p>
</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/69404">View/Reply Online (#69404)</a> | | <a target="_blank" href="https://groups.io/mt/79176103/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>