summaryrefslogtreecommitdiff
path: root/doc/develop
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-12-08 19:03:03 -0500
committerTom Rini <trini@konsulko.com>2023-12-08 19:03:03 -0500
commitdd638467a4c9131e6732ce489d335b0309d8f13d (patch)
treee623d1a55a5ca200df5fc0ca9f0c14e4ef2d5e7e /doc/develop
parent2f0282922b2c458eea7f85c500a948a587437b63 (diff)
parent6805b4dbad72a6e9180426c50f6db6e2681430c0 (diff)
Merge tag 'efi-2024-01-rc5' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-01-rc5 Documentation: * Update and correct support notes on clang * sandbox: Fix VPL instructions UEFI: * Fix a bug in DisconnectController * Provide better error messages for missing CONFIG_EFI_CAPSULE_ESL_FILE * Create EFI memory reservations when booting via ACPI * Make ACPI tables accessible in EFI app
Diffstat (limited to 'doc/develop')
-rw-r--r--doc/develop/sending_patches.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/develop/sending_patches.rst b/doc/develop/sending_patches.rst
index ba73d0d11b4..5a6962f1021 100644
--- a/doc/develop/sending_patches.rst
+++ b/doc/develop/sending_patches.rst
@@ -363,7 +363,7 @@ A Custodian has additional privileges and can:
* Awaiting Upstream
- * Superseeded
+ * Superseded
* Deferred
@@ -399,7 +399,7 @@ today. Not all states are used by all custodians.
and has not merged yet to master, or has queued the patch up to be submitted
to be merged, but has not yet.
-* Superseeded: Patches are marked as 'superseeded' when the poster submits a
+* Superseded: Patches are marked as 'superseded' when the poster submits a
new version of these patches.
* Deferred: Deferred usually means the patch depends on something else that