merged

> -----Original Message-----
> From: Lin, Du <du....@intel.com>
> Sent: Thursday, May 30, 2024 8:07 PM
> To: Yao, Jiewen <jiewen....@intel.com>; devel@edk2.groups.io; gaoliming
> <gaolim...@byosoft.com.cn>
> Cc: 'Ard Biesheuvel' <ardb+tianoc...@kernel.org>; 'Gerd Hoffmann'
> <kra...@redhat.com>; Lin, Du <du....@intel.com>
> Subject: RE: [edk2-devel] [PATCH] OvmfPkg: Update VMM Hob list check to
> support new resource attributes
> 
> Hi Jiewen,
> 
> Thanks for your patience. I rebased this PR again since CI failed after "merge
> branch". And it is ready to go now.
> 
> Per my limited understanding, it should be OK to add the "push" label to 
> merge a
> PR to upstream even the PR shows "This branch is out-of-date with the base
> branch" as long as there are no merge conflicts.
>  - Example of adding "push" label to an out-of-date PR:
> https://github.com/tianocore/edk2/pull/5461
>  - Example of adding "push" label to an up-to-date PR:
> https://github.com/tianocore/edk2/pull/5460
> 
> BRs,
> Lin, Du
> 
> -----Original Message-----
> From: Yao, Jiewen <jiewen....@intel.com>
> Sent: Thursday, May 30, 2024 6:31 PM
> To: Lin, Du <du....@intel.com>; devel@edk2.groups.io; gaoliming
> <gaolim...@byosoft.com.cn>
> Cc: 'Ard Biesheuvel' <ardb+tianoc...@kernel.org>; 'Gerd Hoffmann'
> <kra...@redhat.com>
> Subject: RE: [edk2-devel] [PATCH] OvmfPkg: Update VMM Hob list check to
> support new resource attributes
> 
> It is out of date again.
> 
> When I click rebase, I notice git uses "merge branch". It seems not what we
> want.
> 
> I am not sure how to handle it.
> 
> Next time, please tell me ASAP once you submit a new PR.
> 
> 
> > -----Original Message-----
> > From: Lin, Du <du....@intel.com>
> > Sent: Thursday, May 30, 2024 6:26 PM
> > To: Yao, Jiewen <jiewen....@intel.com>; devel@edk2.groups.io;
> > gaoliming <gaolim...@byosoft.com.cn>
> > Cc: 'Ard Biesheuvel' <ardb+tianoc...@kernel.org>; 'Gerd Hoffmann'
> > <kra...@redhat.com>; Lin, Du <du....@intel.com>
> > Subject: RE: [edk2-devel] [PATCH] OvmfPkg: Update VMM Hob list check
> > to support new resource attributes
> >
> > Thanks Jiewen. A new PR has been submitted for this:
> > https://github.com/tianocore/edk2/pull/5699.
> >
> > BRs,
> > Lin, Du
> >
> > -----Original Message-----
> > From: Yao, Jiewen <jiewen....@intel.com>
> > Sent: Thursday, May 30, 2024 8:00 AM
> > To: devel@edk2.groups.io; Yao, Jiewen <jiewen....@intel.com>;
> > gaoliming <gaolim...@byosoft.com.cn>; Lin, Du <du....@intel.com>
> > Cc: 'Ard Biesheuvel' <ardb+tianoc...@kernel.org>; 'Gerd Hoffmann'
> > <kra...@redhat.com>
> > Subject: RE: [edk2-devel] [PATCH] OvmfPkg: Update VMM Hob list check
> > to support new resource attributes
> >
> > Lin Du
> > Just FYI: The CI failed after I rebase.
> >
> > If possible, I recommend to submit a new PR to get it resolved.
> > Then I can approve again.
> >
> >
> > > -----Original Message-----
> > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yao,
> > > Jiewen
> > > Sent: Monday, May 27, 2024 3:13 PM
> > > To: gaoliming <gaolim...@byosoft.com.cn>; devel@edk2.groups.io; Lin,
> > > Du <du....@intel.com>
> > > Cc: 'Ard Biesheuvel' <ardb+tianoc...@kernel.org>; 'Gerd Hoffmann'
> > > <kra...@redhat.com>
> > > Subject: Re: [edk2-devel] [PATCH] OvmfPkg: Update VMM Hob list check
> > > to support new resource attributes
> > >
> > > Thanks. Not urgent. Let’s wait.
> > >
> > >
> > > > -----Original Message-----
> > > > From: gaoliming <gaolim...@byosoft.com.cn>
> > > > Sent: Monday, May 27, 2024 3:12 PM
> > > > To: devel@edk2.groups.io; Yao, Jiewen <jiewen....@intel.com>; Lin,
> > > > Du <du....@intel.com>
> > > > Cc: 'Ard Biesheuvel' <ardb+tianoc...@kernel.org>; 'Gerd Hoffmann'
> > > > <kra...@redhat.com>
> > > > Subject: 回复: [edk2-devel] [PATCH] OvmfPkg: Update VMM Hob list
> > > > check to support new resource attributes
> > > >
> > > > Jiewen:
> > > >   If the patch is urgent to be merged, I will help add push label
> > > > to merge it with current process.
> > > >
> > > >   If the patch is not urgent, it can be merged after TianoCore
> > > > Code Review is switched from email to GitHub Pull Requests on US 
> > > > Tuesday.
> > > >
> > > > Thanks
> > > > Liming
> > > > > -----邮件原件-----
> > > > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Yao, Jiewen
> > > > > 发送时间: 2024年5月27日 14:43
> > > > > 收件人: Lin, Du <du....@intel.com>; devel@edk2.groups.io
> > > > > 抄送: Ard Biesheuvel <ardb+tianoc...@kernel.org>; Gerd Hoffmann
> > > > > <kra...@redhat.com>
> > > > > 主题: Re: [edk2-devel] [PATCH] OvmfPkg: Update VMM Hob list check
> > > > > to
> > > > support
> > > > > new resource attributes
> > > > >
> > > > > I have approved it.
> > > > >
> > > > > What is the process to merge? There is no COMMIT button or PUSH label.
> > > > >
> > > > >
> > > > > > -----Original Message-----
> > > > > > From: Lin, Du <du....@intel.com>
> > > > > > Sent: Monday, May 27, 2024 2:23 PM
> > > > > > To: devel@edk2.groups.io
> > > > > > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>; Gerd Hoffmann
> > > > > > <kra...@redhat.com>; Yao, Jiewen <jiewen....@intel.com>; Lin,
> > > > > > Du <du....@intel.com>
> > > > > > Subject: RE: [edk2-devel] [PATCH] OvmfPkg: Update VMM Hob list
> > > > > > check to support new resource attributes
> > > > > >
> > > > > > Thanks for the review and approval. Could you please help
> > > > > > merge this
> > > > patch to
> > > > > > the upstream? A pull request has been created for this patch:
> > > > > > https://github.com/tianocore/edk2/pull/5644. Thanks.
> > > > > >
> > > > > > BRs,
> > > > > > Lin, Du
> > > > > >
> > > > > > -----Original Message-----
> > > > > > From: Yao, Jiewen <jiewen....@intel.com>
> > > > > > Sent: Thursday, May 16, 2024 5:37 PM
> > > > > > To: devel@edk2.groups.io; Lin, Du <du....@intel.com>
> > > > > > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>; Gerd Hoffmann
> > > > > > <kra...@redhat.com>
> > > > > > Subject: RE: [edk2-devel] [PATCH] OvmfPkg: Update VMM Hob list
> > > > > > check to support new resource attributes
> > > > > >
> > > > > > Reviewed-by: Jiewen Yao <jiewen....@intel.com>
> > > > > >
> > > > > > > -----Original Message-----
> > > > > > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf
> > > > > > > Of Lin,
> > > Du
> > > > > > > Sent: Thursday, May 9, 2024 1:27 PM
> > > > > > > To: devel@edk2.groups.io
> > > > > > > Cc: Lin, Du <du....@intel.com>; Ard Biesheuvel
> > > > > > > <ardb+tianoc...@kernel.org>; Gerd Hoffmann
> > > > > > > <kra...@redhat.com>;
> > > Yao,
> > > > > > > Jiewen <jiewen....@intel.com>
> > > > > > > Subject: [edk2-devel] [PATCH] OvmfPkg: Update VMM Hob list
> > > > > > > check to support new resource attributes
> > > > > > >
> > > > > > > Encrypted and Special Purpose resource attributes are
> > > > > > > introduced in PI
> > > > > > > 1.8 Specification. This patch is to update VMM Hob list
> > > > > > > integrity check to recognise these resource attributes.
> > > > > > >
> > > > > > > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>
> > > > > > > Cc: Gerd Hoffmann <kra...@redhat.com>
> > > > > > > Cc: Jiewen Yao <jiewen....@intel.com>
> > > > > > > Signed-off-by: Du Lin <du....@intel.com>
> > > > > > > ---
> > > > > > >  OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelper.c | 2 ++
> > > > > > >  1 file changed, 2 insertions(+)
> > > > > > >
> > > > > > > diff --git a/OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelper.c
> > > > > > > b/OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelper.c
> > > > > > > index b6085eab44..19e9b1bf54 100644
> > > > > > > --- a/OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelper.c
> > > > > > > +++ b/OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelper.c
> > > > > > > @@ -643,6 +643,8 @@ ValidateHobList (
> > > > > > >
> > > > > > > EFI_RESOURCE_ATTRIBUTE_PERSISTABLE |
> > > > > > >
> > > > > > > EFI_RESOURCE_ATTRIBUTE_READ_ONLY_PROTECTED |
> > > > > > >
> > > > > > > EFI_RESOURCE_ATTRIBUTE_READ_ONLY_PROTECTABLE |
> > > > > > > +
> > > > > > > + EFI_RESOURCE_ATTRIBUTE_ENCRYPTED|
> > > > > > > +
> > > > > > > EFI_RESOURCE_ATTRIBUTE_SPECIAL_PURPOSE |
> > > > > > >
> > > > > > > EFI_RESOURCE_ATTRIBUTE_MORE_RELIABLE))) != 0)
> > > > > > >          {
> > > > > > >            DEBUG ((DEBUG_ERROR, "HOB: Unknow
> > > > > > > ResourceDescriptor ResourceAttribute type. Type: 0x%08x\n",
> > > > > > > Hob.ResourceDescriptor-
> > > > > > > >ResourceAttribute));
> > > > > > > --
> > > > > > > 2.44.0.windows.1
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >
> > > > >
> > > > >
> > > > >
> > > > >
> > > > >
> > > >
> > > >
> > >
> > >
> > >
> > > 
> > >



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119394): https://edk2.groups.io/g/devel/message/119394
Mute This Topic: https://groups.io/mt/106379971/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-


Reply via email to