From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242])
 by mx.groups.io with SMTP id smtpd.web12.6886.1608714919404164257
 for <devel@edk2.groups.io>;
 Wed, 23 Dec 2020 01:15:21 -0800
Authentication-Results: mx.groups.io;
 dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn)
Received: from DESKTOPS6D0PVI ([58.246.60.130])
	(envelope-sender <gaoliming@byosoft.com.cn>)
	by 192.168.6.13 with ESMTP
	for <devel@edk2.groups.io>; Wed, 23 Dec 2020 17:15:13 +0800
X-WM-Sender: gaoliming@byosoft.com.cn
X-WM-AuthFlag: YES
X-WM-AuthUser: gaoliming@byosoft.com.cn
From: "gaoliming" <gaoliming@byosoft.com.cn>
To: <devel@edk2.groups.io>,
	<michael.d.kinney@intel.com>
References: <BL0PR11MB3236C5AA1501FE283DE19C13D2DE0@BL0PR11MB3236.namprd11.prod.outlook.com>
In-Reply-To: <BL0PR11MB3236C5AA1501FE283DE19C13D2DE0@BL0PR11MB3236.namprd11.prod.outlook.com>
Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gUGF1c2UgY29tbWl0cyB0byBlZGsyLXBsYXRmb3Jtcy9tYXN0ZXI=?=
Date: Wed, 23 Dec 2020 17:15:15 +0800
Message-ID: <00bc01d6d90c$20104360$6030ca20$@byosoft.com.cn>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQJfFSn5ruv0mM8BwOpOVuUlEhBZyajz67jw
Content-Type: text/plain;
	charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Content-Language: zh-cn

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

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

=3D=3D>

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

Thanks
Liming
> -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6-----
> =E5=8F=91=E4=BB=B6=E4=BA=BA: bounce+27952+69401+4905953+8761045@groups.i=
o
> <bounce+27952+69401+4905953+8761045@groups.io> =E4=BB=A3=E8=A1=A8 Michae=
l D
> Kinney
> =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2020=E5=B9=B412=E6=9C=8823=E6=97=
=A5 14:57
> =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io; Kinney, Michael D
> <michael.d.kinney@intel.com>
> =E4=B8=BB=E9=A2=98: [edk2-devel] Pause commits to edk2-platforms/master
>=20
> Hello,
>=20
> Please do not make any commits to edk2-platform/master until the followi=
ng
> issue is resolved.
>=20
> A merge commit was introduced that broke the linear history.
>=20
> *   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 p=
aging
> support
> * c95a1efe30 MinPlatformPkg: Fix SerialPortTerminalLib.inf header
>=20
> As soon as this resolved, a follow up email will be sent.
>=20
> Thanks,
>=20
> Mike
>=20
>=20
>=20
>=20