From: "Bob Feng" <bob.c.feng@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"gaoliming@byosoft.com.cn" <gaoliming@byosoft.com.cn>,
"Kinney, Michael D" <michael.d.kinney@intel.com>,
"Liu, Zhiguang" <zhiguang.liu@intel.com>,
"abner.chang@hpe.com" <abner.chang@hpe.com>,
'Mark Salter' <msalter@redhat.com>,
"Li, Aaron" <aaron.li@intel.com>
Cc: 'Leif Lindholm' <leif@nuviainc.com>,
"'Schaefer, Daniel'" <daniel.schaefer@hpe.com>,
"'Chen, Gilbert'" <gilbert.chen@hpe.com>
Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
Date: Wed, 23 Dec 2020 07:17:27 +0000 [thread overview]
Message-ID: <DM6PR11MB4073B7B4ED0E5A8C2CE43252C9DE0@DM6PR11MB4073.namprd11.prod.outlook.com> (raw)
In-Reply-To: <008301d6d8f9$f8e45c20$eaad1460$@byosoft.com.cn>
[-- Attachment #1.1: Type: text/plain, Size: 5932 bytes --]
Liming, Aaron’s patch has not been pushed.
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
Sent: Wednesday, December 23, 2020 3:05 PM
To: 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>
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
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@intel.com<mailto:michael.d.kinney@intel.com>>
发送时间: 2020年12月23日 14:44
收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; 'Mark Salter' <msalter@redhat.com<mailto:msalter@redhat.com>>
抄送: '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>>
主题: 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@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of gaoliming
Sent: Tuesday, December 22, 2020 10:42 PM
To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; Liu, Zhiguang <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; 'Mark Salter' <msalter@redhat.com<mailto:msalter@redhat.com>>
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: 回复: [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@groups.io<mailto:bounce+27952+69393+4905953+8761045@groups.io> <bounce+27952+69393+4905953+8761045@groups.io<mailto:bounce+27952+69393+4905953+8761045@groups.io>> 代表 Zhiguang Liu
发送时间: 2020年12月23日 10:53
收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; Mark Salter <msalter@redhat.com<mailto:msalter@redhat.com>>
抄送: 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>>
主题: 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:image003.jpg@01D6D93E.B755EDB0]
> -----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 <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>
>
> > -----Original Message-----
> > From: Mark Salter [mailto:msalter@redhat.com]
> > Sent: Tuesday, December 22, 2020 4:39 AM
> > To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
> > Cc: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Chang, Abner (HPS SW/FW
> > Technologist) <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>; Schaefer, Daniel
> > <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto: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
>
>
>
>
>
[-- Attachment #1.2: Type: text/html, Size: 18577 bytes --]
[-- Attachment #2: image003.jpg --]
[-- Type: image/jpeg, Size: 43575 bytes --]
next prev parent reply other threads:[~2020-12-23 7:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-21 20:38 [PATCH edk2-platforms 0/2] RISC-V: Fix build errors Mark Salter
2020-12-21 20:38 ` [PATCH edk2-platforms 1/2] Silicon/RISC-V: Update old SMBIOS struct filed name Mark Salter
2020-12-21 20:38 ` [PATCH edk2-platforms 2/2] Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces Mark Salter
2020-12-22 6:36 ` [PATCH edk2-platforms 0/2] RISC-V: Fix build errors Abner Chang
2020-12-23 2:53 ` [edk2-devel] " Zhiguang Liu
2020-12-23 6:41 ` 回复: " gaoliming
2020-12-23 6:44 ` Michael D Kinney
2020-12-23 7:05 ` 回复: " gaoliming
2020-12-23 7:17 ` Bob Feng [this message]
2020-12-23 7:28 ` Zhiguang Liu
2020-12-23 15:47 ` Abner Chang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DM6PR11MB4073B7B4ED0E5A8C2CE43252C9DE0@DM6PR11MB4073.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox