On 02/07/20 11:51, Laszlo Ersek wrote: > On 02/07/20 02:07, Philippe Mathieu-Daude wrote: >> Around February of this year, Antoine posted various patches fixing >> a huge quantity of typos, over 8000+ lines (such [1]). >> >> This series salvages a third of his work. >> I recommend to review the patches with using the '--word-diff=color' >> git option. >> >> All this series is reviewed by maintainers. > > OK. Please give all maintainers one day to re-check the feedback tags > on the patches for their respective subsystems. Then I'll merge this > next week.
Merged via <https://github.com/tianocore/edk2/pull/357>, commit range 4b026f0d5af3..418aded9645d. Next time, please run "PatchCheck.py" locally, before posting a series; I had to fix up five patches in order to shut up "PatchCheck.py". See the range-diff below. > 1: 7f5eda987efd = 1: 7f5eda987efd CryptoPkg/OpensslLib: Fix few typos > 2: ba75d3ec9003 = 2: ba75d3ec9003 EmbeddedPkg/VirtualKeyboard: Fix a typo > in EFI_INVALID_PARAMETER > 3: 74a044638dec = 3: 74a044638dec EmbeddedPkg/VirtualKeyboard: Fix few > typos > 4: 3dcbb17bd95e = 4: 3dcbb17bd95e EmulatorPkg/Sec: Fix various typos > 5: 642c7dfe21a4 = 5: 642c7dfe21a4 EmulatorPkg/Unix: Fix various typos > 6: b71c6a6da260 = 6: b71c6a6da260 EmulatorPkg/Win: Fix various typos > 7: bebfc801c525 = 7: bebfc801c525 FatPkg/EnhancedFatDxe: Fix various typos > 8: 77a615654089 = 8: 77a615654089 FatPkg/FatPei: Fix few typos > 9: 450331e2e132 = 9: 450331e2e132 MdeModulePkg/Application: Improve > French translation > 10: cacd66140239 = 10: cacd66140239 MdeModulePkg/Application: Fix various > typos > 11: a1772d998501 ! 11: f9bbb675f9b0 MdeModulePkg/Bus/Ata: Fix various typos > @@ -12,6 +12,7 @@ > Acked-by: Liming Gao <liming....@intel.com> > Signed-off-by: Philippe Mathieu-Daude <phi...@redhat.com> > Message-Id: <20200207010831.9046-12-phi...@redhat.com> > + [ler...@redhat.com: replace EFI_D_xxx w/ DEBUG_xxx to shut up > PatchCheck] > > diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.uni > b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.uni > --- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.uni > @@ -265,7 +266,7 @@ > continue; > } > - DEBUG ((EFI_D_INFO, "port [%d] port mulitplier [%d] has a [%a]\n", > -+ DEBUG ((EFI_D_INFO, "port [%d] port multitplier [%d] has a > [%a]\n", > ++ DEBUG ((DEBUG_INFO, "port [%d] port multitplier [%d] has a > [%a]\n", > Port, 0, DeviceType == EfiIdeCdrom ? "cdrom" : > "harddisk")); > > // > 12: de8e373ad7b6 = 12: ac3451ec8311 MdeModulePkg/Bus/I2c: Fix few typos > 13: 4c7605a742b4 = 13: 99893d662aec MdeModulePkg/Bus/Isa: Fix various typos > 14: 3d9a23971f8c = 14: 4dc57688cc1d MdeModulePkg/Bus/Scsi: Fix various typos > 15: 9e1bed03b5ce = 15: 8d73155d8ec8 MdeModulePkg/Bus/Sd: Fix various typos > 16: 6eb0104ff9b2 = 16: 5fa166315a3d MdeModulePkg/Core/Pei: Fix various typos > 17: 2c80000a6a42 = 17: 4072251896fc MdeModulePkg/Core/PiSmmCore: Fix > various typos > 18: 858754b54a92 ! 18: b6ba5b3a4d69 MdeModulePkg/UsbBusDxe: Fix a typo > @@ -10,6 +10,7 @@ > Acked-by: Liming Gao <liming....@intel.com> > Signed-off-by: Philippe Mathieu-Daude <phi...@redhat.com> > Message-Id: <20200207010831.9046-19-phi...@redhat.com> > + [ler...@redhat.com: replace EFI_D_xxx w/ DEBUG_xxx to shut up > PatchCheck] > > diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c > b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c > --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c > @@ -19,7 +20,7 @@ > > } else if (Setting->Desc.InterfaceNumber >= NumIf) { > - DEBUG (( EFI_D_ERROR, "UsbParseConfigDesc: mal-formated interface > descriptor\n")); > -+ DEBUG (( EFI_D_ERROR, "UsbParseConfigDesc: malformatted interface > descriptor\n")); > ++ DEBUG (( DEBUG_ERROR, "UsbParseConfigDesc: malformatted interface > descriptor\n")); > > UsbFreeInterfaceDesc (Setting); > goto ON_ERROR; > 19: 5f2dccf30377 = 19: a6e8abb99f35 MdeModulePkg/UsbMass: Fix various typos > 20: bb345b43b01e = 20: bb83c14ca6c2 MdeModulePkg/UsbMouse: Fix few typos > 21: ed061696bfab = 21: 0bcaebbfe22e MdeModulePkg/UsbBus: Fix various typos > 22: beaaaecf3aec = 22: 407f235bcd50 MdeModulePkg/Usb: Fix various typos > 23: e94c5eb6268f = 23: aea0d04c4f32 MdePkg/IndustryStandard: Fix various > typos > 24: 914f48b63bbf = 24: 5ae444260a4e MdePkg/Library/Dxe: Fix various typos > 25: 4c38ca18b611 = 25: ab6488e4abc8 MdePkg/Library/Pci: Fix various typos > 26: 53eebb54b563 = 26: 31596f3921e0 MdePkg/Library/Smm: Fix various typos > 27: 10e3d3a6f525 = 27: accf9892f70b MdePkg/Ppi: Fix various typos > 28: 86319876fc92 = 28: 76ae824bc492 MdePkg/Register: Fix various typos > 29: e2ef39c366e0 = 29: 86367f1d41da NetworkPkg: Fix a typo > 30: e0024a85bcd0 ! 30: c92bc3253956 NetworkPkg/ArpDxe: Fix various typos > @@ -12,6 +12,7 @@ > Reviewed-by: Maciej Rabeda <maciej.rab...@linux.intel.com> > Signed-off-by: Philippe Mathieu-Daude <phi...@redhat.com> > Message-Id: <20200207010831.9046-31-phi...@redhat.com> > + [ler...@redhat.com: replace EFI_D_xxx w/ DEBUG_xxx to shut up > PatchCheck] > > diff --git a/NetworkPkg/ArpDxe/ArpDriver.h > b/NetworkPkg/ArpDxe/ArpDriver.h > --- a/NetworkPkg/ArpDxe/ArpDriver.h > @@ -182,7 +183,7 @@ > ); > if (EFI_ERROR (Status)) { > - DEBUG ((EFI_D_ERROR, "ArpSBCreateChild: faild to install ARP > protocol, %r.\n", Status)); > -+ DEBUG ((EFI_D_ERROR, "ArpSBCreateChild: failed to install ARP > protocol, %r.\n", Status)); > ++ DEBUG ((DEBUG_ERROR, "ArpSBCreateChild: failed to install ARP > protocol, %r.\n", Status)); > > FreePool (Instance); > return Status; > 31: a435ea26768c = 31: baf6b1b14063 NetworkPkg/Dhcp4Dxe: Fix various typos > 32: 102075ad1d0c = 32: aeffe53b51d7 NetworkPkg/Dhcp6Dxe: Fix various typos > 33: 65f171ce83a6 = 33: 767eda6a5a96 NetworkPkg/DnsDxe: Fix a typo > 34: 6aef4bccc11f = 34: b5f5ee2842eb NetworkPkg/DnsDxe: Fix various typos > 35: 47a56a0a2274 = 35: e134c167ad0b NetworkPkg/DpcDxe: Fix few typos > 36: 7faed4c098d5 = 36: 458f685e3dc2 NetworkPkg/HttpBootDxe: Fix a typo in > variable name > 37: 94a5dc073d19 = 37: 7286ebdaf51e NetworkPkg/HttpBootDxe: Fix various > typos > 38: fb5f95973700 = 38: 143e6a34a36d NetworkPkg/HttpDxe: Fix various typos > 39: 9df1e7822bfd = 39: f2704d02e2c0 NetworkPkg/Ip4Dxe: Fix various typos > 40: 44a31b75c04d = 40: 41e663bb39d4 NetworkPkg/Ip6Dxe: Fix various typos > 41: db1dfb369f4f = 41: bcb6d8220f62 NetworkPkg/IScsiDxe: Fix various typos > 42: 49a115621d40 = 42: 4ff477e0c2ce NetworkPkg/Library: Fix various typos > 43: 87334d54643f ! 43: f98ad27c8909 NetworkPkg/MnpDxe: Fix various typos > @@ -12,6 +12,7 @@ > Reviewed-by: Maciej Rabeda <maciej.rab...@intel.com> > Signed-off-by: Philippe Mathieu-Daude <phi...@redhat.com> > Message-Id: <20200207010831.9046-44-phi...@redhat.com> > + [ler...@redhat.com: replace EFI_D_xxx w/ DEBUG_xxx to shut up > PatchCheck] > > diff --git a/NetworkPkg/MnpDxe/MnpDxe.uni b/NetworkPkg/MnpDxe/MnpDxe.uni > --- a/NetworkPkg/MnpDxe/MnpDxe.uni > @@ -130,7 +131,7 @@ > MnpServiceData = AllocateZeroPool (sizeof (MNP_SERVICE_DATA)); > if (MnpServiceData == NULL) { > - DEBUG ((EFI_D_ERROR, "MnpCreateServiceData: Faild to allocate > memory for the new Mnp Service Data.\n")); > -+ DEBUG ((EFI_D_ERROR, "MnpCreateServiceData: Failed to allocate > memory for the new Mnp Service Data.\n")); > ++ DEBUG ((DEBUG_ERROR, "MnpCreateServiceData: Failed to allocate > memory for the new Mnp Service Data.\n")); > > return NULL; > } > @@ -139,7 +140,7 @@ > ); > if (MnpServiceHandle == NULL) { > - DEBUG ((EFI_D_ERROR, "MnpCreateServiceData: Faild to create child > handle.\n")); > -+ DEBUG ((EFI_D_ERROR, "MnpCreateServiceData: Failed to create > child handle.\n")); > ++ DEBUG ((DEBUG_ERROR, "MnpCreateServiceData: Failed to create > child handle.\n")); > > return NULL; > } > @@ -215,7 +216,7 @@ > Instance = AllocateZeroPool (sizeof (MNP_INSTANCE_DATA)); > if (Instance == NULL) { > - DEBUG ((EFI_D_ERROR, "MnpServiceBindingCreateChild: Faild to > allocate memory for the new instance.\n")); > -+ DEBUG ((EFI_D_ERROR, "MnpServiceBindingCreateChild: Failed to > allocate memory for the new instance.\n")); > ++ DEBUG ((DEBUG_ERROR, "MnpServiceBindingCreateChild: Failed to > allocate memory for the new instance.\n")); > > return EFI_OUT_OF_RESOURCES; > } > 44: 094450f6c0eb = 44: ee1681fb67d1 NetworkPkg/Mtftp4Dxe: Fix various typos > 45: df1140f7f5d8 = 45: ae1ca547f58f NetworkPkg/Mtftp6Dxe: Fix various typos > 46: e37f1fab0306 = 46: 729072f3b20e NetworkPkg/SnpDxe: Fix few typos > 47: 9d376163fee4 = 47: f96ccd5f5739 NetworkPkg/TcpDxe/Sock: Fix few typos > 48: b980e77d960d = 48: 61da54b3d055 NetworkPkg/TcpDxe/Tcp: Fix various typos > 49: 0c0d9307aecf = 49: 9c8e57fa561a NetworkPkg/Tls: Fix few typos > 50: ebecc80b57f9 = 50: f0ab97e7e8c6 NetworkPkg/Udp4Dxe: Fix various typos > 51: 4885c4d196bf = 51: 8af99b448b95 NetworkPkg/Udp6Dxe: Fix various typos > 52: a31840160dc5 = 52: 9f5157a8fb26 NetworkPkg/UefiPxeBcDxe: Fix various > typos > 53: 7ceaea6134c0 = 53: 3c2f8fc80384 NetworkPkg/VlanConfigDxe: Fix few typos > 54: c01a4ed33b55 = 54: 5e201ba3b9a7 OvmfPkg/Acpi: Fix few typos > 55: 822306d12bd0 = 55: 792a7bb39866 OvmfPkg/Csm: Fix various typos > 56: 5aeb3c4b3ab5 = 56: 3e0b04286a31 OvmfPkg/Csm/LegacyBios: Fix a typo > 57: d2dca4eb8b30 = 57: 058d765b6a02 OvmfPkg/Qemu: Fix various typos > 58: 5ca90062eb4b = 58: 05b2612a5954 OvmfPkg/Virtio: Fix few typos > 59: 818e3104bb0b = 59: c5e503ddad13 OvmfPkg/Xen: Fix a typo > 60: 9cab0f5e2e34 = 60: 6074abae1993 OvmfPkg/Xen: Fix various typos > 61: 88f988f563a1 = 61: 67353b4593e9 PcAtChipsetPkg: Fix few typos > 62: 32326b711a16 = 62: 8975132d1ca8 SecurityPkg: Fix few typos > 63: af10dedb74bb = 63: 9da9f15274e3 SecurityPkg/Hash2DxeCrypto: Fix few > typos > 64: a80dccc95db2 = 64: 02da7c0d1774 SecurityPkg/Library/Tpm: Fix various > typos > 65: f8c56867be27 ! 65: 3955df6c812e SecurityPkg/Tcg: Fix various typos > @@ -12,6 +12,7 @@ > Reviewed-by: Jiewen Yao <jiewen....@intel.com> > Signed-off-by: Philippe Mathieu-Daude <phi...@redhat.com> > Message-Id: <20200207010831.9046-66-phi...@redhat.com> > + [ler...@redhat.com: replace EFI_D_xxx w/ DEBUG_xxx to shut up > PatchCheck] > > diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.uni > b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.uni > --- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.uni > @@ -164,15 +165,6 @@ > 512, // PayloadBufferSize, > Buffer // PayloadBuffer > ); > -@@ > - // > - // Create a Ready To Boot Event and Clear the MorControl bit in the > call back function. > - // > -- DEBUG ((DEBUG_INFO, "TcgMor: Create ReadyToBoot Event for > MorControl Bit cleaning!\n")); > -+ DEBUG ((EFI_D_INFO, "TcgMor: Create ReadyToBoot Event for > MorControl Bit cleaning!\n")); > - Status = EfiCreateEventReadyToBootEx ( > - TPL_CALLBACK, > - OnReadyToBoot, > > diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > 66: 197f928790c0 = 66: 541e220ac5f5 SecurityPkg/VariableAuthenticated: Fix > few typos > 67: 68fc202d53ea = 67: 496c9c76af2d ShellPkg/Application: Fix various typos > 68: 260009cd71c2 = 68: eccbd3cf08e1 ShellPkg/DynamicCommand: Fix various > typos > 69: 37471fda593c = 69: 48d54001c712 SignedCapsulePkg: Fix various typos > 70: 20cf83c78b21 = 70: 4aa9bef1af6c SignedCapsulePkg/Universal: Fix various > typos > 71: a57e40322ec9 = 71: 6592d78e46e2 SourceLevelDebugPkg/DebugAgent: Fix > various typos > 72: bae5e73219dd = 72: 3cf1128b2552 > SourceLevelDebugPkg/DebugCommunicationLib: Fix various typos > 73: 665023beb3b5 = 73: 69dde9eeaf2d SourceLevelDebugPkg: Fix few typos > 74: 3f7ef1ff436b = 74: 581a738d0680 StandaloneMmPkg: Fix a typo > 75: 31a85c7de761 = 75: 85392ca0c245 StandaloneMmPkg: Fix few typos > 76: d526e855abb4 = 76: 69c2f626463c UefiCpuPkg/CpuDxe: Fix few typos > 77: e4ee906f3b59 = 77: c1db87423e5f UefiCpuPkg/PiSmm: Fix various typos > 78: 7c2e996f9ec1 = 78: bfaddb978ffa UefiCpuPkg/Smm: Fix various typos In particular, in patch 65 ("SecurityPkg/Tcg: Fix various typos"), the quoted hunk wasn't even a typo fix; it only changed DEBUG_INFO to EFI_D_INFO, which means it was purely a new bug. I only corrected the debug level macro to appease "PatchCheck.py", and that ended up dropping the whole hunk. (This hunk should have been caught during patch review, of course.) Thank you Antoine and Phil for this large work! Laszlo -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54165): https://edk2.groups.io/g/devel/message/54165 Mute This Topic: https://groups.io/mt/71039512/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-