Pause commits to edk2-platforms/master

Pause commits to edk2-platforms/master

[Michael D Kinney]

Hello,

Please do not make any commits to edk2-platform/master until the following
issue is resolved.

A merge commit was introduced that broke the linear history.

*   df24ce3258 (HEAD -> master, origin/master, origin/HEAD) Merge pull request #15 from tianocore/devel-riscvplatform
|\
| * 9e459701f5 Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces
| * 884efae1e0 Silicon/RISC-V: Update old SMBIOS struct filed name
|/
* fbdfe8c410 Silicon/Marvell/RealTimeClockLib: make EpochSeconds, WakeupSeconds UINTN
* 84c9038f3b IntelSiliconPkg/VTd: Fix build fail for add iommu 5 level paging support
* c95a1efe30 MinPlatformPkg: Fix SerialPortTerminalLib.inf header

As soon as this resolved, a follow up email will be sent.

Thanks,

Mike

回复: [edk2-devel] Pause commits to edk2-platforms/master

[gaoliming]

Mike:
  Force rebase can remove the merge commit only. If so, its impact should be small. 

*   df24ce3258 (HEAD -> master, origin/master, origin/HEAD) Merge pull request #15 from tianocore/devel-riscvplatform
|\
| * 9e459701f5 Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces
| * 884efae1e0 Silicon/RISC-V: Update old SMBIOS struct filed name
|/
* fbdfe8c410 Silicon/Marvell/RealTimeClockLib: make EpochSeconds, WakeupSeconds UINTN
* 84c9038f3b IntelSiliconPkg/VTd: Fix build fail for add iommu 5 level paging support
* c95a1efe30 MinPlatformPkg: Fix SerialPortTerminalLib.inf header

==>

* 9e459701f5 Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces
* 884efae1e0 Silicon/RISC-V: Update old SMBIOS struct filed name
* fbdfe8c410 Silicon/Marvell/RealTimeClockLib: make EpochSeconds, WakeupSeconds UINTN
* 84c9038f3b IntelSiliconPkg/VTd: Fix build fail for add iommu 5 level paging support
* c95a1efe30 MinPlatformPkg: Fix SerialPortTerminalLib.inf header

Thanks
Liming
> -----邮件原件-----
> 发件人: bounce+27952+69401+4905953+8761045@groups.io
> <bounce+27952+69401+4905953+8761045@groups.io> 代表 Michael D
> Kinney
> 发送时间: 2020年12月23日 14:57
> 收件人: devel@edk2.groups.io; Kinney, Michael D
> <michael.d.kinney@intel.com>
> 主题: [edk2-devel] Pause commits to edk2-platforms/master
> 
> Hello,
> 
> Please do not make any commits to edk2-platform/master until the following
> issue is resolved.
> 
> A merge commit was introduced that broke the linear history.
> 
> *   df24ce3258 (HEAD -> master, origin/master, origin/HEAD) Merge pull
> request #15 from tianocore/devel-riscvplatform
> |\
> | * 9e459701f5 Platform/SiFive/U5SeriesPkg: Remove use of deprecated
> interfaces
> | * 884efae1e0 Silicon/RISC-V: Update old SMBIOS struct filed name
> |/
> * fbdfe8c410 Silicon/Marvell/RealTimeClockLib: make EpochSeconds,
> WakeupSeconds UINTN
> * 84c9038f3b IntelSiliconPkg/VTd: Fix build fail for add iommu 5 level paging
> support
> * c95a1efe30 MinPlatformPkg: Fix SerialPortTerminalLib.inf header
> 
> As soon as this resolved, a follow up email will be sent.
> 
> Thanks,
> 
> Mike
> 
> 
> 
> 

Re: [edk2-devel] Pause commits to edk2-platforms/master

[Michael D Kinney]

I agree.  I will do a rebase and forced push to remove the merge commit.

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
> Sent: Wednesday, December 23, 2020 1:15 AM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: 回复: [edk2-devel] Pause commits to edk2-platforms/master
> 
> Mike:
>   Force rebase can remove the merge commit only. If so, its impact should be small.
> 
> *   df24ce3258 (HEAD -> master, origin/master, origin/HEAD) Merge pull request #15 from tianocore/devel-riscvplatform
> |\
> | * 9e459701f5 Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces
> | * 884efae1e0 Silicon/RISC-V: Update old SMBIOS struct filed name
> |/
> * fbdfe8c410 Silicon/Marvell/RealTimeClockLib: make EpochSeconds, WakeupSeconds UINTN
> * 84c9038f3b IntelSiliconPkg/VTd: Fix build fail for add iommu 5 level paging support
> * c95a1efe30 MinPlatformPkg: Fix SerialPortTerminalLib.inf header
> 
> ==>
> 
> * 9e459701f5 Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces
> * 884efae1e0 Silicon/RISC-V: Update old SMBIOS struct filed name
> * fbdfe8c410 Silicon/Marvell/RealTimeClockLib: make EpochSeconds, WakeupSeconds UINTN
> * 84c9038f3b IntelSiliconPkg/VTd: Fix build fail for add iommu 5 level paging support
> * c95a1efe30 MinPlatformPkg: Fix SerialPortTerminalLib.inf header
> 
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: bounce+27952+69401+4905953+8761045@groups.io
> > <bounce+27952+69401+4905953+8761045@groups.io> 代表 Michael D
> > Kinney
> > 发送时间: 2020年12月23日 14:57
> > 收件人: devel@edk2.groups.io; Kinney, Michael D
> > <michael.d.kinney@intel.com>
> > 主题: [edk2-devel] Pause commits to edk2-platforms/master
> >
> > Hello,
> >
> > Please do not make any commits to edk2-platform/master until the following
> > issue is resolved.
> >
> > A merge commit was introduced that broke the linear history.
> >
> > *   df24ce3258 (HEAD -> master, origin/master, origin/HEAD) Merge pull
> > request #15 from tianocore/devel-riscvplatform
> > |\
> > | * 9e459701f5 Platform/SiFive/U5SeriesPkg: Remove use of deprecated
> > interfaces
> > | * 884efae1e0 Silicon/RISC-V: Update old SMBIOS struct filed name
> > |/
> > * fbdfe8c410 Silicon/Marvell/RealTimeClockLib: make EpochSeconds,
> > WakeupSeconds UINTN
> > * 84c9038f3b IntelSiliconPkg/VTd: Fix build fail for add iommu 5 level paging
> > support
> > * c95a1efe30 MinPlatformPkg: Fix SerialPortTerminalLib.inf header
> >
> > As soon as this resolved, a follow up email will be sent.
> >
> > Thanks,
> >
> > Mike
> >
> >
> >
> >
> 
> 
> 
> 
> 
> 
>