Hi Guo

Merge conflict is resolved

Thanks

Sean


On Tue, 29 Mar 2022 at 19:01, Dong, Guo <guo.dong@intel.com> wrote:

>
>
> Hi Sean,
>
>
>
> I would help solve merge conflict and then merge
> https://github.com/tianocore/edk2/pull/2654.
>
> For another patch, please contact MdeModulePkg maintainer to help merge it.
>
>
>
> Thanks,
>
> Guo
>
>
>
> *From:* Sean Rhodes <sean@starlabs.systems>
> *Sent:* Tuesday, March 29, 2022 10:35 AM
> *To:* Dong, Guo <guo.dong@intel.com>
> *Cc:* devel@edk2.groups.io
> *Subject:* Re: [edk2-devel] [PATCH 15/18]
> UefiPayloadPkg/Library/PlatformBootManagerLib: Remove broken VGA detection
>
>
>
> Hey
>
>
>
> No problem and thank you.
>
>
>
> That have been reviewed, it's just these two:
>
> https://github.com/tianocore/edk2/pull/2654
>
> https://github.com/tianocore/edk2/pull/2485
>
>
>
> Thanks
>
>
>
> Sean
>
>
>
>
>
> On Tue, 29 Mar 2022 at 18:32, Dong, Guo <guo.dong@intel.com> wrote:
>
>
>
> Hi Sean,
>
>
>
> Sorry for late response. I merged several UEFI payload packages yesterday
> including this one.
>
> Please let me know if you have other patches pending to merge (The patches
> passed code review).
>
>
>
> Thanks,
>
> Guo
>
>
>
> *From:* devel@edk2.groups.io <devel@edk2.groups.io> *On Behalf Of *Sean
> Rhodes
> *Sent:* Monday, March 21, 2022 2:49 AM
> *To:* Dong, Guo <guo.dong@intel.com>; devel@edk2.groups.io
> *Subject:* Re: [edk2-devel] [PATCH 15/18]
> UefiPayloadPkg/Library/PlatformBootManagerLib: Remove broken VGA detection
>
>
>
> Hey Guo
>
> Can I chase when this patch will be merged?
>
> Many thanks
>
> Sean
>
> 
>
>