X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Maintainers.txt;h=896ac5821fc6602e25db79b9aa47e4c2329c530b;hp=922cc664ddc3e368ebc868e482811a631e446568;hb=1c877c716038a862e876cac8f0929bab4a96e849;hpb=78413dd4bc9718b6a5dde74d903e71764d48b8a7

diff --git a/Maintainers.txt b/Maintainers.txt
index 922cc664dd..896ac5821f 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -70,7 +70,7 @@ Tianocore Stewards
 F: *
 M: Andrew Fish <afish@apple.com>
 M: Laszlo Ersek <lersek@redhat.com>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 M: Michael D Kinney <michael.d.kinney@intel.com>
 
 Responsible Disclosure, Reporting Security Issues
@@ -87,37 +87,60 @@ UEFI Shell Binaries (ShellBinPkg.zip) from EDK II Releases:
 W: https://github.com/tianocore/edk2/releases/
 M: Ray Ni <ray.ni@intel.com>                  (Ia32/X64)
 M: Zhichao Gao <zhichao.gao@intel.com>        (Ia32/X64)
-M: Leif Lindholm <leif.lindholm@linaro.org>   (ARM/AArch64)
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
+M: Leif Lindholm <leif@nuviainc.com>          (ARM/AArch64)
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>    (ARM/AArch64)
 
 EDK II Architectures:
 ---------------------
 ARM, AARCH64
 F: */AArch64/
 F: */Arm/
-M: Leif Lindholm <leif.lindholm@linaro.org>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+
+EDK II Continuous Integration:
+------------------------------
+.azurepipelines/
+F: .azurepipelines/
+M: Sean Brogan <sean.brogan@microsoft.com>
+M: Bret Barkelew <Bret.Barkelew@microsoft.com>
+R: Michael D Kinney <michael.d.kinney@intel.com>
+R: Liming Gao <liming.gao@intel.com>
+
+.mergify/
+F: .mergify/
+M: Michael D Kinney <michael.d.kinney@intel.com>
+M: Liming Gao <liming.gao@intel.com>
+R: Sean Brogan <sean.brogan@microsoft.com>
+R: Bret Barkelew <Bret.Barkelew@microsoft.com>
+
+.pytool/
+F: .pytool/
+M: Sean Brogan <sean.brogan@microsoft.com>
+M: Bret Barkelew <Bret.Barkelew@microsoft.com>
+R: Michael D Kinney <michael.d.kinney@intel.com>
+R: Liming Gao <liming.gao@intel.com>
 
 EDK II Packages:
 ----------------
 ArmPkg
 F: ArmPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg
-M: Leif Lindholm <leif.lindholm@linaro.org>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 
 ArmPlatformPkg
 F: ArmPlatformPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
-M: Leif Lindholm <leif.lindholm@linaro.org>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 
 ArmVirtPkg
 F: ArmVirtPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
 M: Laszlo Ersek <lersek@redhat.com>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-R: Leif Lindholm <leif.lindholm@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+R: Leif Lindholm <leif@nuviainc.com>
 
 ArmVirtPkg: modules used on Xen
 F: ArmVirtPkg/ArmVirtXen.*
@@ -150,8 +173,8 @@ M: Alexei Fedorov <Alexei.Fedorov@arm.com>
 EmbeddedPkg
 F: EmbeddedPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
-M: Leif Lindholm <leif.lindholm@linaro.org>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 
 EmulatorPkg
 F: EmulatorPkg/
@@ -354,16 +377,16 @@ M: Liming Gao <liming.gao@intel.com>
 NetworkPkg
 F: NetworkPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
-M: Jiaxin Wu <jiaxin.wu@intel.com>
+M: Maciej Rabeda <maciej.rabeda@linux.intel.com>
+R: Jiaxin Wu <jiaxin.wu@intel.com>
 R: Siyuan Fu <siyuan.fu@intel.com>
-R: Maciej Rabeda <maciej.rabeda@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@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 S: Maintained
 
 OvmfPkg: Xen-related modules
@@ -412,6 +435,12 @@ 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
@@ -456,8 +485,16 @@ 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: Achin Gupta <achin.gupta@arm.com>
+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>