[PATCH 0/3] Maintainers.txt: restore lexicographical order between package / subsystem headers

[PATCH 0/3] Maintainers.txt: restore lexicographical order between package / subsystem headers

[Laszlo Ersek]

Ref:    https://bugzilla.tianocore.org/show_bug.cgi?id=2778
Repo:   https://pagure.io/lersek/edk2.git
Branch: sort_maintainers

We originally meant to keep the subsystem (package) titles sorted, in
"Maintainers.txt".

However, as of 7191dd3c5990 ("ArmPkg/PlatformBootManagerLib: reject
'default' parity and stop bit count", 2020-06-03), we have some disorder
introduced.

This patch series restores lexicographical order between the subsystem
(package) headers.

The package / subsystem headers can be collected with the following
small script:

$ dos2unix < Maintainers.txt \
  | sed -n -e '/^EDK II Packages:$/,$p' \
  | tail -n +3 \
  | grep -E -v '^($|[LMRWTSFX]:)'

Where

- "dos2unix" strips CRs,

- "sed" removes the first part of the file that precedes the "EDK II
  Packages:" heading,

- "tail" removes that heading plus the underline on the next line,

- and "grep" removes the empty lines and the section entries.

What remains is the section headers.

Here's a comparison between the outputs of this script, before (that is,
at commit 7191dd3c5990) and after the series is applied:

> @@ -1,42 +1,42 @@
>  ArmPkg
>  ArmPlatformPkg
>  ArmVirtPkg
>  ArmVirtPkg: modules used on Xen
>  BaseTools
>  CryptoPkg
>  DynamicTablesPkg
>  EmbeddedPkg
>  EmulatorPkg
>  FatPkg
>  FmpDevicePkg
>  IntelFsp2Pkg
>  IntelFsp2WrapperPkg
>  MdeModulePkg
>  MdeModulePkg: ACPI modules
> -MdeModulePkg: ACPI S3 modules
> +MdeModulePkg: ACPI modules related to S3
>  MdeModulePkg: BDS modules
>  MdeModulePkg: Console and Graphics modules
>  MdeModulePkg: Core services (PEI, DXE and Runtime) modules
>  MdeModulePkg: Device and Peripheral modules
>  MdeModulePkg: Firmware Update modules
>  MdeModulePkg: HII and UI modules
>  MdeModulePkg: Management Mode (MM, SMM) modules
>  MdeModulePkg: Reset modules
>  MdeModulePkg: SMBIOS modules
>  MdeModulePkg: UEFI Variable modules
>  MdePkg
>  NetworkPkg
>  OvmfPkg
> -OvmfPkg: Xen-related modules
> -OvmfPkg: TCG- and TPM2-related modules
>  OvmfPkg: CSM modules
>  OvmfPkg: MptScsi and PVSCSI driver
> +OvmfPkg: TCG- and TPM2-related modules
> +OvmfPkg: Xen-related modules
>  PcAtChipsetPkg
>  SecurityPkg
>  ShellPkg
>  SignedCapsulePkg
>  SourceLevelDebugPkg
> +StandaloneMmPkg
>  UefiCpuPkg
>  UefiPayloadPkg
>  UnitTestFrameworkPkg
> -StandaloneMmPkg

Cc: Andrew Fish <afish@apple.com>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien@xen.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Liran Alon <liran.alon@oracle.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Nikita Leshenko <nikita.leshchenko@oracle.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Stefan Berger <stefanb@linux.ibm.com>
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>

Thanks,
Laszlo

Laszlo Ersek (3):
  Maintainers.txt: retitle "MdeModulePkg: ACPI S3 modules"
  Maintainers.txt: restore order of OvmfPkg sections
  Maintainers.txt: move StandaloneMmPkg to the right spot

 Maintainers.txt | 54 ++++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

-- 
2.19.1.3.g30247aa5d201

[PATCH 1/3] Maintainers.txt: retitle "MdeModulePkg: ACPI S3 modules"

[Laszlo Ersek]

The following two section titles in "Maintainers.txt" are not in
(case-sensitive) lexicographical order:

> MdeModulePkg: ACPI modules
> MdeModulePkg: ACPI S3 modules

However, if we simply sorted them, we'd have another problem: the specific
"ACPI S3 modules" line would precede the generic "ACPI modules" line.

Therefore, slightly reformulate the title on the second section, in order
to establish both lexicographical and hierarchical order.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2778
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 Maintainers.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Maintainers.txt b/Maintainers.txt
index 896ac5821fc6..012b768035eb 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -209,35 +209,35 @@ F: IntelFsp2WrapperPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFsp2WrapperPkg
 M: Chasel Chiu <chasel.chiu@intel.com>
 R: Nate DeSimone <nathaniel.l.desimone@intel.com>
 R: Star Zeng <star.zeng@intel.com>
 
 MdeModulePkg
 F: MdeModulePkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/MdeModulePkg
 M: Jian J Wang <jian.j.wang@intel.com>
 M: Hao A Wu <hao.a.wu@intel.com>
 
 MdeModulePkg: ACPI modules
 F: MdeModulePkg/Include/*Acpi*.h
 F: MdeModulePkg/Universal/Acpi/
 R: Dandan Bi <dandan.bi@intel.com>
 R: Liming Gao <liming.gao@intel.com>
 
-MdeModulePkg: ACPI S3 modules
+MdeModulePkg: ACPI modules related to S3
 F: MdeModulePkg/*LockBox*/
 F: MdeModulePkg/Include/*BootScript*.h
 F: MdeModulePkg/Include/*LockBox*.h
 F: MdeModulePkg/Include/*S3*.h
 F: MdeModulePkg/Library/*S3*/
 R: Hao A Wu <hao.a.wu@intel.com>
 R: Eric Dong <eric.dong@intel.com>
 
 MdeModulePkg: BDS modules
 F: MdeModulePkg/*BootManager*/
 F: MdeModulePkg/Include/Library/UefiBootManagerLib.h
 F: MdeModulePkg/Universal/BdsDxe/
 F: MdeModulePkg/Universal/DevicePathDxe/
 F: MdeModulePkg/Universal/DriverHealthManagerDxe/
 F: MdeModulePkg/Universal/LoadFileOnFv2/
 F: MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.*
 R: Zhichao Gao <zhichao.gao@intel.com>
-- 
2.19.1.3.g30247aa5d201

[PATCH 2/3] Maintainers.txt: restore order of OvmfPkg sections

[Laszlo Ersek]

The OvmfPkg subsystem / section headers are currently ordered in
Maintainers.txt as follows:

> OvmfPkg
> OvmfPkg: Xen-related modules
> OvmfPkg: TCG- and TPM2-related modules
> OvmfPkg: CSM modules
> OvmfPkg: MptScsi and PVSCSI driver

Restore the following (alphabetical) order between them:

> OvmfPkg
> OvmfPkg: CSM modules
> OvmfPkg: MptScsi and PVSCSI driver
> OvmfPkg: TCG- and TPM2-related modules
> OvmfPkg: Xen-related modules

Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien@xen.org>
Cc: Liran Alon <liran.alon@oracle.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Nikita Leshenko <nikita.leshchenko@oracle.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Stefan Berger <stefanb@linux.ibm.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2778
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 Maintainers.txt | 38 ++++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Maintainers.txt b/Maintainers.txt
index 012b768035eb..ca383f593232 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -375,86 +375,86 @@ M: Michael D Kinney <michael.d.kinney@intel.com>
 M: Liming Gao <liming.gao@intel.com>
 
 NetworkPkg
 F: NetworkPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
 M: Maciej Rabeda <maciej.rabeda@linux.intel.com>
 R: Jiaxin Wu <jiaxin.wu@intel.com>
 R: Siyuan Fu <siyuan.fu@intel.com>
 
 OvmfPkg
 F: OvmfPkg/
 W: http://www.tianocore.org/ovmf/
 M: Jordan Justen <jordan.l.justen@intel.com>
 M: Laszlo Ersek <lersek@redhat.com>
 M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 S: Maintained
 
+OvmfPkg: CSM modules
+F: OvmfPkg/Csm/
+R: David Woodhouse <dwmw2@infradead.org>
+
+OvmfPkg: MptScsi and PVSCSI driver
+F: OvmfPkg/MptScsiDxe/
+F: OvmfPkg/PvScsiDxe/
+R: Liran Alon <liran.alon@oracle.com>
+R: Nikita Leshenko <nikita.leshchenko@oracle.com>
+
+OvmfPkg: TCG- and TPM2-related modules
+F: OvmfPkg/Include/IndustryStandard/QemuTpm.h
+F: OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+F: OvmfPkg/Library/Tcg2PhysicalPresenceLib*/
+F: OvmfPkg/PlatformPei/ClearCache.c
+F: OvmfPkg/Tcg/
+R: Marc-André Lureau <marcandre.lureau@redhat.com>
+R: Stefan Berger <stefanb@linux.ibm.com>
+
 OvmfPkg: Xen-related modules
 F: OvmfPkg/AcpiPlatformDxe/Xen.c
 F: OvmfPkg/Include/Guid/XenBusRootDevice.h
 F: OvmfPkg/Include/Guid/XenInfo.h
 F: OvmfPkg/Include/IndustryStandard/Xen/
 F: OvmfPkg/Include/Library/XenHypercallLib.h
 F: OvmfPkg/Include/Library/XenIoMmioLib.h
 F: OvmfPkg/Include/Library/XenPlatformLib.h
 F: OvmfPkg/Include/Protocol/XenBus.h
 F: OvmfPkg/Include/Protocol/XenIo.h
 F: OvmfPkg/Library/PciHostBridgeLib/XenSupport.c
 F: OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
 F: OvmfPkg/Library/XenConsoleSerialPortLib/
 F: OvmfPkg/Library/XenHypercallLib/
 F: OvmfPkg/Library/XenIoMmioLib/
 F: OvmfPkg/Library/XenPlatformLib/
 F: OvmfPkg/Library/XenRealTimeClockLib/
 F: OvmfPkg/OvmfXen.*
 F: OvmfPkg/OvmfXenElfHeaderGenerator.c
 F: OvmfPkg/PlatformPei/MemDetect.c
 F: OvmfPkg/PlatformPei/Platform.*
 F: OvmfPkg/PlatformPei/Xen.*
 F: OvmfPkg/SmbiosPlatformDxe/*Xen.c
 F: OvmfPkg/XenBusDxe/
 F: OvmfPkg/XenIoPciDxe/
 F: OvmfPkg/XenIoPvhDxe/
 F: OvmfPkg/XenPlatformPei/
 F: OvmfPkg/XenPvBlkDxe/
 F: OvmfPkg/XenResetVector/
 F: OvmfPkg/XenTimerDxe/
 R: Anthony Perard <anthony.perard@citrix.com>
 R: Julien Grall <julien@xen.org>
 
-OvmfPkg: TCG- and TPM2-related modules
-F: OvmfPkg/Include/IndustryStandard/QemuTpm.h
-F: OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
-F: OvmfPkg/Library/Tcg2PhysicalPresenceLib*/
-F: OvmfPkg/PlatformPei/ClearCache.c
-F: OvmfPkg/Tcg/
-R: Marc-André Lureau <marcandre.lureau@redhat.com>
-R: Stefan Berger <stefanb@linux.ibm.com>
-
-OvmfPkg: CSM modules
-F: OvmfPkg/Csm/
-R: David Woodhouse <dwmw2@infradead.org>
-
-OvmfPkg: MptScsi and PVSCSI driver
-F: OvmfPkg/MptScsiDxe/
-F: OvmfPkg/PvScsiDxe/
-R: Liran Alon <liran.alon@oracle.com>
-R: Nikita Leshenko <nikita.leshchenko@oracle.com>
-
 PcAtChipsetPkg
 F: PcAtChipsetPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/PcAtChipsetPkg
 M: Ray Ni <ray.ni@intel.com>
 
 SecurityPkg
 F: SecurityPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/SecurityPkg
 M: Jiewen Yao <jiewen.yao@intel.com>
 M: Jian J Wang <jian.j.wang@intel.com>
 R: Chao Zhang <chao.b.zhang@intel.com>
 
 ShellPkg
 F: ShellPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg
 M: Ray Ni <ray.ni@intel.com>
 M: Zhichao Gao <zhichao.gao@intel.com>
-- 
2.19.1.3.g30247aa5d201

[PATCH 3/3] Maintainers.txt: move StandaloneMmPkg to the right spot

[Laszlo Ersek]

Place StandaloneMmPkg between SourceLevelDebugPkg and UefiCpuPkg, where it
belongs in lexicographical order. (Right now it succeeds
UnitTestFrameworkPkg, which is a disorder.)

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2778
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 Maintainers.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Maintainers.txt b/Maintainers.txt
index ca383f593232..760d704d44bd 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -456,45 +456,45 @@ R: Chao Zhang <chao.b.zhang@intel.com>
 ShellPkg
 F: ShellPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg
 M: Ray Ni <ray.ni@intel.com>
 M: Zhichao Gao <zhichao.gao@intel.com>
 
 SignedCapsulePkg
 F: SignedCapsulePkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/SignedCapsulePkg
 M: Jiewen Yao <jiewen.yao@intel.com>
 M: Chao Zhang <chao.b.zhang@intel.com>
 
 SourceLevelDebugPkg
 F: SourceLevelDebugPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/SourceLevelDebugPkg
 M: Hao A Wu <hao.a.wu@intel.com>
 
+StandaloneMmPkg
+F: StandaloneMmPkg/
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+M: Sami Mujawar <sami.mujawar@arm.com>
+M: Jiewen Yao <jiewen.yao@intel.com>
+R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
+
 UefiCpuPkg
 F: UefiCpuPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/UefiCpuPkg
 M: Eric Dong <eric.dong@intel.com>
 M: Ray Ni <ray.ni@intel.com>
 R: Laszlo Ersek <lersek@redhat.com>
 
 UefiPayloadPkg
 F: UefiPayloadPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/UefiPayloadPkg
 M: Maurice Ma <maurice.ma@intel.com>
 M: Guo Dong <guo.dong@intel.com>
 M: Benjamin You <benjamin.you@intel.com>
 S: Maintained
 
 UnitTestFrameworkPkg
 F: UnitTestFrameworkPkg/
 M: Michael D Kinney <michael.d.kinney@intel.com>
 R: Sean Brogan <sean.brogan@microsoft.com>
 R: Bret Barkelew <Bret.Barkelew@microsoft.com>
 S: Maintained
-
-StandaloneMmPkg
-F: StandaloneMmPkg/
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>
-M: Sami Mujawar <sami.mujawar@arm.com>
-M: Jiewen Yao <jiewen.yao@intel.com>
-R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 3/3] Maintainers.txt: move StandaloneMmPkg to the right spot

[Ard Biesheuvel]

On 6/3/20 6:06 PM, Laszlo Ersek wrote:
> Place StandaloneMmPkg between SourceLevelDebugPkg and UefiCpuPkg, where it
> belongs in lexicographical order. (Right now it succeeds
> UnitTestFrameworkPkg, which is a disorder.)
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2778
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

> ---
>   Maintainers.txt | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt
> index ca383f593232..760d704d44bd 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -456,45 +456,45 @@ R: Chao Zhang <chao.b.zhang@intel.com>
>   ShellPkg
>   F: ShellPkg/
>   W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg
>   M: Ray Ni <ray.ni@intel.com>
>   M: Zhichao Gao <zhichao.gao@intel.com>
>   
>   SignedCapsulePkg
>   F: SignedCapsulePkg/
>   W: https://github.com/tianocore/tianocore.github.io/wiki/SignedCapsulePkg
>   M: Jiewen Yao <jiewen.yao@intel.com>
>   M: Chao Zhang <chao.b.zhang@intel.com>
>   
>   SourceLevelDebugPkg
>   F: SourceLevelDebugPkg/
>   W: https://github.com/tianocore/tianocore.github.io/wiki/SourceLevelDebugPkg
>   M: Hao A Wu <hao.a.wu@intel.com>
>   
> +StandaloneMmPkg
> +F: StandaloneMmPkg/
> +M: Ard Biesheuvel <ard.biesheuvel@arm.com>
> +M: Sami Mujawar <sami.mujawar@arm.com>
> +M: Jiewen Yao <jiewen.yao@intel.com>
> +R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> +
>   UefiCpuPkg
>   F: UefiCpuPkg/
>   W: https://github.com/tianocore/tianocore.github.io/wiki/UefiCpuPkg
>   M: Eric Dong <eric.dong@intel.com>
>   M: Ray Ni <ray.ni@intel.com>
>   R: Laszlo Ersek <lersek@redhat.com>
>   
>   UefiPayloadPkg
>   F: UefiPayloadPkg/
>   W: https://github.com/tianocore/tianocore.github.io/wiki/UefiPayloadPkg
>   M: Maurice Ma <maurice.ma@intel.com>
>   M: Guo Dong <guo.dong@intel.com>
>   M: Benjamin You <benjamin.you@intel.com>
>   S: Maintained
>   
>   UnitTestFrameworkPkg
>   F: UnitTestFrameworkPkg/
>   M: Michael D Kinney <michael.d.kinney@intel.com>
>   R: Sean Brogan <sean.brogan@microsoft.com>
>   R: Bret Barkelew <Bret.Barkelew@microsoft.com>
>   S: Maintained
> -
> -StandaloneMmPkg
> -F: StandaloneMmPkg/
> -M: Ard Biesheuvel <ard.biesheuvel@arm.com>
> -M: Sami Mujawar <sami.mujawar@arm.com>
> -M: Jiewen Yao <jiewen.yao@intel.com>
> -R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> 

Re: [PATCH 2/3] Maintainers.txt: restore order of OvmfPkg sections

[Ard Biesheuvel]

On 6/3/20 6:06 PM, Laszlo Ersek wrote:
> The OvmfPkg subsystem / section headers are currently ordered in
> Maintainers.txt as follows:
> 
>> OvmfPkg
>> OvmfPkg: Xen-related modules
>> OvmfPkg: TCG- and TPM2-related modules
>> OvmfPkg: CSM modules
>> OvmfPkg: MptScsi and PVSCSI driver
> 
> Restore the following (alphabetical) order between them:
> 
>> OvmfPkg
>> OvmfPkg: CSM modules
>> OvmfPkg: MptScsi and PVSCSI driver
>> OvmfPkg: TCG- and TPM2-related modules
>> OvmfPkg: Xen-related modules
> 
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Julien Grall <julien@xen.org>
> Cc: Liran Alon <liran.alon@oracle.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Nikita Leshenko <nikita.leshchenko@oracle.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Stefan Berger <stefanb@linux.ibm.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2778
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

> ---
>   Maintainers.txt | 38 ++++++++++----------
>   1 file changed, 19 insertions(+), 19 deletions(-)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt
> index 012b768035eb..ca383f593232 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -375,86 +375,86 @@ M: Michael D Kinney <michael.d.kinney@intel.com>
>   M: Liming Gao <liming.gao@intel.com>
>   
>   NetworkPkg
>   F: NetworkPkg/
>   W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
>   M: Maciej Rabeda <maciej.rabeda@linux.intel.com>
>   R: Jiaxin Wu <jiaxin.wu@intel.com>
>   R: Siyuan Fu <siyuan.fu@intel.com>
>   
>   OvmfPkg
>   F: OvmfPkg/
>   W: http://www.tianocore.org/ovmf/
>   M: Jordan Justen <jordan.l.justen@intel.com>
>   M: Laszlo Ersek <lersek@redhat.com>
>   M: Ard Biesheuvel <ard.biesheuvel@arm.com>
>   S: Maintained
>   
> +OvmfPkg: CSM modules
> +F: OvmfPkg/Csm/
> +R: David Woodhouse <dwmw2@infradead.org>
> +
> +OvmfPkg: MptScsi and PVSCSI driver
> +F: OvmfPkg/MptScsiDxe/
> +F: OvmfPkg/PvScsiDxe/
> +R: Liran Alon <liran.alon@oracle.com>
> +R: Nikita Leshenko <nikita.leshchenko@oracle.com>
> +
> +OvmfPkg: TCG- and TPM2-related modules
> +F: OvmfPkg/Include/IndustryStandard/QemuTpm.h
> +F: OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> +F: OvmfPkg/Library/Tcg2PhysicalPresenceLib*/
> +F: OvmfPkg/PlatformPei/ClearCache.c
> +F: OvmfPkg/Tcg/
> +R: Marc-André Lureau <marcandre.lureau@redhat.com>
> +R: Stefan Berger <stefanb@linux.ibm.com>
> +
>   OvmfPkg: Xen-related modules
>   F: OvmfPkg/AcpiPlatformDxe/Xen.c
>   F: OvmfPkg/Include/Guid/XenBusRootDevice.h
>   F: OvmfPkg/Include/Guid/XenInfo.h
>   F: OvmfPkg/Include/IndustryStandard/Xen/
>   F: OvmfPkg/Include/Library/XenHypercallLib.h
>   F: OvmfPkg/Include/Library/XenIoMmioLib.h
>   F: OvmfPkg/Include/Library/XenPlatformLib.h
>   F: OvmfPkg/Include/Protocol/XenBus.h
>   F: OvmfPkg/Include/Protocol/XenIo.h
>   F: OvmfPkg/Library/PciHostBridgeLib/XenSupport.c
>   F: OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
>   F: OvmfPkg/Library/XenConsoleSerialPortLib/
>   F: OvmfPkg/Library/XenHypercallLib/
>   F: OvmfPkg/Library/XenIoMmioLib/
>   F: OvmfPkg/Library/XenPlatformLib/
>   F: OvmfPkg/Library/XenRealTimeClockLib/
>   F: OvmfPkg/OvmfXen.*
>   F: OvmfPkg/OvmfXenElfHeaderGenerator.c
>   F: OvmfPkg/PlatformPei/MemDetect.c
>   F: OvmfPkg/PlatformPei/Platform.*
>   F: OvmfPkg/PlatformPei/Xen.*
>   F: OvmfPkg/SmbiosPlatformDxe/*Xen.c
>   F: OvmfPkg/XenBusDxe/
>   F: OvmfPkg/XenIoPciDxe/
>   F: OvmfPkg/XenIoPvhDxe/
>   F: OvmfPkg/XenPlatformPei/
>   F: OvmfPkg/XenPvBlkDxe/
>   F: OvmfPkg/XenResetVector/
>   F: OvmfPkg/XenTimerDxe/
>   R: Anthony Perard <anthony.perard@citrix.com>
>   R: Julien Grall <julien@xen.org>
>   
> -OvmfPkg: TCG- and TPM2-related modules
> -F: OvmfPkg/Include/IndustryStandard/QemuTpm.h
> -F: OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> -F: OvmfPkg/Library/Tcg2PhysicalPresenceLib*/
> -F: OvmfPkg/PlatformPei/ClearCache.c
> -F: OvmfPkg/Tcg/
> -R: Marc-André Lureau <marcandre.lureau@redhat.com>
> -R: Stefan Berger <stefanb@linux.ibm.com>
> -
> -OvmfPkg: CSM modules
> -F: OvmfPkg/Csm/
> -R: David Woodhouse <dwmw2@infradead.org>
> -
> -OvmfPkg: MptScsi and PVSCSI driver
> -F: OvmfPkg/MptScsiDxe/
> -F: OvmfPkg/PvScsiDxe/
> -R: Liran Alon <liran.alon@oracle.com>
> -R: Nikita Leshenko <nikita.leshchenko@oracle.com>
> -
>   PcAtChipsetPkg
>   F: PcAtChipsetPkg/
>   W: https://github.com/tianocore/tianocore.github.io/wiki/PcAtChipsetPkg
>   M: Ray Ni <ray.ni@intel.com>
>   
>   SecurityPkg
>   F: SecurityPkg/
>   W: https://github.com/tianocore/tianocore.github.io/wiki/SecurityPkg
>   M: Jiewen Yao <jiewen.yao@intel.com>
>   M: Jian J Wang <jian.j.wang@intel.com>
>   R: Chao Zhang <chao.b.zhang@intel.com>
>   
>   ShellPkg
>   F: ShellPkg/
>   W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg
>   M: Ray Ni <ray.ni@intel.com>
>   M: Zhichao Gao <zhichao.gao@intel.com>
> 

Re: [PATCH 0/3] Maintainers.txt: restore lexicographical order between package / subsystem headers

[Philippe Mathieu-Daudé]

On 6/3/20 6:06 PM, Laszlo Ersek wrote:
> Ref:    https://bugzilla.tianocore.org/show_bug.cgi?id=2778
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: sort_maintainers
> 
> We originally meant to keep the subsystem (package) titles sorted, in
> "Maintainers.txt".
> 
> However, as of 7191dd3c5990 ("ArmPkg/PlatformBootManagerLib: reject
> 'default' parity and stop bit count", 2020-06-03), we have some disorder
> introduced.
> 
> This patch series restores lexicographical order between the subsystem
> (package) headers.
> 
> The package / subsystem headers can be collected with the following
> small script:
> 
> $ dos2unix < Maintainers.txt \
>   | sed -n -e '/^EDK II Packages:$/,$p' \
>   | tail -n +3 \
>   | grep -E -v '^($|[LMRWTSFX]:)'
> 
> Where
> 
> - "dos2unix" strips CRs,
> 
> - "sed" removes the first part of the file that precedes the "EDK II
>   Packages:" heading,
> 
> - "tail" removes that heading plus the underline on the next line,
> 
> - and "grep" removes the empty lines and the section entries.
> 
> What remains is the section headers.
> 
> Here's a comparison between the outputs of this script, before (that is,
> at commit 7191dd3c5990) and after the series is applied:
> 
>> @@ -1,42 +1,42 @@
>>  ArmPkg
>>  ArmPlatformPkg
>>  ArmVirtPkg
>>  ArmVirtPkg: modules used on Xen
>>  BaseTools
>>  CryptoPkg
>>  DynamicTablesPkg
>>  EmbeddedPkg
>>  EmulatorPkg
>>  FatPkg
>>  FmpDevicePkg
>>  IntelFsp2Pkg
>>  IntelFsp2WrapperPkg
>>  MdeModulePkg
>>  MdeModulePkg: ACPI modules
>> -MdeModulePkg: ACPI S3 modules
>> +MdeModulePkg: ACPI modules related to S3
>>  MdeModulePkg: BDS modules
>>  MdeModulePkg: Console and Graphics modules
>>  MdeModulePkg: Core services (PEI, DXE and Runtime) modules
>>  MdeModulePkg: Device and Peripheral modules
>>  MdeModulePkg: Firmware Update modules
>>  MdeModulePkg: HII and UI modules
>>  MdeModulePkg: Management Mode (MM, SMM) modules
>>  MdeModulePkg: Reset modules
>>  MdeModulePkg: SMBIOS modules
>>  MdeModulePkg: UEFI Variable modules
>>  MdePkg
>>  NetworkPkg
>>  OvmfPkg
>> -OvmfPkg: Xen-related modules
>> -OvmfPkg: TCG- and TPM2-related modules
>>  OvmfPkg: CSM modules
>>  OvmfPkg: MptScsi and PVSCSI driver
>> +OvmfPkg: TCG- and TPM2-related modules
>> +OvmfPkg: Xen-related modules
>>  PcAtChipsetPkg
>>  SecurityPkg
>>  ShellPkg
>>  SignedCapsulePkg
>>  SourceLevelDebugPkg
>> +StandaloneMmPkg
>>  UefiCpuPkg
>>  UefiPayloadPkg
>>  UnitTestFrameworkPkg
>> -StandaloneMmPkg
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Julien Grall <julien@xen.org>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Liran Alon <liran.alon@oracle.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
> Cc: Nikita Leshenko <nikita.leshchenko@oracle.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Stefan Berger <stefanb@linux.ibm.com>
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> 
> Thanks,
> Laszlo
> 
> Laszlo Ersek (3):
>   Maintainers.txt: retitle "MdeModulePkg: ACPI S3 modules"
>   Maintainers.txt: restore order of OvmfPkg sections
>   Maintainers.txt: move StandaloneMmPkg to the right spot
> 
>  Maintainers.txt | 54 ++++++++++----------
>  1 file changed, 27 insertions(+), 27 deletions(-)
> 

FWIW series:
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

Re: [PATCH 0/3] Maintainers.txt: restore lexicographical order between package / subsystem headers

[Leif Lindholm]

For the series:
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

Thanks!

On Wed, Jun 03, 2020 at 18:06:24 +0200, Laszlo Ersek wrote:
> Ref:    https://bugzilla.tianocore.org/show_bug.cgi?id=2778
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: sort_maintainers
> 
> We originally meant to keep the subsystem (package) titles sorted, in
> "Maintainers.txt".
> 
> However, as of 7191dd3c5990 ("ArmPkg/PlatformBootManagerLib: reject
> 'default' parity and stop bit count", 2020-06-03), we have some disorder
> introduced.
> 
> This patch series restores lexicographical order between the subsystem
> (package) headers.
> 
> The package / subsystem headers can be collected with the following
> small script:
> 
> $ dos2unix < Maintainers.txt \
>   | sed -n -e '/^EDK II Packages:$/,$p' \
>   | tail -n +3 \
>   | grep -E -v '^($|[LMRWTSFX]:)'
> 
> Where
> 
> - "dos2unix" strips CRs,
> 
> - "sed" removes the first part of the file that precedes the "EDK II
>   Packages:" heading,
> 
> - "tail" removes that heading plus the underline on the next line,
> 
> - and "grep" removes the empty lines and the section entries.
> 
> What remains is the section headers.
> 
> Here's a comparison between the outputs of this script, before (that is,
> at commit 7191dd3c5990) and after the series is applied:
> 
> > @@ -1,42 +1,42 @@
> >  ArmPkg
> >  ArmPlatformPkg
> >  ArmVirtPkg
> >  ArmVirtPkg: modules used on Xen
> >  BaseTools
> >  CryptoPkg
> >  DynamicTablesPkg
> >  EmbeddedPkg
> >  EmulatorPkg
> >  FatPkg
> >  FmpDevicePkg
> >  IntelFsp2Pkg
> >  IntelFsp2WrapperPkg
> >  MdeModulePkg
> >  MdeModulePkg: ACPI modules
> > -MdeModulePkg: ACPI S3 modules
> > +MdeModulePkg: ACPI modules related to S3
> >  MdeModulePkg: BDS modules
> >  MdeModulePkg: Console and Graphics modules
> >  MdeModulePkg: Core services (PEI, DXE and Runtime) modules
> >  MdeModulePkg: Device and Peripheral modules
> >  MdeModulePkg: Firmware Update modules
> >  MdeModulePkg: HII and UI modules
> >  MdeModulePkg: Management Mode (MM, SMM) modules
> >  MdeModulePkg: Reset modules
> >  MdeModulePkg: SMBIOS modules
> >  MdeModulePkg: UEFI Variable modules
> >  MdePkg
> >  NetworkPkg
> >  OvmfPkg
> > -OvmfPkg: Xen-related modules
> > -OvmfPkg: TCG- and TPM2-related modules
> >  OvmfPkg: CSM modules
> >  OvmfPkg: MptScsi and PVSCSI driver
> > +OvmfPkg: TCG- and TPM2-related modules
> > +OvmfPkg: Xen-related modules
> >  PcAtChipsetPkg
> >  SecurityPkg
> >  ShellPkg
> >  SignedCapsulePkg
> >  SourceLevelDebugPkg
> > +StandaloneMmPkg
> >  UefiCpuPkg
> >  UefiPayloadPkg
> >  UnitTestFrameworkPkg
> > -StandaloneMmPkg
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Julien Grall <julien@xen.org>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Liran Alon <liran.alon@oracle.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
> Cc: Nikita Leshenko <nikita.leshchenko@oracle.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Stefan Berger <stefanb@linux.ibm.com>
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> 
> Thanks,
> Laszlo
> 
> Laszlo Ersek (3):
>   Maintainers.txt: retitle "MdeModulePkg: ACPI S3 modules"
>   Maintainers.txt: restore order of OvmfPkg sections
>   Maintainers.txt: move StandaloneMmPkg to the right spot
> 
>  Maintainers.txt | 54 ++++++++++----------
>  1 file changed, 27 insertions(+), 27 deletions(-)
> 
> -- 
> 2.19.1.3.g30247aa5d201
> 

Re: [PATCH 3/3] Maintainers.txt: move StandaloneMmPkg to the right spot

[Yao, Jiewen]

Reviewed by: Jiewen Yao <Jiewen.yao@intel.com>

> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> Sent: Thursday, June 4, 2020 12:06 AM
> To: edk2-devel-groups-io <devel@edk2.groups.io>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Philippe Mathieu-Daudé <philmd@redhat.com>; Sami
> Mujawar <sami.mujawar@arm.com>; Supreeth Venkatesh
> <supreeth.venkatesh@arm.com>
> Subject: [PATCH 3/3] Maintainers.txt: move StandaloneMmPkg to the right spot
> 
> Place StandaloneMmPkg between SourceLevelDebugPkg and UefiCpuPkg, where
> it
> belongs in lexicographical order. (Right now it succeeds
> UnitTestFrameworkPkg, which is a disorder.)
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2778
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  Maintainers.txt | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt
> index ca383f593232..760d704d44bd 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -456,45 +456,45 @@ R: Chao Zhang <chao.b.zhang@intel.com>
>  ShellPkg
>  F: ShellPkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg
>  M: Ray Ni <ray.ni@intel.com>
>  M: Zhichao Gao <zhichao.gao@intel.com>
> 
>  SignedCapsulePkg
>  F: SignedCapsulePkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/SignedCapsulePkg
>  M: Jiewen Yao <jiewen.yao@intel.com>
>  M: Chao Zhang <chao.b.zhang@intel.com>
> 
>  SourceLevelDebugPkg
>  F: SourceLevelDebugPkg/
>  W:
> https://github.com/tianocore/tianocore.github.io/wiki/SourceLevelDebugPkg
>  M: Hao A Wu <hao.a.wu@intel.com>
> 
> +StandaloneMmPkg
> +F: StandaloneMmPkg/
> +M: Ard Biesheuvel <ard.biesheuvel@arm.com>
> +M: Sami Mujawar <sami.mujawar@arm.com>
> +M: Jiewen Yao <jiewen.yao@intel.com>
> +R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> +
>  UefiCpuPkg
>  F: UefiCpuPkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/UefiCpuPkg
>  M: Eric Dong <eric.dong@intel.com>
>  M: Ray Ni <ray.ni@intel.com>
>  R: Laszlo Ersek <lersek@redhat.com>
> 
>  UefiPayloadPkg
>  F: UefiPayloadPkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/UefiPayloadPkg
>  M: Maurice Ma <maurice.ma@intel.com>
>  M: Guo Dong <guo.dong@intel.com>
>  M: Benjamin You <benjamin.you@intel.com>
>  S: Maintained
> 
>  UnitTestFrameworkPkg
>  F: UnitTestFrameworkPkg/
>  M: Michael D Kinney <michael.d.kinney@intel.com>
>  R: Sean Brogan <sean.brogan@microsoft.com>
>  R: Bret Barkelew <Bret.Barkelew@microsoft.com>
>  S: Maintained
> -
> -StandaloneMmPkg
> -F: StandaloneMmPkg/
> -M: Ard Biesheuvel <ard.biesheuvel@arm.com>
> -M: Sami Mujawar <sami.mujawar@arm.com>
> -M: Jiewen Yao <jiewen.yao@intel.com>
> -R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> --
> 2.19.1.3.g30247aa5d201

Re: [PATCH 1/3] Maintainers.txt: retitle "MdeModulePkg: ACPI S3 modules"

[Dong, Eric]

[-- Attachment #1: Type: text/plain, Size: 3045 bytes --]

Reviewed-by: Eric Dong <eric.dong@intel.com>

From: Laszlo Ersek <lersek@redhat.com>
Sent: Thursday, June 4, 2020 12:06 AM
To: edk2-devel-groups-io <devel@edk2.groups.io>
Cc: Dong, Eric <eric.dong@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Philippe Mathieu-Daudé <philmd@redhat.com>
Subject: [PATCH 1/3] Maintainers.txt: retitle "MdeModulePkg: ACPI S3 modules"

The following two section titles in "Maintainers.txt" are not in
(case-sensitive) lexicographical order:

> MdeModulePkg: ACPI modules
> MdeModulePkg: ACPI S3 modules

However, if we simply sorted them, we'd have another problem: the specific
"ACPI S3 modules" line would precede the generic "ACPI modules" line.

Therefore, slightly reformulate the title on the second section, in order
to establish both lexicographical and hierarchical order.

Cc: Eric Dong <eric.dong@intel.com<mailto:eric.dong@intel.com>>
Cc: Hao A Wu <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com<mailto:philmd@redhat.com>>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2778
Signed-off-by: Laszlo Ersek <lersek@redhat.com<mailto:lersek@redhat.com>>
---
 Maintainers.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Maintainers.txt b/Maintainers.txt
index 896ac5821fc6..012b768035eb 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -209,35 +209,35 @@ F: IntelFsp2WrapperPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFsp2WrapperPkg
 M: Chasel Chiu <chasel.chiu@intel.com<mailto:chasel.chiu@intel.com>>
 R: Nate DeSimone <nathaniel.l.desimone@intel.com<mailto:nathaniel.l.desimone@intel.com>>
 R: Star Zeng <star.zeng@intel.com<mailto:star.zeng@intel.com>>

 MdeModulePkg
 F: MdeModulePkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/MdeModulePkg
 M: Jian J Wang <jian.j.wang@intel.com<mailto:jian.j.wang@intel.com>>
 M: Hao A Wu <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>

 MdeModulePkg: ACPI modules
 F: MdeModulePkg/Include/*Acpi*.h
 F: MdeModulePkg/Universal/Acpi/
 R: Dandan Bi <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>
 R: Liming Gao <liming.gao@intel.com<mailto:liming.gao@intel.com>>

-MdeModulePkg: ACPI S3 modules
+MdeModulePkg: ACPI modules related to S3
 F: MdeModulePkg/*LockBox*/
 F: MdeModulePkg/Include/*BootScript*.h
 F: MdeModulePkg/Include/*LockBox*.h
 F: MdeModulePkg/Include/*S3*.h
 F: MdeModulePkg/Library/*S3*/
 R: Hao A Wu <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>
 R: Eric Dong <eric.dong@intel.com<mailto:eric.dong@intel.com>>

 MdeModulePkg: BDS modules
 F: MdeModulePkg/*BootManager*/
 F: MdeModulePkg/Include/Library/UefiBootManagerLib.h
 F: MdeModulePkg/Universal/BdsDxe/
 F: MdeModulePkg/Universal/DevicePathDxe/
 F: MdeModulePkg/Universal/DriverHealthManagerDxe/
 F: MdeModulePkg/Universal/LoadFileOnFv2/
 F: MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.*
 R: Zhichao Gao <zhichao.gao@intel.com<mailto:zhichao.gao@intel.com>>
--
2.19.1.3.g30247aa5d201

[-- Attachment #2: Type: text/html, Size: 9208 bytes --]

Re: [edk2-devel] [PATCH 0/3] Maintainers.txt: restore lexicographical order between package / subsystem headers

[Laszlo Ersek]

On 06/03/20 18:06, Laszlo Ersek wrote:
> Ref:    https://bugzilla.tianocore.org/show_bug.cgi?id=2778
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: sort_maintainers
> 
> We originally meant to keep the subsystem (package) titles sorted, in
> "Maintainers.txt".
> 
> However, as of 7191dd3c5990 ("ArmPkg/PlatformBootManagerLib: reject
> 'default' parity and stop bit count", 2020-06-03), we have some disorder
> introduced.
> 
> This patch series restores lexicographical order between the subsystem
> (package) headers.
> 
> The package / subsystem headers can be collected with the following
> small script:
> 
> $ dos2unix < Maintainers.txt \
>   | sed -n -e '/^EDK II Packages:$/,$p' \
>   | tail -n +3 \
>   | grep -E -v '^($|[LMRWTSFX]:)'
> 
> Where
> 
> - "dos2unix" strips CRs,
> 
> - "sed" removes the first part of the file that precedes the "EDK II
>   Packages:" heading,
> 
> - "tail" removes that heading plus the underline on the next line,
> 
> - and "grep" removes the empty lines and the section entries.
> 
> What remains is the section headers.
> 
> Here's a comparison between the outputs of this script, before (that is,
> at commit 7191dd3c5990) and after the series is applied:
> 
>> @@ -1,42 +1,42 @@
>>  ArmPkg
>>  ArmPlatformPkg
>>  ArmVirtPkg
>>  ArmVirtPkg: modules used on Xen
>>  BaseTools
>>  CryptoPkg
>>  DynamicTablesPkg
>>  EmbeddedPkg
>>  EmulatorPkg
>>  FatPkg
>>  FmpDevicePkg
>>  IntelFsp2Pkg
>>  IntelFsp2WrapperPkg
>>  MdeModulePkg
>>  MdeModulePkg: ACPI modules
>> -MdeModulePkg: ACPI S3 modules
>> +MdeModulePkg: ACPI modules related to S3
>>  MdeModulePkg: BDS modules
>>  MdeModulePkg: Console and Graphics modules
>>  MdeModulePkg: Core services (PEI, DXE and Runtime) modules
>>  MdeModulePkg: Device and Peripheral modules
>>  MdeModulePkg: Firmware Update modules
>>  MdeModulePkg: HII and UI modules
>>  MdeModulePkg: Management Mode (MM, SMM) modules
>>  MdeModulePkg: Reset modules
>>  MdeModulePkg: SMBIOS modules
>>  MdeModulePkg: UEFI Variable modules
>>  MdePkg
>>  NetworkPkg
>>  OvmfPkg
>> -OvmfPkg: Xen-related modules
>> -OvmfPkg: TCG- and TPM2-related modules
>>  OvmfPkg: CSM modules
>>  OvmfPkg: MptScsi and PVSCSI driver
>> +OvmfPkg: TCG- and TPM2-related modules
>> +OvmfPkg: Xen-related modules
>>  PcAtChipsetPkg
>>  SecurityPkg
>>  ShellPkg
>>  SignedCapsulePkg
>>  SourceLevelDebugPkg
>> +StandaloneMmPkg
>>  UefiCpuPkg
>>  UefiPayloadPkg
>>  UnitTestFrameworkPkg
>> -StandaloneMmPkg
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Julien Grall <julien@xen.org>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Liran Alon <liran.alon@oracle.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
> Cc: Nikita Leshenko <nikita.leshchenko@oracle.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Stefan Berger <stefanb@linux.ibm.com>
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> 
> Thanks,
> Laszlo
> 
> Laszlo Ersek (3):
>   Maintainers.txt: retitle "MdeModulePkg: ACPI S3 modules"
>   Maintainers.txt: restore order of OvmfPkg sections
>   Maintainers.txt: move StandaloneMmPkg to the right spot
> 
>  Maintainers.txt | 54 ++++++++++----------
>  1 file changed, 27 insertions(+), 27 deletions(-)
> 

Merged as commit range 6ff7c838d092..6aa48ab791ec, via
<https://github.com/tianocore/edk2/pull/669>.

Thanks
Laszlo