-R: David Woodhouse <dwmw2@infradead.org>\r
-\r
-OvmfPkg: MptScsi and PVSCSI driver\r
-F: OvmfPkg/MptScsiDxe/\r
-F: OvmfPkg/PvScsiDxe/\r
-R: Liran Alon <liran.alon@oracle.com>\r
-R: Nikita Leshenko <nikita.leshchenko@oracle.com>\r
+R: David Woodhouse <dwmw2@infradead.org> [dwmw2]\r
+\r
+OvmfPkg: Confidential Computing\r
+F: OvmfPkg/AmdSev/\r
+F: OvmfPkg/AmdSevDxe/\r
+F: OvmfPkg/Include/Guid/ConfidentialComputingSecret.h\r
+F: OvmfPkg/Include/Library/MemEncryptSevLib.h\r
+F: OvmfPkg/IoMmuDxe/AmdSevIoMmu.*\r
+F: OvmfPkg/Library/BaseMemEncryptSevLib/\r
+F: OvmfPkg/Library/PlatformBootManagerLibGrub/\r
+F: OvmfPkg/Library/VmgExitLib/\r
+F: OvmfPkg/PlatformPei/AmdSev.c\r
+F: OvmfPkg/ResetVector/\r
+F: OvmfPkg/Sec/\r
+R: Brijesh Singh <brijesh.singh@amd.com> [codomania]\r
+R: Erdem Aktas <erdemaktas@google.com> [ruleof2]\r
+R: James Bottomley <jejb@linux.ibm.com> [jejb]\r
+R: Jiewen Yao <jiewen.yao@intel.com> [jyao1]\r
+R: Min Xu <min.m.xu@intel.com> [mxu9]\r
+R: Tom Lendacky <thomas.lendacky@amd.com> [tlendacky]\r
+\r
+OvmfPkg: FDT related modules\r
+F: OvmfPkg/Fdt\r
+R: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]\r
+R: Gerd Hoffmann <kraxel@redhat.com> [kraxel]\r
+R: Abner Chang <abner.chang@amd.com> [changab]\r
+\r
+OvmfPkg: LsiScsi driver\r
+F: OvmfPkg/LsiScsiDxe/\r
+R: Gary Lin <gary.lin@hpe.com> [lcp]\r