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.32829.1608512939230577034
 for <devel@edk2.groups.io>;
 Sun, 20 Dec 2020 17:09:00 -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>; Mon, 21 Dec 2020 09:08:57 +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: <rfc@edk2.groups.io>,
	<michael.d.kinney@intel.com>,
	<devel@edk2.groups.io>
References: <BL0PR11MB323658BAFBE5A6522E630470D2C20@BL0PR11MB3236.namprd11.prod.outlook.com>
In-Reply-To: <BL0PR11MB323658BAFBE5A6522E630470D2C20@BL0PR11MB3236.namprd11.prod.outlook.com>
Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1yZmNdIFtSRkMgVjNdIENyZWF0ZSBzdXBwb3J0ZWQgYnJhbmNoIGZyb20gZWRrMi1zdGFibGUqIHRhZyAoUmVxdWlyZWQgdG8gYWRkcmVzcyBjcml0aWNhbCBidWcgQlozMTExKQ==?=
Date: Mon, 21 Dec 2020 09:08:57 +0800
Message-ID: <012001d6d735$dc16d250$944476f0$@byosoft.com.cn>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQFicemvo6iRm0EEQhardP5kZaK0F6rphl3g
Content-Type: text/plain;
	charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Language: zh-cn

Mike:
  It is OK to me. I have no other comments.=20

Thanks
Liming
> -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6-----
> =E5=8F=91=E4=BB=B6=E4=BA=BA: bounce+34240+470+4905953+8776774@groups.io
> <bounce+34240+470+4905953+8776774@groups.io> =E4=BB=A3=E8=A1=A8 Michael =
D
> Kinney
> =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2020=E5=B9=B412=E6=9C=8819=E6=97=
=A5 10:03
> =E6=94=B6=E4=BB=B6=E4=BA=BA: rfc@edk2.groups.io; devel@edk2.groups.io; K=
inney, Michael D
> <michael.d.kinney@intel.com>
> =E4=B8=BB=E9=A2=98: [edk2-rfc] [RFC V3] Create supported branch from edk=
2-stable* tag
> (Required to address critical bug BZ3111)
>=20
> Hello,
>=20
>=20
>=20
> The following bug has been fixed on edk2/master
>=20
>=20
>=20
>     https://bugzilla.tianocore.org/show_bug.cgi?id=3D3111
>=20
>     https://github.com/tianocore/edk2/pull/1226
>=20
>=20
>=20
> This bug is also considered a critical bug against edk2-stable202011.  T=
he
> behavior
>=20
> of the Variable Lock Protocol was changed in a non-backwards compatible
> manner in
>=20
> edk2-stable202011 and this is impacting some downstream platforms.  The
> following
>=20
> 2 commits on edk2/master restore the original behavior of the Variable L=
ock
> Protocol.
>=20
>=20
>=20
>=20
> https://github.com/tianocore/edk2/pull/1226/commits/893cfe2847b83da74f
> 53858d6acaa15a348bad7c
>=20
>=20
> https://github.com/tianocore/edk2/pull/1226/commits/16491ba6a6e9a91ce
> deeed45bc0fbdfde49f7968
>=20
>=20
>=20
> The request here is to create a supported branch from edk2-stable202011 =
tag
> and apply
>=20
> these 2 commits as critical bug fixes on the supported branch.
>=20
>=20
>=20
> Since we started using the edk2-stable* tag process, there has not been =
a
> request to create
>=20
> a supported branch from one of those tags.  As a result, there are a cou=
ple
> opens that
>=20
> need to be addressed:
>=20
>=20
>=20
> 1) Supported branch naming convention.
>=20
>=20
>=20
>     Branch Proposal: stable/<YYYY><MM>
>=20
>     Branch Example:  stable/202011
>=20
>=20
>=20
> 2) CI requirements for supported branches.
>=20
>=20
>=20
>     Proposal: Update .azurepipelines yml files to trigger on stable/*
> branches,
>=20
>     update .mergify configuration file to support merging of stable/*
> branches,
>=20
>     and update GitHub branch protection settings to protect stable/*
> branches.
>=20
>=20
>=20
> 3) A stable/* branch is only supported until the next edk2-stable tag re=
lease.
>=20
>=20
>=20
> 4) Release requirements for supported branches.
>=20
>=20
>=20
>    Proposal: If there are a significant number of critical fixes applied=
 to
>=20
>    a stable/* branch, then a request for a release can be made that woul=
d
>=20
>    trigger focused testing of the supported branch and creation of a new
>=20
>    release.  If all testing passes, then a tag is created on the stable/=
*
>=20
>    branch and a release is created on GitHub that summarizes the set of
>=20
>    critical fixes and the testing performed.
>=20
>=20
>=20
>    Tag Proposal: edk2-stable<YYYY><MM>.<XX>
>=20
>    Tag Example : edk2-stable202011.01
>=20
>=20
>=20
> Please let me know if you have any feedback or comments on this proposal=
.
> The goal
>=20
> is to close on this topic this week.
>=20
>=20
>=20
> Thank you,
>=20
>=20
>=20
> Mike
>=20
>=20
>=20
>=20
>=20