From: "Michael D Kinney" <michael.d.kinney@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>
Subject: Re: [edk2-devel] Pause commits to edk2-platforms/master
Date: Wed, 23 Dec 2020 19:07:00 +0000 [thread overview]
Message-ID: <BL0PR11MB323695676560A0F640059C8BD2DE0@BL0PR11MB3236.namprd11.prod.outlook.com> (raw)
In-Reply-To: <00bc01d6d90c$20104360$6030ca20$@byosoft.com.cn>
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
> >
> >
> >
> >
>
>
>
>
>
>
>
prev parent reply other threads:[~2020-12-23 19:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-23 6:56 Pause commits to edk2-platforms/master Michael D Kinney
2020-12-23 9:15 ` 回复: [edk2-devel] " gaoliming
2020-12-23 19:07 ` Michael D Kinney [this message]
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=BL0PR11MB323695676560A0F640059C8BD2DE0@BL0PR11MB3236.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