From 9fdaa794e06846f1426bd15360401a8b1a5017a9 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Thu, 4 Nov 2021 16:29:49 +0000
Subject: [PATCH] Drop UI patches and update provenance information

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
 0023-Don-t-write-messages-to-the-screen.patch | 176 --------
 ...0023-Enable-pager-by-default.-985860.patch |   0
 0024-Don-t-print-GNU-GRUB-header.patch        |  42 --
 ...n-t-say-GNU-Linux-in-generated-menus.patch |   2 +-
 ...rame-to-list-of-relocations-stripped.patch |   0
 0025-Don-t-add-to-highlighted-row.patch       |  23 --
 ...password-to-boot-entries-generated-b.patch |   2 +-
 0026-Message-string-cleanups.patch            |  68 ---
 ...=> 0027-Don-t-emit-Booting-.-message.patch |   0
 ...ing-now-that-we-aren-t-displaying-it.patch |  29 --
 ...f-man-pages-with-slightly-nicer-ones.patch |   0
 ...t-indentation-for-the-term-help-text.patch |  25 --
 0029-Indent-menu-entries.patch                |  23 --
 ...ix-when-fallback-searching-for-grub-.patch |   6 +-
 0030-Fix-margins.patch                        |  34 --
 ...-before-grub.cfg-on-tftp-config-file.patch |   4 +-
 ...CLASS-in-10_linux-from-etc-os-releas.patch |   2 +-
 ...-1-for-our-right-hand-margin-so-line.patch |  24 --
 ...t-ordering-for-.debug-and-rescue-ker.patch |   0
 ...-on-serial-so-don-t-tell-the-user-to.patch |  24 --
 ...3-Try-prefix-if-fw_path-doesn-t-work.patch |   4 +-
 ...-Package-Sort-for-grub2-mkconfig-112.patch |   0
 ...-Don-t-draw-a-border-around-the-menu.patch |  71 ----
 ...fig-construct-titles-that-look-like-.patch |   2 +-
 ...ly-grub2-password-config-tool-985962.patch |   0
 ...andard-margin-for-the-timeout-string.patch |  40 --
 ... 0037-tcp-add-window-scaling-support.patch |   0
 ...net-and-bootp-add-support-for-dhcpv6.patch |   0
 ...rnel-settings-and-use-it-in-10_linux.patch |   6 +-
 ...1374141-fix-incorrect-mask-for-ppc64.patch |   0
 ... 0041-Make-grub_fatal-also-backtrace.patch |   0
 ...ix-up-some-man-pages-rpmdiff-noticed.patch |   0
 ...fo-pages-say-grub2-where-appropriate.patch |   0
 ...-chainloader-entries-don-t-try-any-x.patch |   0
 ...-Add-ability-to-boot-from-subvolumes.patch |   0
 ...port-btrfs_subvol-and-btrfs_subvolid.patch |   0
 ...> 0047-grub2-btrfs-03-follow_default.patch |   2 +
 ...=> 0048-grub2-btrfs-04-grub2-install.patch |   2 +
 ...> 0049-grub2-btrfs-05-grub2-mkconfig.patch |   2 +-
 ... => 0050-grub2-btrfs-06-subvol-mount.patch |   2 +
 ...subvol-name-scheme-to-support-old-sn.patch |   0
 ...-correctly-with-btrfs-snapshots-bsc-.patch |   2 +
 ...ocate_pool-and-grub_efi_free_pool-wr.patch |   0
 ...fi_.-memory-helpers-where-reasonable.patch |   0
 ...5-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch |   0
 ...=> 0056-don-t-use-int-for-efi-status.patch |   0
 ...INIT-declare-its-function-prototypes.patch |   0
 ...-efi-as-HFS-on-ppc-machines-in-grub-.patch |   0
 ...d-xen-or-multiboot-2-modules-as-need.patch |   0
 ...-calibration-not-take-51-seconds-to-.patch |   0
 ...061-align-struct-efi_variable-better.patch |   0
 ...062-Add-BLS-support-to-grub-mkconfig.patch |   6 +-
 ...-backtrace-on-grub_abort-for-grub-em.patch |   0
 ...nux-and-initrd-commands-for-grub-emu.patch |   5 +-
 ...h => 0065-Add-grub2-switch-to-blscfg.patch |   0
 ...patch => 0066-make-better-backtraces.patch |   0
 ...w-our-startup-message-if-debug-is-se.patch |   4 +-
 ...-some-minor-include-path-weirdnesses.patch |   0
 ...it-possible-to-enabled-build-id-sha1.patch |   0
 ...f-grub_dprintf-without-the-file-line.patch |   0
 ...dprintf-that-tells-us-load-addresses.patch |   0
 ...tch => 0072-Fixup-for-newer-compiler.patch |   0
 ...-export-the-start-and-_start-symbols.patch |   0
 ...tch => 0074-Fixup-for-newer-compiler.patch |   0
 ...pport-for-non-Ethernet-network-cards.patch |   0
 ...racketed-ipv6-addrs-and-port-numbers.patch |   0
 ...=> 0077-bootp-New-net_bootp6-command.patch |   0
 ...=> 0078-efinet-UEFI-IPv6-PXE-support.patch |   0
 ...079-grub.texi-Add-net_bootp6-doument.patch |   0
 ...essing-DHCPACK-packet-from-HTTP-Boot.patch |   0
 ...etting-network-from-UEFI-device-path.patch |   0
 ...etting-DNS-server-from-UEFI-protocol.patch |   0
 ...83-Support-UEFI-networking-protocols.patch |   0
 ...> 0084-AUDIT-0-http-boot-tracker-bug.patch |   0
 ...-incr-command-to-increment-integer-v.patch |   0
 ...h => 0086-Add-auto-hide-menu-support.patch |   0
 ...> 0087-Add-grub-set-bootflag-utility.patch |   0
 ...b-boot-indeterminate.service-example.patch |   0
 ...h => 0089-gentpl-add-disable-support.patch |   0
 ... => 0090-gentpl-add-pc-firmware-type.patch |   0
 ...e-the-firmware-acceleration-for-http.patch |   0
 ...ot_url-reflect-the-protocol-hostname.patch |   0
 ...n-tell-configure-which-cflags-utils-.patch |   0
 ...make-it-possible-to-run-checkers-on-.patch |   0
 ...95-Rework-how-the-fdt-command-builds.patch |   0
 ...able-non-wordsize-allocations-on-arm.patch |   0
 ...nd-prefix-when-HTTP-path-is-relative.patch |   4 +-
 ...=> 0098-Make-grub_error-more-verbose.patch |   0
 ...eset-an-alias-for-the-reboot-command.patch |   0
 ....patch => 0100-Add-a-version-command.patch |   0
 ...dprintf-and-nerf-dprintf-in-script.c.patch |   0
 ...-Better-memory-allocation-and-error-.patch |   0
 ...tter-locations-for-kernel-and-initrd.patch |   0
 ...p-all-the-places-Wsign-compare-error.patch |   0
 ...gn-compare-Wno-conversion-Wno-error-.patch |   0
 ...ce-buffers-for-reading-to-addresses-.patch |   0
 ...-arrange-grub_cmd_linux-a-little-bit.patch |   0
 ...e-our-own-allocator-for-kernel-stuff.patch |   0
 ...itrd-params-cmdline-allocations-abov.patch |   0
 ... => 0110-Fix-getroot.c-s-trampolines.patch |   0
 ...not-allow-stack-trampolines-anywhere.patch |   0
 ...tch => 0112-Reimplement-boot_counter.patch |   0
 ...ntry-selection-based-on-ID-and-title.patch |   0
 ...try-users-option-argument-to-be-opti.patch |   0
 ...export-env-and-efi-load-env-commands.patch |   0
 ...le-to-subtract-conditions-from-debug.patch |   0
 ...bles-from-the-initial-context-when-c.patch |   0
 ...-boot-success-reset-from-menu-auto-h.patch |   3 +
 ...ix-systemctl-kexec-exit-status-check.patch |   0
 ...b-emu-linux-loader-messages-as-debug.patch |   0
 ...t-boot-commands-will-only-return-on-.patch |   0
 ...ferences-for-fdt-when-building-with-.patch |   0
 ... => 0123-Do-better-in-bootstrap.conf.patch |   0
 ...0124-Use-git-to-apply-gnulib-patches.patch |   0
 ...-error-with-the-fdt-module-on-risc-v.patch |   0
 ...g-Update-comment-about-running-as-ro.patch |   0
 ...g-Write-new-env-to-tmpfile-and-then-.patch |   0
 ...indeterminate-getting-set-on-boot_su.patch |   0
 ..._EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch |   0
 ...ader-Define-machine-types-for-RISC-V.patch |   0
 ... => 0131-Add-start-symbol-for-RISC-V.patch |   0
 ...conf-Force-autogen.sh-to-use-python3.patch |   0
 ...fw-http-_path-variables-to-make-them.patch |   2 +-
 ...-literal-IPv6-addresses-in-square-br.patch |   0
 ...o-specify-a-port-number-in-addresses.patch |   0
 ...mprove-check-to-detect-literal-IPv6-.patch |   0
 ...debug-message-if-parsing-the-address.patch |   0
 ...so-accept-F8-as-a-user-interrupt-key.patch |   0
 ...se-address-before-jumping-to-the-PE-.patch |   0
 ...ate-TPM-measurement-errors-to-the-ve.patch |   0
 ...maximum-bounce-buffer-size-to-16-MiB.patch |   0
 ...fix-when-the-HTTP-path-is-relative-a.patch |   0
 ...turn-in-efi-export-env-and-efi-load-.patch |   0
 ...p-fix-some-allocation-error-checking.patch |   0
 ...p-fix-some-allocation-error-checking.patch |   0
 ...g.c-fix-some-potential-allocation-ov.patch |   0
 ...integer-overflows-in-grub_cmd_initrd.patch |   0
 ...rnel-validation-without-shim-protoco.patch |   0
 ...ar-pointers-in-grub-core-net-bootp.c.patch |   0
 ...ointers-in-grub-core-net-efi-ip4_con.patch |   0
 ...ointers-in-grub-core-net-efi-ip6_con.patch |   0
 ...-pointers-in-grub-core-net-efi-net.c.patch |   0
 ...-pointers-in-grub-core-net-efi-pxe.c.patch |   0
 ...gration-scripts-to-make-systemctl-re.patch |   0
 ...ion.sh-Also-set-old-menu_show_once-g.patch |   0
 ...set-1-when-keyboard-is-in-Translate-.patch |   0
 ...ll-disable-support-for-EFI-platforms.patch |   0
 ...imestamps-configure-flag-to-prepend-.patch |   0
 ...ements-to-grub_disk_open-and-grub_di.patch |   0
 ...on-grub_debug_is_enabled-void-return.patch |   0
 ...ear-screen-when-debugging-is-enabled.patch |  22 +-
 ..._-instrumentation-new-file-debug-tag.patch |   0
 ...-Avoiding-many-unecessary-open-close.patch |   0
 ...-implements-fibre-channel-discovery-.patch |   0
 ...erpc-enables-device-mapper-discovery.patch |   0
 ...fallback_set-var-to-force-the-set-ma.patch |   6 +
 ...igning-grub-with-an-appended-signatu.patch |  11 +-
 ...rub-Document-signing-grub-under-UEFI.patch |   0
 ...nt-signing-grub-with-an-appended-sig.patch |   0
 ...e-grub_dl_set_persistent-for-the-emu.patch |   0
 ...patch => 0171-pgp-factor-out-rsa_pad.patch |   0
 ...rage-for-grub_crypto_pk_-to-crypto.c.patch |   0
 ...p-tweaks-in-preparation-for-libtasn1.patch |   0
 ...0174-libtasn1-import-libtasn1-4.16.0.patch |   0
 ...asn1-disable-code-not-needed-in-grub.patch |   0
 ...tasn1-changes-for-grub-compatibility.patch |   0
 ...77-libtasn1-compile-into-asn1-module.patch |   0
 ...8-test_asn1-test-module-for-libtasn1.patch |   0
 ...-support-embedding-x509-certificates.patch |   6 +-
 ...res-import-GNUTLS-s-ASN.1-descriptio.patch |   0
 ...res-parse-PKCS-7-signedData-and-X.50.patch |   0
 ...res-support-verifying-appended-signa.patch |   0
 ...pended-signatures-verification-tests.patch |   0
 ...84-appended-signatures-documentation.patch |   0
 ...er-lockdown-based-on-ibm-secure-boot.patch |   0
 ...275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch |   0
 ...h => 0187-ieee1275-claim-more-memory.patch |   0
 ...-memory-with-ibm-client-architecture.patch |   0
 ...-Also-handle-the-Extended-Key-Usage-.patch |   0
 ...eee1275-ofdisk-retry-on-open-failure.patch |   0
 ...nu_auto_hide.in-fix-a-then-than-typo.patch |   0
 ... => 0192-Fix-disabling-grub-rpm-sort.patch |   3 +
 ...-Don-t-check-for-rpmvercmp-in-librpm.patch |   0
 ...ainloading-EFI-apps-from-loop-mounts.patch |   2 +
 ...> 0195-efinet-Add-DHCP-proxy-support.patch |   3 +
 ...gnore-checksum-seed-incompat-feature.patch |   0
 ...-cmdline-when-generating-legacy-menu.patch |   2 +-
 ... 0198-Suppress-gettext-error-message.patch |   2 +-
 ...s.timer-Only-run-if-not-in-a-contain.patch |   0
 ...d-Always-use-boot-grub2-user.cfg-as-.patch |   0
 ...Remove-outdated-URL-for-BLS-document.patch |   2 +-
 ...for-EFI-at-runtime-instead-of-config.patch |   0
 ...or-if-boot-to-firmware-setup-is-not-.patch |   0
 ...x-EFI-loader-kernel-image-allocation.patch |   0
 ...over-the-device-to-read-the-config-f.patch |  10 +-
 ...etting-of-prefix-for-signed-binary-c.patch |   2 +-
 ...ix-signed-grub-special-case-for-Powe.patch |   2 +-
 ...r-the-PE-magic-for-the-compiled-arch.patch |   0
 ...adable-filesystem-with-v4-superblock.patch |   0
 ...module-name-on-license-check-failure.patch |  48 +++
 ...pc-ieee1275-load-grub-at-4MB-not-2MB.patch | 106 +++++
 grub.patches                                  | 388 +++++++++---------
 grub2.spec                                    |   5 +-
 203 files changed, 431 insertions(+), 830 deletions(-)
 delete mode 100644 0023-Don-t-write-messages-to-the-screen.patch
 rename 0032-Enable-pager-by-default.-985860.patch => 0023-Enable-pager-by-default.-985860.patch (100%)
 delete mode 100644 0024-Don-t-print-GNU-GRUB-header.patch
 rename 0034-Don-t-say-GNU-Linux-in-generated-menus.patch => 0024-Don-t-say-GNU-Linux-in-generated-menus.patch (97%)
 rename 0037-Add-.eh_frame-to-list-of-relocations-stripped.patch => 0025-Add-.eh_frame-to-list-of-relocations-stripped.patch (100%)
 delete mode 100644 0025-Don-t-add-to-highlighted-row.patch
 rename 0038-Don-t-require-a-password-to-boot-entries-generated-b.patch => 0026-Don-t-require-a-password-to-boot-entries-generated-b.patch (96%)
 delete mode 100644 0026-Message-string-cleanups.patch
 rename 0039-Don-t-emit-Booting-.-message.patch => 0027-Don-t-emit-Booting-.-message.patch (100%)
 delete mode 100644 0027-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
 rename 0040-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch => 0028-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch (100%)
 delete mode 100644 0028-Use-the-correct-indentation-for-the-term-help-text.patch
 delete mode 100644 0029-Indent-menu-entries.patch
 rename 0041-use-fw_path-prefix-when-fallback-searching-for-grub-.patch => 0029-use-fw_path-prefix-when-fallback-searching-for-grub-.patch (89%)
 delete mode 100644 0030-Fix-margins.patch
 rename 0042-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch => 0030-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch (97%)
 rename 0043-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch => 0031-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch (96%)
 delete mode 100644 0031-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
 rename 0044-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch => 0032-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch (100%)
 delete mode 100644 0033-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
 rename 0045-Try-prefix-if-fw_path-doesn-t-work.patch => 0033-Try-prefix-if-fw_path-doesn-t-work.patch (98%)
 rename 0046-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch => 0034-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch (100%)
 delete mode 100644 0035-Don-t-draw-a-border-around-the-menu.patch
 rename 0047-Make-grub2-mkconfig-construct-titles-that-look-like-.patch => 0035-Make-grub2-mkconfig-construct-titles-that-look-like-.patch (98%)
 rename 0048-Add-friendly-grub2-password-config-tool-985962.patch => 0036-Add-friendly-grub2-password-config-tool-985962.patch (100%)
 delete mode 100644 0036-Use-the-standard-margin-for-the-timeout-string.patch
 rename 0049-tcp-add-window-scaling-support.patch => 0037-tcp-add-window-scaling-support.patch (100%)
 rename 0050-efinet-and-bootp-add-support-for-dhcpv6.patch => 0038-efinet-and-bootp-add-support-for-dhcpv6.patch (100%)
 rename 0051-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch => 0039-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch (98%)
 rename 0052-bz1374141-fix-incorrect-mask-for-ppc64.patch => 0040-bz1374141-fix-incorrect-mask-for-ppc64.patch (100%)
 rename 0053-Make-grub_fatal-also-backtrace.patch => 0041-Make-grub_fatal-also-backtrace.patch (100%)
 rename 0054-Fix-up-some-man-pages-rpmdiff-noticed.patch => 0042-Fix-up-some-man-pages-rpmdiff-noticed.patch (100%)
 rename 0055-Make-our-info-pages-say-grub2-where-appropriate.patch => 0043-Make-our-info-pages-say-grub2-where-appropriate.patch (100%)
 rename 0056-macos-just-build-chainloader-entries-don-t-try-any-x.patch => 0044-macos-just-build-chainloader-entries-don-t-try-any-x.patch (100%)
 rename 0057-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch => 0045-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch (100%)
 rename 0058-export-btrfs_subvol-and-btrfs_subvolid.patch => 0046-export-btrfs_subvol-and-btrfs_subvolid.patch (100%)
 rename 0059-grub2-btrfs-03-follow_default.patch => 0047-grub2-btrfs-03-follow_default.patch (98%)
 rename 0060-grub2-btrfs-04-grub2-install.patch => 0048-grub2-btrfs-04-grub2-install.patch (98%)
 rename 0061-grub2-btrfs-05-grub2-mkconfig.patch => 0049-grub2-btrfs-05-grub2-mkconfig.patch (99%)
 rename 0062-grub2-btrfs-06-subvol-mount.patch => 0050-grub2-btrfs-06-subvol-mount.patch (99%)
 rename 0063-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch => 0051-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch (100%)
 rename 0064-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch => 0052-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch (98%)
 rename 0065-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch => 0053-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch (100%)
 rename 0066-Use-grub_efi_.-memory-helpers-where-reasonable.patch => 0054-Use-grub_efi_.-memory-helpers-where-reasonable.patch (100%)
 rename 0067-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch => 0055-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch (100%)
 rename 0068-don-t-use-int-for-efi-status.patch => 0056-don-t-use-int-for-efi-status.patch (100%)
 rename 0069-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch => 0057-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch (100%)
 rename 0070-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch => 0058-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch (100%)
 rename 0071-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch => 0059-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch (100%)
 rename 0072-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch => 0060-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch (100%)
 rename 0073-align-struct-efi_variable-better.patch => 0061-align-struct-efi_variable-better.patch (100%)
 rename 0074-Add-BLS-support-to-grub-mkconfig.patch => 0062-Add-BLS-support-to-grub-mkconfig.patch (99%)
 rename 0075-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch => 0063-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch (100%)
 rename 0076-Add-linux-and-initrd-commands-for-grub-emu.patch => 0064-Add-linux-and-initrd-commands-for-grub-emu.patch (98%)
 rename 0077-Add-grub2-switch-to-blscfg.patch => 0065-Add-grub2-switch-to-blscfg.patch (100%)
 rename 0078-make-better-backtraces.patch => 0066-make-better-backtraces.patch (100%)
 rename 0079-normal-don-t-draw-our-startup-message-if-debug-is-se.patch => 0067-normal-don-t-draw-our-startup-message-if-debug-is-se.patch (89%)
 rename 0080-Work-around-some-minor-include-path-weirdnesses.patch => 0068-Work-around-some-minor-include-path-weirdnesses.patch (100%)
 rename 0081-Make-it-possible-to-enabled-build-id-sha1.patch => 0069-Make-it-possible-to-enabled-build-id-sha1.patch (100%)
 rename 0082-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch => 0070-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch (100%)
 rename 0083-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch => 0071-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch (100%)
 rename 0084-Fixup-for-newer-compiler.patch => 0072-Fixup-for-newer-compiler.patch (100%)
 rename 0085-Don-t-attempt-to-export-the-start-and-_start-symbols.patch => 0073-Don-t-attempt-to-export-the-start-and-_start-symbols.patch (100%)
 rename 0086-Fixup-for-newer-compiler.patch => 0074-Fixup-for-newer-compiler.patch (100%)
 rename 0087-Add-support-for-non-Ethernet-network-cards.patch => 0075-Add-support-for-non-Ethernet-network-cards.patch (100%)
 rename 0088-net-read-bracketed-ipv6-addrs-and-port-numbers.patch => 0076-net-read-bracketed-ipv6-addrs-and-port-numbers.patch (100%)
 rename 0089-bootp-New-net_bootp6-command.patch => 0077-bootp-New-net_bootp6-command.patch (100%)
 rename 0090-efinet-UEFI-IPv6-PXE-support.patch => 0078-efinet-UEFI-IPv6-PXE-support.patch (100%)
 rename 0091-grub.texi-Add-net_bootp6-doument.patch => 0079-grub.texi-Add-net_bootp6-doument.patch (100%)
 rename 0092-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch => 0080-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch (100%)
 rename 0093-efinet-Setting-network-from-UEFI-device-path.patch => 0081-efinet-Setting-network-from-UEFI-device-path.patch (100%)
 rename 0094-efinet-Setting-DNS-server-from-UEFI-protocol.patch => 0082-efinet-Setting-DNS-server-from-UEFI-protocol.patch (100%)
 rename 0095-Support-UEFI-networking-protocols.patch => 0083-Support-UEFI-networking-protocols.patch (100%)
 rename 0096-AUDIT-0-http-boot-tracker-bug.patch => 0084-AUDIT-0-http-boot-tracker-bug.patch (100%)
 rename 0097-grub-editenv-Add-incr-command-to-increment-integer-v.patch => 0085-grub-editenv-Add-incr-command-to-increment-integer-v.patch (100%)
 rename 0098-Add-auto-hide-menu-support.patch => 0086-Add-auto-hide-menu-support.patch (100%)
 rename 0099-Add-grub-set-bootflag-utility.patch => 0087-Add-grub-set-bootflag-utility.patch (100%)
 rename 0100-docs-Add-grub-boot-indeterminate.service-example.patch => 0088-docs-Add-grub-boot-indeterminate.service-example.patch (100%)
 rename 0101-gentpl-add-disable-support.patch => 0089-gentpl-add-disable-support.patch (100%)
 rename 0102-gentpl-add-pc-firmware-type.patch => 0090-gentpl-add-pc-firmware-type.patch (100%)
 rename 0103-efinet-also-use-the-firmware-acceleration-for-http.patch => 0091-efinet-also-use-the-firmware-acceleration-for-http.patch (100%)
 rename 0104-efi-http-Make-root_url-reflect-the-protocol-hostname.patch => 0092-efi-http-Make-root_url-reflect-the-protocol-hostname.patch (100%)
 rename 0105-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch => 0093-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch (100%)
 rename 0106-module-verifier-make-it-possible-to-run-checkers-on-.patch => 0094-module-verifier-make-it-possible-to-run-checkers-on-.patch (100%)
 rename 0107-Rework-how-the-fdt-command-builds.patch => 0095-Rework-how-the-fdt-command-builds.patch (100%)
 rename 0108-Disable-non-wordsize-allocations-on-arm.patch => 0096-Disable-non-wordsize-allocations-on-arm.patch (100%)
 rename 0109-Prepend-prefix-when-HTTP-path-is-relative.patch => 0097-Prepend-prefix-when-HTTP-path-is-relative.patch (97%)
 rename 0110-Make-grub_error-more-verbose.patch => 0098-Make-grub_error-more-verbose.patch (100%)
 rename 0111-Make-reset-an-alias-for-the-reboot-command.patch => 0099-Make-reset-an-alias-for-the-reboot-command.patch (100%)
 rename 0112-Add-a-version-command.patch => 0100-Add-a-version-command.patch (100%)
 rename 0113-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch => 0101-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch (100%)
 rename 0114-arm-arm64-loader-Better-memory-allocation-and-error-.patch => 0102-arm-arm64-loader-Better-memory-allocation-and-error-.patch (100%)
 rename 0115-Try-to-pick-better-locations-for-kernel-and-initrd.patch => 0103-Try-to-pick-better-locations-for-kernel-and-initrd.patch (100%)
 rename 0116-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch => 0104-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch (100%)
 rename 0117-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch => 0105-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch (100%)
 rename 0118-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch => 0106-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch (100%)
 rename 0119-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch => 0107-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch (100%)
 rename 0120-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch => 0108-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch (100%)
 rename 0121-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch => 0109-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch (100%)
 rename 0122-Fix-getroot.c-s-trampolines.patch => 0110-Fix-getroot.c-s-trampolines.patch (100%)
 rename 0123-Do-not-allow-stack-trampolines-anywhere.patch => 0111-Do-not-allow-stack-trampolines-anywhere.patch (100%)
 rename 0124-Reimplement-boot_counter.patch => 0112-Reimplement-boot_counter.patch (100%)
 rename 0125-Fix-menu-entry-selection-based-on-ID-and-title.patch => 0113-Fix-menu-entry-selection-based-on-ID-and-title.patch (100%)
 rename 0126-Make-the-menu-entry-users-option-argument-to-be-opti.patch => 0114-Make-the-menu-entry-users-option-argument-to-be-opti.patch (100%)
 rename 0127-Add-efi-export-env-and-efi-load-env-commands.patch => 0115-Add-efi-export-env-and-efi-load-env-commands.patch (100%)
 rename 0128-Make-it-possible-to-subtract-conditions-from-debug.patch => 0116-Make-it-possible-to-subtract-conditions-from-debug.patch (100%)
 rename 0129-Export-all-variables-from-the-initial-context-when-c.patch => 0117-Export-all-variables-from-the-initial-context-when-c.patch (100%)
 rename 0130-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch => 0118-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch (98%)
 rename 0131-Fix-systemctl-kexec-exit-status-check.patch => 0119-Fix-systemctl-kexec-exit-status-check.patch (100%)
 rename 0132-Print-grub-emu-linux-loader-messages-as-debug.patch => 0120-Print-grub-emu-linux-loader-messages-as-debug.patch (100%)
 rename 0133-Don-t-assume-that-boot-commands-will-only-return-on-.patch => 0121-Don-t-assume-that-boot-commands-will-only-return-on-.patch (100%)
 rename 0134-Fix-undefined-references-for-fdt-when-building-with-.patch => 0122-Fix-undefined-references-for-fdt-when-building-with-.patch (100%)
 rename 0135-Do-better-in-bootstrap.conf.patch => 0123-Do-better-in-bootstrap.conf.patch (100%)
 rename 0136-Use-git-to-apply-gnulib-patches.patch => 0124-Use-git-to-apply-gnulib-patches.patch (100%)
 rename 0137-Fix-build-error-with-the-fdt-module-on-risc-v.patch => 0125-Fix-build-error-with-the-fdt-module-on-risc-v.patch (100%)
 rename 0138-grub-set-bootflag-Update-comment-about-running-as-ro.patch => 0126-grub-set-bootflag-Update-comment-about-running-as-ro.patch (100%)
 rename 0139-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch => 0127-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch (100%)
 rename 0140-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch => 0128-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch (100%)
 rename 0141-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch => 0129-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch (100%)
 rename 0142-chainloader-Define-machine-types-for-RISC-V.patch => 0130-chainloader-Define-machine-types-for-RISC-V.patch (100%)
 rename 0143-Add-start-symbol-for-RISC-V.patch => 0131-Add-start-symbol-for-RISC-V.patch (100%)
 rename 0144-bootstrap.conf-Force-autogen.sh-to-use-python3.patch => 0132-bootstrap.conf-Force-autogen.sh-to-use-python3.patch (100%)
 rename 0145-efi-http-Export-fw-http-_path-variables-to-make-them.patch => 0133-efi-http-Export-fw-http-_path-variables-to-make-them.patch (97%)
 rename 0146-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch => 0134-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch (100%)
 rename 0147-efi-net-Allow-to-specify-a-port-number-in-addresses.patch => 0135-efi-net-Allow-to-specify-a-port-number-in-addresses.patch (100%)
 rename 0148-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch => 0136-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch (100%)
 rename 0149-efi-net-Print-a-debug-message-if-parsing-the-address.patch => 0137-efi-net-Print-a-debug-message-if-parsing-the-address.patch (100%)
 rename 0150-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch => 0138-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch (100%)
 rename 0151-efi-Set-image-base-address-before-jumping-to-the-PE-.patch => 0139-efi-Set-image-base-address-before-jumping-to-the-PE-.patch (100%)
 rename 0152-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch => 0140-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch (100%)
 rename 0153-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch => 0141-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch (100%)
 rename 0154-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch => 0142-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch (100%)
 rename 0155-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch => 0143-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch (100%)
 rename 0156-efi-dhcp-fix-some-allocation-error-checking.patch => 0144-efi-dhcp-fix-some-allocation-error-checking.patch (100%)
 rename 0157-efi-http-fix-some-allocation-error-checking.patch => 0145-efi-http-fix-some-allocation-error-checking.patch (100%)
 rename 0158-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch => 0146-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch (100%)
 rename 0159-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch => 0147-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch (100%)
 rename 0160-linuxefi-fail-kernel-validation-without-shim-protoco.patch => 0148-linuxefi-fail-kernel-validation-without-shim-protoco.patch (100%)
 rename 0161-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch => 0149-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch (100%)
 rename 0162-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch => 0150-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch (100%)
 rename 0163-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch => 0151-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch (100%)
 rename 0164-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch => 0152-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch (100%)
 rename 0165-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch => 0153-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch (100%)
 rename 0166-Add-systemd-integration-scripts-to-make-systemctl-re.patch => 0154-Add-systemd-integration-scripts-to-make-systemctl-re.patch (100%)
 rename 0167-systemd-integration.sh-Also-set-old-menu_show_once-g.patch => 0155-systemd-integration.sh-Also-set-old-menu_show_once-g.patch (100%)
 rename 0168-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch => 0156-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch (100%)
 rename 0169-grub-install-disable-support-for-EFI-platforms.patch => 0157-grub-install-disable-support-for-EFI-platforms.patch (100%)
 rename 0170-New-with-debug-timestamps-configure-flag-to-prepend-.patch => 0158-New-with-debug-timestamps-configure-flag-to-prepend-.patch (100%)
 rename 0171-Added-debug-statements-to-grub_disk_open-and-grub_di.patch => 0159-Added-debug-statements-to-grub_disk_open-and-grub_di.patch (100%)
 rename 0172-Introduce-function-grub_debug_is_enabled-void-return.patch => 0160-Introduce-function-grub_debug_is_enabled-void-return.patch (100%)
 rename 0173-Don-t-clear-screen-when-debugging-is-enabled.patch => 0161-Don-t-clear-screen-when-debugging-is-enabled.patch (55%)
 rename 0174-grub_file_-instrumentation-new-file-debug-tag.patch => 0162-grub_file_-instrumentation-new-file-debug-tag.patch (100%)
 rename 0175-ieee1275-Avoiding-many-unecessary-open-close.patch => 0163-ieee1275-Avoiding-many-unecessary-open-close.patch (100%)
 rename 0176-ieee1275-powerpc-implements-fibre-channel-discovery-.patch => 0164-ieee1275-powerpc-implements-fibre-channel-discovery-.patch (100%)
 rename 0177-ieee1275-powerpc-enables-device-mapper-discovery.patch => 0165-ieee1275-powerpc-enables-device-mapper-discovery.patch (100%)
 rename 0178-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch => 0166-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch (97%)
 rename 0179-Add-suport-for-signing-grub-with-an-appended-signatu.patch => 0167-Add-suport-for-signing-grub-with-an-appended-signatu.patch (98%)
 rename 0180-docs-grub-Document-signing-grub-under-UEFI.patch => 0168-docs-grub-Document-signing-grub-under-UEFI.patch (100%)
 rename 0181-docs-grub-Document-signing-grub-with-an-appended-sig.patch => 0169-docs-grub-Document-signing-grub-with-an-appended-sig.patch (100%)
 rename 0182-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch => 0170-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch (100%)
 rename 0183-pgp-factor-out-rsa_pad.patch => 0171-pgp-factor-out-rsa_pad.patch (100%)
 rename 0184-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch => 0172-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch (100%)
 rename 0185-posix_wrap-tweaks-in-preparation-for-libtasn1.patch => 0173-posix_wrap-tweaks-in-preparation-for-libtasn1.patch (100%)
 rename 0186-libtasn1-import-libtasn1-4.16.0.patch => 0174-libtasn1-import-libtasn1-4.16.0.patch (100%)
 rename 0187-libtasn1-disable-code-not-needed-in-grub.patch => 0175-libtasn1-disable-code-not-needed-in-grub.patch (100%)
 rename 0188-libtasn1-changes-for-grub-compatibility.patch => 0176-libtasn1-changes-for-grub-compatibility.patch (100%)
 rename 0189-libtasn1-compile-into-asn1-module.patch => 0177-libtasn1-compile-into-asn1-module.patch (100%)
 rename 0190-test_asn1-test-module-for-libtasn1.patch => 0178-test_asn1-test-module-for-libtasn1.patch (100%)
 rename 0191-grub-install-support-embedding-x509-certificates.patch => 0179-grub-install-support-embedding-x509-certificates.patch (98%)
 rename 0192-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch => 0180-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch (100%)
 rename 0193-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch => 0181-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch (100%)
 rename 0194-appended-signatures-support-verifying-appended-signa.patch => 0182-appended-signatures-support-verifying-appended-signa.patch (100%)
 rename 0195-appended-signatures-verification-tests.patch => 0183-appended-signatures-verification-tests.patch (100%)
 rename 0196-appended-signatures-documentation.patch => 0184-appended-signatures-documentation.patch (100%)
 rename 0197-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch => 0185-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch (100%)
 rename 0198-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch => 0186-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch (100%)
 rename 0199-ieee1275-claim-more-memory.patch => 0187-ieee1275-claim-more-memory.patch (100%)
 rename 0200-ieee1275-request-memory-with-ibm-client-architecture.patch => 0188-ieee1275-request-memory-with-ibm-client-architecture.patch (100%)
 rename 0201-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch => 0189-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch (100%)
 rename 0202-ieee1275-ofdisk-retry-on-open-failure.patch => 0190-ieee1275-ofdisk-retry-on-open-failure.patch (100%)
 rename 0203-01_menu_auto_hide.in-fix-a-then-than-typo.patch => 0191-01_menu_auto_hide.in-fix-a-then-than-typo.patch (100%)
 rename 0204-Fix-disabling-grub-rpm-sort.patch => 0192-Fix-disabling-grub-rpm-sort.patch (95%)
 rename 0205-Don-t-check-for-rpmvercmp-in-librpm.patch => 0193-Don-t-check-for-rpmvercmp-in-librpm.patch (100%)
 rename 0206-Allow-chainloading-EFI-apps-from-loop-mounts.patch => 0194-Allow-chainloading-EFI-apps-from-loop-mounts.patch (97%)
 rename 0207-efinet-Add-DHCP-proxy-support.patch => 0195-efinet-Add-DHCP-proxy-support.patch (95%)
 rename 0208-fs-ext2-Ignore-checksum-seed-incompat-feature.patch => 0196-fs-ext2-Ignore-checksum-seed-incompat-feature.patch (100%)
 rename 0209-Don-t-update-the-cmdline-when-generating-legacy-menu.patch => 0197-Don-t-update-the-cmdline-when-generating-legacy-menu.patch (97%)
 rename 0210-Suppress-gettext-error-message.patch => 0198-Suppress-gettext-error-message.patch (96%)
 rename 0211-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch => 0199-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch (100%)
 rename 0212-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch => 0200-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch (100%)
 rename 0213-Remove-outdated-URL-for-BLS-document.patch => 0201-Remove-outdated-URL-for-BLS-document.patch (96%)
 rename 0214-templates-Check-for-EFI-at-runtime-instead-of-config.patch => 0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch (100%)
 rename 0215-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch => 0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch (100%)
 rename 0216-arm64-Fix-EFI-loader-kernel-image-allocation.patch => 0204-arm64-Fix-EFI-loader-kernel-image-allocation.patch (100%)
 rename 0217-normal-main-Discover-the-device-to-read-the-config-f.patch => 0205-normal-main-Discover-the-device-to-read-the-config-f.patch (92%)
 rename 0218-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch => 0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch (98%)
 rename 0219-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch => 0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch (97%)
 rename 0220-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch => 0208-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch (100%)
 rename 0221-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch => 0209-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch (100%)
 create mode 100644 0210-Print-module-name-on-license-check-failure.patch
 create mode 100644 0211-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch

diff --git a/0023-Don-t-write-messages-to-the-screen.patch b/0023-Don-t-write-messages-to-the-screen.patch
deleted file mode 100644
index 01d0264b..00000000
--- a/0023-Don-t-write-messages-to-the-screen.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Wed, 15 May 2013 13:30:20 -0400
-Subject: [PATCH] Don't write messages to the screen
-
-Writing messages to the screen before the menus or boot splash
-happens so quickly it looks like something is wrong and isn't
-very appealing.
----
- grub-core/gettext/gettext.c       | 25 +++++--------------------
- grub-core/kern/main.c             |  5 -----
- grub-core/boot/i386/pc/boot.S     |  3 ---
- grub-core/boot/i386/pc/diskboot.S |  5 -----
- util/grub.d/10_linux.in           |  7 -------
- 5 files changed, 5 insertions(+), 40 deletions(-)
-
-diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 4d02e62c109..84d520cd494 100644
---- a/grub-core/gettext/gettext.c
-+++ b/grub-core/gettext/gettext.c
-@@ -434,16 +434,12 @@ static char *
- grub_gettext_env_write_lang (struct grub_env_var *var
- 			     __attribute__ ((unused)), const char *val)
- {
--  grub_err_t err;
-+  grub_err_t __attribute__((__unused__)) err;
-   err = grub_gettext_init_ext (&main_context, val, grub_env_get ("locale_dir"),
- 			       grub_env_get ("prefix"));
--  if (err)
--    grub_print_error ();
- 
-   err = grub_gettext_init_ext (&secondary_context, val,
- 			       grub_env_get ("secondary_locale_dir"), 0);
--  if (err)
--    grub_print_error ();
- 
-   return grub_strdup (val);
- }
-@@ -451,23 +447,19 @@ grub_gettext_env_write_lang (struct grub_env_var *var
- void
- grub_gettext_reread_prefix (const char *val)
- {
--  grub_err_t err;
-+  grub_err_t __attribute__((__unused__)) err;
-   err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), 
- 			       grub_env_get ("locale_dir"),
- 			       val);
--  if (err)
--    grub_print_error ();
- }
- 
- static char *
- read_main (struct grub_env_var *var
- 	   __attribute__ ((unused)), const char *val)
- {
--  grub_err_t err;
-+  grub_err_t __attribute__((__unused__)) err;
-   err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), val,
- 			       grub_env_get ("prefix"));
--  if (err)
--    grub_print_error ();
-   return grub_strdup (val);
- }
- 
-@@ -475,12 +467,9 @@ static char *
- read_secondary (struct grub_env_var *var
- 		__attribute__ ((unused)), const char *val)
- {
--  grub_err_t err;
-+  grub_err_t __attribute__((__unused__)) err;
-   err = grub_gettext_init_ext (&secondary_context, grub_env_get ("lang"), val,
- 			       0);
--  if (err)
--    grub_print_error ();
--
-   return grub_strdup (val);
- }
- 
-@@ -500,18 +489,14 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
- GRUB_MOD_INIT (gettext)
- {
-   const char *lang;
--  grub_err_t err;
-+  grub_err_t __attribute__((__unused__)) err;
- 
-   lang = grub_env_get ("lang");
- 
-   err = grub_gettext_init_ext (&main_context, lang, grub_env_get ("locale_dir"),
- 			       grub_env_get ("prefix"));
--  if (err)
--    grub_print_error ();
-   err = grub_gettext_init_ext (&secondary_context, lang,
- 			       grub_env_get ("secondary_locale_dir"), 0);
--  if (err)
--    grub_print_error ();
- 
-   grub_register_variable_hook ("locale_dir", NULL, read_main);
-   grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);
-diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index d1de9fa6873..48058d983ce 100644
---- a/grub-core/kern/main.c
-+++ b/grub-core/kern/main.c
-@@ -269,11 +269,6 @@ grub_main (void)
- 
-   grub_boot_time ("After machine init.");
- 
--  /* Hello.  */
--  grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
--  grub_printf ("Welcome to GRUB!\n\n");
--  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
--
-   /* Init verifiers API. */
-   grub_verifiers_init ();
- 
-diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
-index 2bd0b2d2866..ea167fe1206 100644
---- a/grub-core/boot/i386/pc/boot.S
-+++ b/grub-core/boot/i386/pc/boot.S
-@@ -249,9 +249,6 @@ real_start:
- 	/* save drive reference first thing! */
- 	pushw	%dx
- 
--	/* print a notification message on the screen */
--	MSG(notification_string)
--
- 	/* set %si to the disk address packet */
- 	movw	$disk_address_packet, %si
- 
-diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
-index c1addc0df29..68d31de0c4c 100644
---- a/grub-core/boot/i386/pc/diskboot.S
-+++ b/grub-core/boot/i386/pc/diskboot.S
-@@ -50,11 +50,6 @@ _start:
- 	/* save drive reference first thing! */
- 	pushw	%dx
- 
--	/* print a notification message on the screen */
--	pushw	%si
--	MSG(notification_string)
--	popw	%si
--
- 	/* this sets up for the first run through "bootloop" */
- 	movw	$LOCAL(firstlist), %di
- 
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index dc75a1c30bf..ad2ac4b078d 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -138,27 +138,20 @@ linux_entry ()
-     fi
-     printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
-   fi
--  message="$(gettext_printf "Loading Linux %s ..." ${version})"
-   sed "s/^/$submenu_indentation/" << EOF
--	echo	'$(echo "$message" | grub_quote)'
- 	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
- EOF
-   if test -n "${initrd}" ; then
--    # TRANSLATORS: ramdisk isn't identifier. Should be translated.
--    message="$(gettext_printf "Loading initial ramdisk ...")"
-     initrd_path=
-     for i in ${initrd}; do
-       initrd_path="${initrd_path} ${rel_dirname}/${i}"
-     done
-     sed "s/^/$submenu_indentation/" << EOF
--	echo	'$(echo "$message" | grub_quote)'
- 	initrd	$(echo $initrd_path)
- EOF
-   fi
-   if test -n "${fdt}" ; then
--    message="$(gettext_printf "Loading fdt ...")"
-     sed "s/^/$submenu_indentation/" << EOF
--	echo	'$(echo "$message" | grub_quote)'
- 	devicetree	${rel_dirname}/${fdt}
- EOF
-   fi
diff --git a/0032-Enable-pager-by-default.-985860.patch b/0023-Enable-pager-by-default.-985860.patch
similarity index 100%
rename from 0032-Enable-pager-by-default.-985860.patch
rename to 0023-Enable-pager-by-default.-985860.patch
diff --git a/0024-Don-t-print-GNU-GRUB-header.patch b/0024-Don-t-print-GNU-GRUB-header.patch
deleted file mode 100644
index c903fd48..00000000
--- a/0024-Don-t-print-GNU-GRUB-header.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Wed, 15 May 2013 13:53:48 -0400
-Subject: [PATCH] Don't print GNU GRUB header
-
-No one cares.
----
- grub-core/normal/main.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 7ca2e5400b1..5d5f7b539f5 100644
---- a/grub-core/normal/main.c
-+++ b/grub-core/normal/main.c
-@@ -208,15 +208,16 @@ read_config_file (const char *config)
- /* Initialize the screen.  */
- void
- grub_normal_init_page (struct grub_term_output *term,
--		       int y)
-+		       int y __attribute__((__unused__)))
- {
-+  grub_term_cls (term);
-+
-+#if 0
-   grub_ssize_t msg_len;
-   int posx;
-   char *msg_formatted;
-   grub_uint32_t *unicode_msg;
-   grub_uint32_t *last_position;
-- 
--  grub_term_cls (term);
- 
-   msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-   if (!msg_formatted)
-@@ -241,6 +242,7 @@ grub_normal_init_page (struct grub_term_output *term,
-   grub_putcode ('\n', term);
-   grub_putcode ('\n', term);
-   grub_free (unicode_msg);
-+#endif
- }
- 
- static void
diff --git a/0034-Don-t-say-GNU-Linux-in-generated-menus.patch b/0024-Don-t-say-GNU-Linux-in-generated-menus.patch
similarity index 97%
rename from 0034-Don-t-say-GNU-Linux-in-generated-menus.patch
rename to 0024-Don-t-say-GNU-Linux-in-generated-menus.patch
index db2a8b5b..f2880950 100644
--- a/0034-Don-t-say-GNU-Linux-in-generated-menus.patch
+++ b/0024-Don-t-say-GNU-Linux-in-generated-menus.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index ad2ac4b078d..4fc58c83304 100644
+index dc75a1c30bf..4a499c53a61 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
diff --git a/0037-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch
similarity index 100%
rename from 0037-Add-.eh_frame-to-list-of-relocations-stripped.patch
rename to 0025-Add-.eh_frame-to-list-of-relocations-stripped.patch
diff --git a/0025-Don-t-add-to-highlighted-row.patch b/0025-Don-t-add-to-highlighted-row.patch
deleted file mode 100644
index b83f543e..00000000
--- a/0025-Don-t-add-to-highlighted-row.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Wed, 15 May 2013 17:49:45 -0400
-Subject: [PATCH] Don't add '*' to highlighted row
-
-It is already highlighted.
----
- grub-core/normal/menu_text.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 18240e76cea..65deafda531 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
-       unicode_title[i] = ' ';
- 
-   if (data->geo.num_entries > 1)
--    grub_putcode (highlight ? '*' : ' ', data->term);
-+    grub_putcode (' ', data->term);
- 
-   grub_print_ucs4_menu (unicode_title,
- 			unicode_title + len,
diff --git a/0038-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
similarity index 96%
rename from 0038-Don-t-require-a-password-to-boot-entries-generated-b.patch
rename to 0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
index fb0e1976..ac9475e3 100644
--- a/0038-Don-t-require-a-password-to-boot-entries-generated-b.patch
+++ b/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 4fc58c83304..635d2fe0cd3 100644
+index 4a499c53a61..cf8d1186981 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -26,7 +26,7 @@ datarootdir="@datarootdir@"
diff --git a/0026-Message-string-cleanups.patch b/0026-Message-string-cleanups.patch
deleted file mode 100644
index e23ee1ad..00000000
--- a/0026-Message-string-cleanups.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Fri, 7 Jun 2013 11:09:04 -0400
-Subject: [PATCH] Message string cleanups
-
-Make use of terminology consistent. Remove jargon.
----
- grub-core/normal/menu_text.c | 21 +++++++++------------
- 1 file changed, 9 insertions(+), 12 deletions(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 65deafda531..cc5837ed2b8 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -157,9 +157,8 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
- 
-   if (edit)
-     {
--      ret += grub_print_message_indented_real (_("Minimum Emacs-like screen editing is \
--supported. TAB lists completions. Press Ctrl-x or F10 to boot, Ctrl-c or F2 for a \
--command-line or ESC to discard edits and return to the GRUB menu."),
-+      ret += grub_print_message_indented_real (_("Press Ctrl-x or F10 to start, Ctrl-c or F2 for a \
-+command prompt or Escape to discard edits and return to the menu. Pressing Tab lists possible completions."),
- 					       STANDARD_MARGIN, STANDARD_MARGIN,
- 					       term, dry_run);
-     }
-@@ -167,8 +166,8 @@ command-line or ESC to discard edits and return to the GRUB menu."),
-     {
-       char *msg_translated;
- 
--      msg_translated = grub_xasprintf (_("Use the %C and %C keys to select which "
--					 "entry is highlighted."),
-+      msg_translated = grub_xasprintf (_("Use the %C and %C keys to change the "
-+					 "selection."),
- 				       GRUB_UNICODE_UPARROW,
- 				       GRUB_UNICODE_DOWNARROW);
-       if (!msg_translated)
-@@ -181,17 +180,15 @@ command-line or ESC to discard edits and return to the GRUB menu."),
-       if (nested)
- 	{
- 	  ret += grub_print_message_indented_real
--	    (_("Press enter to boot the selected OS, "
--	       "`e' to edit the commands before booting "
--	       "or `c' for a command-line. ESC to return previous menu."),
-+	    (_("Press 'e' to edit the selected item, "
-+	       "or 'c' for a command prompt. Press Escape to return to the previous menu."),
- 	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
- 	}
-       else
- 	{
- 	  ret += grub_print_message_indented_real
--	    (_("Press enter to boot the selected OS, "
--	       "`e' to edit the commands before booting "
--	       "or `c' for a command-line."),
-+	    (_("Press 'e' to edit the selected item, "
-+	       "or 'c' for a command prompt."),
- 	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
- 	}	
-     }
-@@ -443,7 +440,7 @@ menu_text_print_timeout (int timeout, void *dataptr)
-       || data->timeout_msg == TIMEOUT_TERSE_NO_MARGIN)
-     msg_translated = grub_xasprintf (_("%ds"), timeout);
-   else
--    msg_translated = grub_xasprintf (_("The highlighted entry will be executed automatically in %ds."), timeout);
-+    msg_translated = grub_xasprintf (_("The selected entry will be started automatically in %ds."), timeout);
-   if (!msg_translated)
-     {
-       grub_print_error ();
diff --git a/0039-Don-t-emit-Booting-.-message.patch b/0027-Don-t-emit-Booting-.-message.patch
similarity index 100%
rename from 0039-Don-t-emit-Booting-.-message.patch
rename to 0027-Don-t-emit-Booting-.-message.patch
diff --git a/0027-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0027-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
deleted file mode 100644
index 920ef797..00000000
--- a/0027-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Fri, 7 Jun 2013 14:08:23 -0400
-Subject: [PATCH] Fix border spacing now that we aren't displaying it
-
----
- grub-core/normal/menu_text.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index cc5837ed2b8..b49835a9af7 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -331,12 +331,12 @@ grub_menu_init_page (int nested, int edit,
-   int empty_lines = 1;
-   int version_msg = 1;
- 
--  geo->border = 1;
--  geo->first_entry_x = 1 /* margin */ + 1 /* border */;
-+  geo->border = 0;
-+  geo->first_entry_x = 0 /* margin */ + 0 /* border */;
-   geo->entry_width = grub_term_width (term) - 5;
- 
-   geo->first_entry_y = 2 /* two empty lines*/
--    + 1 /* GNU GRUB version text  */ + 1 /* top border */;
-+    + 0 /* GNU GRUB version text  */ + 1 /* top border */;
- 
-   geo->timeout_lines = 2;
- 
diff --git a/0040-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/0028-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
similarity index 100%
rename from 0040-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
rename to 0028-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
diff --git a/0028-Use-the-correct-indentation-for-the-term-help-text.patch b/0028-Use-the-correct-indentation-for-the-term-help-text.patch
deleted file mode 100644
index 0ce3b048..00000000
--- a/0028-Use-the-correct-indentation-for-the-term-help-text.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Fri, 7 Jun 2013 14:08:49 -0400
-Subject: [PATCH] Use the correct indentation for the term help text
-
-That is consistent with the menu help text
----
- grub-core/normal/main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 5d5f7b539f5..ec1cd257397 100644
---- a/grub-core/normal/main.c
-+++ b/grub-core/normal/main.c
-@@ -440,8 +440,8 @@ grub_normal_reader_init (int nested)
-     grub_normal_init_page (term, 1);
-     grub_term_setcursor (term, 1);
- 
--    if (grub_term_width (term) > 3 + STANDARD_MARGIN + 20)
--      grub_print_message_indented (msg_formatted, 3, STANDARD_MARGIN, term);
-+    if (grub_term_width (term) > 2 * STANDARD_MARGIN + 20)
-+      grub_print_message_indented (msg_formatted, STANDARD_MARGIN, STANDARD_MARGIN, term);
-     else
-       grub_print_message_indented (msg_formatted, 0, 0, term);
-     grub_putcode ('\n', term);
diff --git a/0029-Indent-menu-entries.patch b/0029-Indent-menu-entries.patch
deleted file mode 100644
index 7e588fd0..00000000
--- a/0029-Indent-menu-entries.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Fri, 7 Jun 2013 14:30:55 -0400
-Subject: [PATCH] Indent menu entries
-
----
- grub-core/normal/menu_text.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index b49835a9af7..6a57376fa80 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -239,7 +239,8 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
-       unicode_title[i] = ' ';
- 
-   if (data->geo.num_entries > 1)
--    grub_putcode (' ', data->term);
-+    for (i = 0; i < STANDARD_MARGIN; i++)
-+      grub_putcode (' ', data->term);
- 
-   grub_print_ucs4_menu (unicode_title,
- 			unicode_title + len,
diff --git a/0041-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0029-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
similarity index 89%
rename from 0041-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
rename to 0029-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
index 985205c1..6b1580bb 100644
--- a/0041-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+++ b/0029-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
@@ -17,10 +17,10 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index ec1cd257397..d85f7598d23 100644
+index 7ca2e5400b1..02577502116 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -349,7 +349,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -347,7 +347,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
        char *config;
        const char *prefix, *fw_path;
  
@@ -29,7 +29,7 @@ index ec1cd257397..d85f7598d23 100644
        if (fw_path)
  	{
  	  config = grub_xasprintf ("%s/grub.cfg", fw_path);
-@@ -372,7 +372,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -370,7 +370,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
  	    }
  	}
  
diff --git a/0030-Fix-margins.patch b/0030-Fix-margins.patch
deleted file mode 100644
index baa10edf..00000000
--- a/0030-Fix-margins.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Fri, 7 Jun 2013 14:59:36 -0400
-Subject: [PATCH] Fix margins
-
----
- grub-core/normal/menu_text.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 6a57376fa80..cbd62f714cb 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -333,17 +333,15 @@ grub_menu_init_page (int nested, int edit,
-   int version_msg = 1;
- 
-   geo->border = 0;
--  geo->first_entry_x = 0 /* margin */ + 0 /* border */;
--  geo->entry_width = grub_term_width (term) - 5;
-+  geo->first_entry_x = 0; /* no margin */
-+  geo->entry_width = grub_term_width (term) - 1;
- 
--  geo->first_entry_y = 2 /* two empty lines*/
--    + 0 /* GNU GRUB version text  */ + 1 /* top border */;
-+  geo->first_entry_y = 3; /* three empty lines*/
- 
-   geo->timeout_lines = 2;
- 
-   /* 3 lines for timeout message and bottom margin.  2 lines for the border.  */
-   geo->num_entries = grub_term_height (term) - geo->first_entry_y
--    - 1 /* bottom border */
-     - 1 /* empty line before info message*/
-     - geo->timeout_lines /* timeout */
-     - 1 /* empty final line  */;
diff --git a/0042-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0030-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
similarity index 97%
rename from 0042-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
rename to 0030-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
index 61dd5caa..ab49bb19 100644
--- a/0042-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+++ b/0030-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
@@ -9,10 +9,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 51 insertions(+), 46 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index d85f7598d23..1e509fceb91 100644
+index 02577502116..880d0ebd454 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -347,61 +347,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -345,61 +345,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
        /* Guess the config filename. It is necessary to make CONFIG static,
  	 so that it won't get broken by longjmp.  */
        char *config;
diff --git a/0043-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0031-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
similarity index 96%
rename from 0043-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
rename to 0031-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
index ef0b0f4b..245faf7e 100644
--- a/0043-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+++ b/0031-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 635d2fe0cd3..fed73271478 100644
+index cf8d1186981..5f6d3c8d52d 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"
diff --git a/0031-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0031-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
deleted file mode 100644
index 79321807..00000000
--- a/0031-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH] Use -2 instead of -1 for our right-hand margin, so
- linewrapping works (#976643).
-
-Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
----
- grub-core/normal/menu_text.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index cbd62f714cb..26e9e82042a 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -334,7 +334,7 @@ grub_menu_init_page (int nested, int edit,
- 
-   geo->border = 0;
-   geo->first_entry_x = 0; /* no margin */
--  geo->entry_width = grub_term_width (term) - 1;
-+  geo->entry_width = grub_term_width (term) - 2;
- 
-   geo->first_entry_y = 3; /* three empty lines*/
- 
diff --git a/0044-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0032-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
similarity index 100%
rename from 0044-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
rename to 0032-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
diff --git a/0033-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0033-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
deleted file mode 100644
index 7e9e8294..00000000
--- a/0033-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH] F10 doesn't work on serial, so don't tell the user to hit it
- (#987443)
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/normal/menu_text.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 26e9e82042a..4895ffe7d1d 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -157,7 +157,7 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
- 
-   if (edit)
-     {
--      ret += grub_print_message_indented_real (_("Press Ctrl-x or F10 to start, Ctrl-c or F2 for a \
-+      ret += grub_print_message_indented_real (_("Press Ctrl-x to start, Ctrl-c for a \
- command prompt or Escape to discard edits and return to the menu. Pressing Tab lists possible completions."),
- 					       STANDARD_MARGIN, STANDARD_MARGIN,
- 					       term, dry_run);
diff --git a/0045-Try-prefix-if-fw_path-doesn-t-work.patch b/0033-Try-prefix-if-fw_path-doesn-t-work.patch
similarity index 98%
rename from 0045-Try-prefix-if-fw_path-doesn-t-work.patch
rename to 0033-Try-prefix-if-fw_path-doesn-t-work.patch
index 59489bd9..54a876ba 100644
--- a/0045-Try-prefix-if-fw_path-doesn-t-work.patch
+++ b/0033-Try-prefix-if-fw_path-doesn-t-work.patch
@@ -69,10 +69,10 @@ index 4d3eb5c1a52..0ef148f4adc 100644
  
  static struct grub_preboot *fini_hnd;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 1e509fceb91..d5968797f4f 100644
+index 880d0ebd454..d5df4f815b0 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -337,81 +337,79 @@ grub_enter_normal_mode (const char *config)
+@@ -335,81 +335,79 @@ grub_enter_normal_mode (const char *config)
    grub_boot_time ("Exiting normal mode");
  }
  
diff --git a/0046-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/0034-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
similarity index 100%
rename from 0046-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
rename to 0034-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
diff --git a/0035-Don-t-draw-a-border-around-the-menu.patch b/0035-Don-t-draw-a-border-around-the-menu.patch
deleted file mode 100644
index 31a973ea..00000000
--- a/0035-Don-t-draw-a-border-around-the-menu.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Wed, 15 May 2013 16:47:33 -0400
-Subject: [PATCH] Don't draw a border around the menu
-
-It looks cleaner without it.
----
- grub-core/normal/menu_text.c | 43 -------------------------------------------
- 1 file changed, 43 deletions(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 4895ffe7d1d..e72ed438ba3 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
-   grub_print_message_indented_real (msg, margin_left, margin_right, term, 0);
- }
- 
--static void
--draw_border (struct grub_term_output *term, const struct grub_term_screen_geometry *geo)
--{
--  int i;
--
--  grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
--
--  grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
--	geo->first_entry_y - 1 });
--  grub_putcode (GRUB_UNICODE_CORNER_UL, term);
--  for (i = 0; i < geo->entry_width + 1; i++)
--    grub_putcode (GRUB_UNICODE_HLINE, term);
--  grub_putcode (GRUB_UNICODE_CORNER_UR, term);
--
--  for (i = 0; i < geo->num_entries; i++)
--    {
--      grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
--	    geo->first_entry_y + i });
--      grub_putcode (GRUB_UNICODE_VLINE, term);
--      grub_term_gotoxy (term,
--			(struct grub_term_coordinate) { geo->first_entry_x + geo->entry_width + 1,
--			    geo->first_entry_y + i });
--      grub_putcode (GRUB_UNICODE_VLINE, term);
--    }
--
--  grub_term_gotoxy (term,
--		    (struct grub_term_coordinate) { geo->first_entry_x - 1,
--			geo->first_entry_y - 1 + geo->num_entries + 1 });
--  grub_putcode (GRUB_UNICODE_CORNER_LL, term);
--  for (i = 0; i < geo->entry_width + 1; i++)
--    grub_putcode (GRUB_UNICODE_HLINE, term);
--  grub_putcode (GRUB_UNICODE_CORNER_LR, term);
--
--  grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
--
--  grub_term_gotoxy (term,
--		    (struct grub_term_coordinate) { geo->first_entry_x - 1,
--			(geo->first_entry_y - 1 + geo->num_entries
--			 + GRUB_TERM_MARGIN + 1) });
--}
--
- static int
- print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
- {
-@@ -406,8 +365,6 @@ grub_menu_init_page (int nested, int edit,
- 
-   grub_term_normal_color = grub_color_menu_normal;
-   grub_term_highlight_color = grub_color_menu_highlight;
--  if (geo->border)
--    draw_border (term, geo);
-   grub_term_normal_color = old_color_normal;
-   grub_term_highlight_color = old_color_highlight;
-   geo->timeout_y = geo->first_entry_y + geo->num_entries
diff --git a/0047-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0035-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
similarity index 98%
rename from 0047-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
rename to 0035-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
index 4c474e4b..4eb37e1e 100644
--- a/0047-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+++ b/0035-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 27 insertions(+), 7 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index fed73271478..2e59f3b4197 100644
+index 5f6d3c8d52d..786dbabb4a8 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -78,6 +78,32 @@ case x"$GRUB_FS" in
diff --git a/0048-Add-friendly-grub2-password-config-tool-985962.patch b/0036-Add-friendly-grub2-password-config-tool-985962.patch
similarity index 100%
rename from 0048-Add-friendly-grub2-password-config-tool-985962.patch
rename to 0036-Add-friendly-grub2-password-config-tool-985962.patch
diff --git a/0036-Use-the-standard-margin-for-the-timeout-string.patch b/0036-Use-the-standard-margin-for-the-timeout-string.patch
deleted file mode 100644
index 49a382d8..00000000
--- a/0036-Use-the-standard-margin-for-the-timeout-string.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Fri, 7 Jun 2013 10:52:32 -0400
-Subject: [PATCH] Use the standard margin for the timeout string
-
-So that it aligns with the other messages
----
- grub-core/normal/menu_text.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index e72ed438ba3..ca135624356 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit,
-   if (bottom_message)
-     {
-       grub_term_gotoxy (term,
--			(struct grub_term_coordinate) { GRUB_TERM_MARGIN,
-+			(struct grub_term_coordinate) { STANDARD_MARGIN,
- 			    geo->timeout_y });
- 
-       print_message (nested, edit, term, 0);
-@@ -407,14 +407,14 @@ menu_text_print_timeout (int timeout, void *dataptr)
-   if (data->timeout_msg == TIMEOUT_UNKNOWN)
-     {
-       data->timeout_msg = grub_print_message_indented_real (msg_translated,
--							    3, 1, data->term, 1)
-+							    STANDARD_MARGIN, 1, data->term, 1)
- 	<= data->geo.timeout_lines ? TIMEOUT_NORMAL : TIMEOUT_TERSE;
-       if (data->timeout_msg == TIMEOUT_TERSE)
- 	{
- 	  grub_free (msg_translated);
- 	  msg_translated = grub_xasprintf (_("%ds"), timeout);
- 	  if (grub_term_width (data->term) < 10)
--	    data->timeout_msg = TIMEOUT_TERSE_NO_MARGIN;
-+	    data->timeout_msg = STANDARD_MARGIN;
- 	}
-     }
- 
diff --git a/0049-tcp-add-window-scaling-support.patch b/0037-tcp-add-window-scaling-support.patch
similarity index 100%
rename from 0049-tcp-add-window-scaling-support.patch
rename to 0037-tcp-add-window-scaling-support.patch
diff --git a/0050-efinet-and-bootp-add-support-for-dhcpv6.patch b/0038-efinet-and-bootp-add-support-for-dhcpv6.patch
similarity index 100%
rename from 0050-efinet-and-bootp-add-support-for-dhcpv6.patch
rename to 0038-efinet-and-bootp-add-support-for-dhcpv6.patch
diff --git a/0051-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0039-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
similarity index 98%
rename from 0051-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
rename to 0039-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
index e799ac1a..f203685b 100644
--- a/0051-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+++ b/0039-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
@@ -235,7 +235,7 @@ index ba14cf6261c..005f093809b 100644
    if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
      GRUB_DISABLE_LINUX_UUID="true"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 2e59f3b4197..0f3c19e30cc 100644
+index 786dbabb4a8..292e333324b 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -111,7 +111,8 @@ linux_entry ()
@@ -258,7 +258,7 @@ index 2e59f3b4197..0f3c19e30cc 100644
        echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
    else
        echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
-@@ -299,11 +303,15 @@ while [ "x$list" != "x" ] ; do
+@@ -306,11 +310,15 @@ while [ "x$list" != "x" ] ; do
    fi
  
    if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
@@ -276,7 +276,7 @@ index 2e59f3b4197..0f3c19e30cc 100644
      if [ -z "$boot_device_id" ]; then
  	boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
      fi
-@@ -312,10 +320,15 @@ while [ "x$list" != "x" ] ; do
+@@ -319,10 +327,15 @@ while [ "x$list" != "x" ] ; do
      is_top_level=false
    fi
  
diff --git a/0052-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0040-bz1374141-fix-incorrect-mask-for-ppc64.patch
similarity index 100%
rename from 0052-bz1374141-fix-incorrect-mask-for-ppc64.patch
rename to 0040-bz1374141-fix-incorrect-mask-for-ppc64.patch
diff --git a/0053-Make-grub_fatal-also-backtrace.patch b/0041-Make-grub_fatal-also-backtrace.patch
similarity index 100%
rename from 0053-Make-grub_fatal-also-backtrace.patch
rename to 0041-Make-grub_fatal-also-backtrace.patch
diff --git a/0054-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0042-Fix-up-some-man-pages-rpmdiff-noticed.patch
similarity index 100%
rename from 0054-Fix-up-some-man-pages-rpmdiff-noticed.patch
rename to 0042-Fix-up-some-man-pages-rpmdiff-noticed.patch
diff --git a/0055-Make-our-info-pages-say-grub2-where-appropriate.patch b/0043-Make-our-info-pages-say-grub2-where-appropriate.patch
similarity index 100%
rename from 0055-Make-our-info-pages-say-grub2-where-appropriate.patch
rename to 0043-Make-our-info-pages-say-grub2-where-appropriate.patch
diff --git a/0056-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0044-macos-just-build-chainloader-entries-don-t-try-any-x.patch
similarity index 100%
rename from 0056-macos-just-build-chainloader-entries-don-t-try-any-x.patch
rename to 0044-macos-just-build-chainloader-entries-don-t-try-any-x.patch
diff --git a/0057-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0045-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
similarity index 100%
rename from 0057-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
rename to 0045-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
diff --git a/0058-export-btrfs_subvol-and-btrfs_subvolid.patch b/0046-export-btrfs_subvol-and-btrfs_subvolid.patch
similarity index 100%
rename from 0058-export-btrfs_subvol-and-btrfs_subvolid.patch
rename to 0046-export-btrfs_subvol-and-btrfs_subvolid.patch
diff --git a/0059-grub2-btrfs-03-follow_default.patch b/0047-grub2-btrfs-03-follow_default.patch
similarity index 98%
rename from 0059-grub2-btrfs-03-follow_default.patch
rename to 0047-grub2-btrfs-03-follow_default.patch
index 2b9a1364..ca203f4a 100644
--- a/0059-grub2-btrfs-03-follow_default.patch
+++ b/0047-grub2-btrfs-03-follow_default.patch
@@ -3,6 +3,8 @@ From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
 Subject: [PATCH] grub2-btrfs-03-follow_default
 
+Signed-off-by: Michael Chang <mchang@suse.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/fs/btrfs.c | 107 ++++++++++++++++++++++++++++++++++++---------------
  1 file changed, 76 insertions(+), 31 deletions(-)
diff --git a/0060-grub2-btrfs-04-grub2-install.patch b/0048-grub2-btrfs-04-grub2-install.patch
similarity index 98%
rename from 0060-grub2-btrfs-04-grub2-install.patch
rename to 0048-grub2-btrfs-04-grub2-install.patch
index f91c31a8..451f61d7 100644
--- a/0060-grub2-btrfs-04-grub2-install.patch
+++ b/0048-grub2-btrfs-04-grub2-install.patch
@@ -3,6 +3,8 @@ From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
 Subject: [PATCH] grub2-btrfs-04-grub2-install
 
+Signed-off-by: Michael Chang <mchang@suse.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/osdep/linux/getroot.c |  7 +++++++
  grub-core/osdep/unix/config.c   | 17 +++++++++++++++--
diff --git a/0061-grub2-btrfs-05-grub2-mkconfig.patch b/0049-grub2-btrfs-05-grub2-mkconfig.patch
similarity index 99%
rename from 0061-grub2-btrfs-05-grub2-mkconfig.patch
rename to 0049-grub2-btrfs-05-grub2-mkconfig.patch
index 8270505d..5afd183c 100644
--- a/0061-grub2-btrfs-05-grub2-mkconfig.patch
+++ b/0049-grub2-btrfs-05-grub2-mkconfig.patch
@@ -90,7 +90,7 @@ index 858b526c925..de727e6ee6b 100644
 +EOF
 +fi
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 0f3c19e30cc..cbfaca34cc7 100644
+index 292e333324b..7bb3a211a7c 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -66,10 +66,14 @@ fi
diff --git a/0062-grub2-btrfs-06-subvol-mount.patch b/0050-grub2-btrfs-06-subvol-mount.patch
similarity index 99%
rename from 0062-grub2-btrfs-06-subvol-mount.patch
rename to 0050-grub2-btrfs-06-subvol-mount.patch
index 9a511759..14117ab4 100644
--- a/0062-grub2-btrfs-06-subvol-mount.patch
+++ b/0050-grub2-btrfs-06-subvol-mount.patch
@@ -3,6 +3,8 @@ From: Michael Chang <mchang@suse.com>
 Date: Tue, 9 Jul 2019 13:56:16 +0200
 Subject: [PATCH] grub2-btrfs-06-subvol-mount
 
+Signed-off-by: Michael Chang <mchang@suse.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/fs/btrfs.c            | 195 +++++++++++++++++++++++++++++++++++++++-
  grub-core/osdep/linux/getroot.c | 148 +++++++++++++++++++++++++++++-
diff --git a/0063-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0051-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
similarity index 100%
rename from 0063-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
rename to 0051-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
diff --git a/0064-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0052-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
similarity index 98%
rename from 0064-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
rename to 0052-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
index d4e20cd5..b54b1960 100644
--- a/0064-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+++ b/0052-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
@@ -3,6 +3,8 @@ From: Michael Chang <mchang@suse.com>
 Date: Thu, 11 May 2017 08:56:57 +0000
 Subject: [PATCH] Grub not working correctly with btrfs snapshots (bsc#1026511)
 
+Signed-off-by: Michael Chang <mchang@suse.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/fs/btrfs.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 238 insertions(+)
diff --git a/0065-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0053-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
similarity index 100%
rename from 0065-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
rename to 0053-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
diff --git a/0066-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0054-Use-grub_efi_.-memory-helpers-where-reasonable.patch
similarity index 100%
rename from 0066-Use-grub_efi_.-memory-helpers-where-reasonable.patch
rename to 0054-Use-grub_efi_.-memory-helpers-where-reasonable.patch
diff --git a/0067-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0055-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
similarity index 100%
rename from 0067-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
rename to 0055-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
diff --git a/0068-don-t-use-int-for-efi-status.patch b/0056-don-t-use-int-for-efi-status.patch
similarity index 100%
rename from 0068-don-t-use-int-for-efi-status.patch
rename to 0056-don-t-use-int-for-efi-status.patch
diff --git a/0069-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0057-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
similarity index 100%
rename from 0069-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
rename to 0057-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
diff --git a/0070-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0058-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
similarity index 100%
rename from 0070-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
rename to 0058-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
diff --git a/0071-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0059-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
similarity index 100%
rename from 0071-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
rename to 0059-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
diff --git a/0072-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0060-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
similarity index 100%
rename from 0072-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
rename to 0060-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
diff --git a/0073-align-struct-efi_variable-better.patch b/0061-align-struct-efi_variable-better.patch
similarity index 100%
rename from 0073-align-struct-efi_variable-better.patch
rename to 0061-align-struct-efi_variable-better.patch
diff --git a/0074-Add-BLS-support-to-grub-mkconfig.patch b/0062-Add-BLS-support-to-grub-mkconfig.patch
similarity index 99%
rename from 0074-Add-BLS-support-to-grub-mkconfig.patch
rename to 0062-Add-BLS-support-to-grub-mkconfig.patch
index 6c65440b..9679fb9f 100644
--- a/0074-Add-BLS-support-to-grub-mkconfig.patch
+++ b/0062-Add-BLS-support-to-grub-mkconfig.patch
@@ -141,7 +141,7 @@ index fafeac95061..d8bb4069360 100644
    fi
    IFS="$old_ifs"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index cbfaca34cc7..68adb55d893 100644
+index 7bb3a211a7c..fdf324b7ab1 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -82,6 +82,223 @@ case x"$GRUB_FS" in
@@ -376,7 +376,7 @@ index cbfaca34cc7..68adb55d893 100644
    if [ x$type != xsimple ] ; then
        title=$(mktitle "$type" "$version")
        if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
-@@ -224,6 +442,7 @@ is_top_level=true
+@@ -231,6 +449,7 @@ is_top_level=true
  while [ "x$list" != "x" ] ; do
    linux=`version_find_latest $list`
    gettext_printf "Found linux image: %s\n" "$linux" >&2
@@ -384,7 +384,7 @@ index cbfaca34cc7..68adb55d893 100644
    basename=`basename $linux`
    dirname=`dirname $linux`
    rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -262,7 +481,9 @@ while [ "x$list" != "x" ] ; do
+@@ -269,7 +488,9 @@ while [ "x$list" != "x" ] ; do
      for i in ${initrd}; do
        initrd_display="${initrd_display} ${dirname}/${i}"
      done
diff --git a/0075-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0063-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
similarity index 100%
rename from 0075-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
rename to 0063-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
diff --git a/0076-Add-linux-and-initrd-commands-for-grub-emu.patch b/0064-Add-linux-and-initrd-commands-for-grub-emu.patch
similarity index 98%
rename from 0076-Add-linux-and-initrd-commands-for-grub-emu.patch
rename to 0064-Add-linux-and-initrd-commands-for-grub-emu.patch
index dd69b130..2431a4d7 100644
--- a/0076-Add-linux-and-initrd-commands-for-grub-emu.patch
+++ b/0064-Add-linux-and-initrd-commands-for-grub-emu.patch
@@ -1,10 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Michael Chang <mchang@suse.com>
+From: Raymund Will <rw@suse.com>
 Date: Tue, 6 Feb 2018 09:09:00 +0100
 Subject: [PATCH] Add linux and initrd commands for grub-emu
 
 When using grub-emu, the linux and initrd commands are used as arguments
 to the kexec command line tool, to allow booting the selected menu entry.
+
+Signed-off-by: Raymund Will <rw@suse.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/Makefile.core.def  |   1 -
  grub-core/kern/emu/main.c    |   4 +
diff --git a/0077-Add-grub2-switch-to-blscfg.patch b/0065-Add-grub2-switch-to-blscfg.patch
similarity index 100%
rename from 0077-Add-grub2-switch-to-blscfg.patch
rename to 0065-Add-grub2-switch-to-blscfg.patch
diff --git a/0078-make-better-backtraces.patch b/0066-make-better-backtraces.patch
similarity index 100%
rename from 0078-make-better-backtraces.patch
rename to 0066-make-better-backtraces.patch
diff --git a/0079-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0067-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
similarity index 89%
rename from 0079-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
rename to 0067-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
index 9922f2bb..9ebfc7ae 100644
--- a/0079-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
+++ b/0067-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] normal: don't draw our startup message if debug is set
  1 file changed, 3 insertions(+)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index d5968797f4f..e349303c29b 100644
+index d5df4f815b0..1970e4816a8 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -432,6 +432,9 @@ grub_normal_reader_init (int nested)
+@@ -430,6 +430,9 @@ grub_normal_reader_init (int nested)
    const char *msg_esc = _("ESC at any time exits.");
    char *msg_formatted;
  
diff --git a/0080-Work-around-some-minor-include-path-weirdnesses.patch b/0068-Work-around-some-minor-include-path-weirdnesses.patch
similarity index 100%
rename from 0080-Work-around-some-minor-include-path-weirdnesses.patch
rename to 0068-Work-around-some-minor-include-path-weirdnesses.patch
diff --git a/0081-Make-it-possible-to-enabled-build-id-sha1.patch b/0069-Make-it-possible-to-enabled-build-id-sha1.patch
similarity index 100%
rename from 0081-Make-it-possible-to-enabled-build-id-sha1.patch
rename to 0069-Make-it-possible-to-enabled-build-id-sha1.patch
diff --git a/0082-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0070-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
similarity index 100%
rename from 0082-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
rename to 0070-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
diff --git a/0083-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0071-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
similarity index 100%
rename from 0083-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
rename to 0071-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
diff --git a/0084-Fixup-for-newer-compiler.patch b/0072-Fixup-for-newer-compiler.patch
similarity index 100%
rename from 0084-Fixup-for-newer-compiler.patch
rename to 0072-Fixup-for-newer-compiler.patch
diff --git a/0085-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/0073-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
similarity index 100%
rename from 0085-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
rename to 0073-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
diff --git a/0086-Fixup-for-newer-compiler.patch b/0074-Fixup-for-newer-compiler.patch
similarity index 100%
rename from 0086-Fixup-for-newer-compiler.patch
rename to 0074-Fixup-for-newer-compiler.patch
diff --git a/0087-Add-support-for-non-Ethernet-network-cards.patch b/0075-Add-support-for-non-Ethernet-network-cards.patch
similarity index 100%
rename from 0087-Add-support-for-non-Ethernet-network-cards.patch
rename to 0075-Add-support-for-non-Ethernet-network-cards.patch
diff --git a/0088-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/0076-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
similarity index 100%
rename from 0088-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
rename to 0076-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
diff --git a/0089-bootp-New-net_bootp6-command.patch b/0077-bootp-New-net_bootp6-command.patch
similarity index 100%
rename from 0089-bootp-New-net_bootp6-command.patch
rename to 0077-bootp-New-net_bootp6-command.patch
diff --git a/0090-efinet-UEFI-IPv6-PXE-support.patch b/0078-efinet-UEFI-IPv6-PXE-support.patch
similarity index 100%
rename from 0090-efinet-UEFI-IPv6-PXE-support.patch
rename to 0078-efinet-UEFI-IPv6-PXE-support.patch
diff --git a/0091-grub.texi-Add-net_bootp6-doument.patch b/0079-grub.texi-Add-net_bootp6-doument.patch
similarity index 100%
rename from 0091-grub.texi-Add-net_bootp6-doument.patch
rename to 0079-grub.texi-Add-net_bootp6-doument.patch
diff --git a/0092-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0080-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
similarity index 100%
rename from 0092-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
rename to 0080-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
diff --git a/0093-efinet-Setting-network-from-UEFI-device-path.patch b/0081-efinet-Setting-network-from-UEFI-device-path.patch
similarity index 100%
rename from 0093-efinet-Setting-network-from-UEFI-device-path.patch
rename to 0081-efinet-Setting-network-from-UEFI-device-path.patch
diff --git a/0094-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0082-efinet-Setting-DNS-server-from-UEFI-protocol.patch
similarity index 100%
rename from 0094-efinet-Setting-DNS-server-from-UEFI-protocol.patch
rename to 0082-efinet-Setting-DNS-server-from-UEFI-protocol.patch
diff --git a/0095-Support-UEFI-networking-protocols.patch b/0083-Support-UEFI-networking-protocols.patch
similarity index 100%
rename from 0095-Support-UEFI-networking-protocols.patch
rename to 0083-Support-UEFI-networking-protocols.patch
diff --git a/0096-AUDIT-0-http-boot-tracker-bug.patch b/0084-AUDIT-0-http-boot-tracker-bug.patch
similarity index 100%
rename from 0096-AUDIT-0-http-boot-tracker-bug.patch
rename to 0084-AUDIT-0-http-boot-tracker-bug.patch
diff --git a/0097-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/0085-grub-editenv-Add-incr-command-to-increment-integer-v.patch
similarity index 100%
rename from 0097-grub-editenv-Add-incr-command-to-increment-integer-v.patch
rename to 0085-grub-editenv-Add-incr-command-to-increment-integer-v.patch
diff --git a/0098-Add-auto-hide-menu-support.patch b/0086-Add-auto-hide-menu-support.patch
similarity index 100%
rename from 0098-Add-auto-hide-menu-support.patch
rename to 0086-Add-auto-hide-menu-support.patch
diff --git a/0099-Add-grub-set-bootflag-utility.patch b/0087-Add-grub-set-bootflag-utility.patch
similarity index 100%
rename from 0099-Add-grub-set-bootflag-utility.patch
rename to 0087-Add-grub-set-bootflag-utility.patch
diff --git a/0100-docs-Add-grub-boot-indeterminate.service-example.patch b/0088-docs-Add-grub-boot-indeterminate.service-example.patch
similarity index 100%
rename from 0100-docs-Add-grub-boot-indeterminate.service-example.patch
rename to 0088-docs-Add-grub-boot-indeterminate.service-example.patch
diff --git a/0101-gentpl-add-disable-support.patch b/0089-gentpl-add-disable-support.patch
similarity index 100%
rename from 0101-gentpl-add-disable-support.patch
rename to 0089-gentpl-add-disable-support.patch
diff --git a/0102-gentpl-add-pc-firmware-type.patch b/0090-gentpl-add-pc-firmware-type.patch
similarity index 100%
rename from 0102-gentpl-add-pc-firmware-type.patch
rename to 0090-gentpl-add-pc-firmware-type.patch
diff --git a/0103-efinet-also-use-the-firmware-acceleration-for-http.patch b/0091-efinet-also-use-the-firmware-acceleration-for-http.patch
similarity index 100%
rename from 0103-efinet-also-use-the-firmware-acceleration-for-http.patch
rename to 0091-efinet-also-use-the-firmware-acceleration-for-http.patch
diff --git a/0104-efi-http-Make-root_url-reflect-the-protocol-hostname.patch b/0092-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
similarity index 100%
rename from 0104-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
rename to 0092-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
diff --git a/0105-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch b/0093-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
similarity index 100%
rename from 0105-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
rename to 0093-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
diff --git a/0106-module-verifier-make-it-possible-to-run-checkers-on-.patch b/0094-module-verifier-make-it-possible-to-run-checkers-on-.patch
similarity index 100%
rename from 0106-module-verifier-make-it-possible-to-run-checkers-on-.patch
rename to 0094-module-verifier-make-it-possible-to-run-checkers-on-.patch
diff --git a/0107-Rework-how-the-fdt-command-builds.patch b/0095-Rework-how-the-fdt-command-builds.patch
similarity index 100%
rename from 0107-Rework-how-the-fdt-command-builds.patch
rename to 0095-Rework-how-the-fdt-command-builds.patch
diff --git a/0108-Disable-non-wordsize-allocations-on-arm.patch b/0096-Disable-non-wordsize-allocations-on-arm.patch
similarity index 100%
rename from 0108-Disable-non-wordsize-allocations-on-arm.patch
rename to 0096-Disable-non-wordsize-allocations-on-arm.patch
diff --git a/0109-Prepend-prefix-when-HTTP-path-is-relative.patch b/0097-Prepend-prefix-when-HTTP-path-is-relative.patch
similarity index 97%
rename from 0109-Prepend-prefix-when-HTTP-path-is-relative.patch
rename to 0097-Prepend-prefix-when-HTTP-path-is-relative.patch
index fc861d97..d3e599d1 100644
--- a/0109-Prepend-prefix-when-HTTP-path-is-relative.patch
+++ b/0097-Prepend-prefix-when-HTTP-path-is-relative.patch
@@ -8,13 +8,15 @@ http_path: /foo/bar
 http_url: http://www.example.com/foo/bar
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
+Signed-off-by: Stephen Benjamin <stephen@redhat.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/kern/main.c    | 10 +++++-
  grub-core/net/efi/http.c | 82 ++++++++++++++++++++++++++++++++++++------------
  2 files changed, 71 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 48058d983ce..4ec3f5e4d33 100644
+index d1de9fa6873..1c540fc8c26 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -131,11 +131,19 @@ grub_set_prefix_and_root (void)
diff --git a/0110-Make-grub_error-more-verbose.patch b/0098-Make-grub_error-more-verbose.patch
similarity index 100%
rename from 0110-Make-grub_error-more-verbose.patch
rename to 0098-Make-grub_error-more-verbose.patch
diff --git a/0111-Make-reset-an-alias-for-the-reboot-command.patch b/0099-Make-reset-an-alias-for-the-reboot-command.patch
similarity index 100%
rename from 0111-Make-reset-an-alias-for-the-reboot-command.patch
rename to 0099-Make-reset-an-alias-for-the-reboot-command.patch
diff --git a/0112-Add-a-version-command.patch b/0100-Add-a-version-command.patch
similarity index 100%
rename from 0112-Add-a-version-command.patch
rename to 0100-Add-a-version-command.patch
diff --git a/0113-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch b/0101-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
similarity index 100%
rename from 0113-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
rename to 0101-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
diff --git a/0114-arm-arm64-loader-Better-memory-allocation-and-error-.patch b/0102-arm-arm64-loader-Better-memory-allocation-and-error-.patch
similarity index 100%
rename from 0114-arm-arm64-loader-Better-memory-allocation-and-error-.patch
rename to 0102-arm-arm64-loader-Better-memory-allocation-and-error-.patch
diff --git a/0115-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/0103-Try-to-pick-better-locations-for-kernel-and-initrd.patch
similarity index 100%
rename from 0115-Try-to-pick-better-locations-for-kernel-and-initrd.patch
rename to 0103-Try-to-pick-better-locations-for-kernel-and-initrd.patch
diff --git a/0116-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch b/0104-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
similarity index 100%
rename from 0116-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
rename to 0104-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
diff --git a/0117-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch b/0105-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
similarity index 100%
rename from 0117-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
rename to 0105-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
diff --git a/0118-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch b/0106-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
similarity index 100%
rename from 0118-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
rename to 0106-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
diff --git a/0119-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch b/0107-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
similarity index 100%
rename from 0119-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
rename to 0107-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
diff --git a/0120-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch b/0108-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
similarity index 100%
rename from 0120-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
rename to 0108-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
diff --git a/0121-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch b/0109-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
similarity index 100%
rename from 0121-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
rename to 0109-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
diff --git a/0122-Fix-getroot.c-s-trampolines.patch b/0110-Fix-getroot.c-s-trampolines.patch
similarity index 100%
rename from 0122-Fix-getroot.c-s-trampolines.patch
rename to 0110-Fix-getroot.c-s-trampolines.patch
diff --git a/0123-Do-not-allow-stack-trampolines-anywhere.patch b/0111-Do-not-allow-stack-trampolines-anywhere.patch
similarity index 100%
rename from 0123-Do-not-allow-stack-trampolines-anywhere.patch
rename to 0111-Do-not-allow-stack-trampolines-anywhere.patch
diff --git a/0124-Reimplement-boot_counter.patch b/0112-Reimplement-boot_counter.patch
similarity index 100%
rename from 0124-Reimplement-boot_counter.patch
rename to 0112-Reimplement-boot_counter.patch
diff --git a/0125-Fix-menu-entry-selection-based-on-ID-and-title.patch b/0113-Fix-menu-entry-selection-based-on-ID-and-title.patch
similarity index 100%
rename from 0125-Fix-menu-entry-selection-based-on-ID-and-title.patch
rename to 0113-Fix-menu-entry-selection-based-on-ID-and-title.patch
diff --git a/0126-Make-the-menu-entry-users-option-argument-to-be-opti.patch b/0114-Make-the-menu-entry-users-option-argument-to-be-opti.patch
similarity index 100%
rename from 0126-Make-the-menu-entry-users-option-argument-to-be-opti.patch
rename to 0114-Make-the-menu-entry-users-option-argument-to-be-opti.patch
diff --git a/0127-Add-efi-export-env-and-efi-load-env-commands.patch b/0115-Add-efi-export-env-and-efi-load-env-commands.patch
similarity index 100%
rename from 0127-Add-efi-export-env-and-efi-load-env-commands.patch
rename to 0115-Add-efi-export-env-and-efi-load-env-commands.patch
diff --git a/0128-Make-it-possible-to-subtract-conditions-from-debug.patch b/0116-Make-it-possible-to-subtract-conditions-from-debug.patch
similarity index 100%
rename from 0128-Make-it-possible-to-subtract-conditions-from-debug.patch
rename to 0116-Make-it-possible-to-subtract-conditions-from-debug.patch
diff --git a/0129-Export-all-variables-from-the-initial-context-when-c.patch b/0117-Export-all-variables-from-the-initial-context-when-c.patch
similarity index 100%
rename from 0129-Export-all-variables-from-the-initial-context-when-c.patch
rename to 0117-Export-all-variables-from-the-initial-context-when-c.patch
diff --git a/0130-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch b/0118-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
similarity index 98%
rename from 0130-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
rename to 0118-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
index 9788fd52..6797ffc4 100644
--- a/0130-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
+++ b/0118-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
@@ -7,6 +7,9 @@ Subject: [PATCH] grub.d: Split out boot success reset from menu auto hide
 Also rename fallback and menu auto hide script to be executed
 before and after boot success reset script.
 In menu auto hide script, rename last_boot_ok var to menu_hide_ok
+
+Signed-off-by: Christian Glombek <lorbus@fedoraproject.org>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  Makefile.util.def                                  | 14 ++++++++----
  ...allback_counting.in => 08_fallback_counting.in} | 14 ++++++------
diff --git a/0131-Fix-systemctl-kexec-exit-status-check.patch b/0119-Fix-systemctl-kexec-exit-status-check.patch
similarity index 100%
rename from 0131-Fix-systemctl-kexec-exit-status-check.patch
rename to 0119-Fix-systemctl-kexec-exit-status-check.patch
diff --git a/0132-Print-grub-emu-linux-loader-messages-as-debug.patch b/0120-Print-grub-emu-linux-loader-messages-as-debug.patch
similarity index 100%
rename from 0132-Print-grub-emu-linux-loader-messages-as-debug.patch
rename to 0120-Print-grub-emu-linux-loader-messages-as-debug.patch
diff --git a/0133-Don-t-assume-that-boot-commands-will-only-return-on-.patch b/0121-Don-t-assume-that-boot-commands-will-only-return-on-.patch
similarity index 100%
rename from 0133-Don-t-assume-that-boot-commands-will-only-return-on-.patch
rename to 0121-Don-t-assume-that-boot-commands-will-only-return-on-.patch
diff --git a/0134-Fix-undefined-references-for-fdt-when-building-with-.patch b/0122-Fix-undefined-references-for-fdt-when-building-with-.patch
similarity index 100%
rename from 0134-Fix-undefined-references-for-fdt-when-building-with-.patch
rename to 0122-Fix-undefined-references-for-fdt-when-building-with-.patch
diff --git a/0135-Do-better-in-bootstrap.conf.patch b/0123-Do-better-in-bootstrap.conf.patch
similarity index 100%
rename from 0135-Do-better-in-bootstrap.conf.patch
rename to 0123-Do-better-in-bootstrap.conf.patch
diff --git a/0136-Use-git-to-apply-gnulib-patches.patch b/0124-Use-git-to-apply-gnulib-patches.patch
similarity index 100%
rename from 0136-Use-git-to-apply-gnulib-patches.patch
rename to 0124-Use-git-to-apply-gnulib-patches.patch
diff --git a/0137-Fix-build-error-with-the-fdt-module-on-risc-v.patch b/0125-Fix-build-error-with-the-fdt-module-on-risc-v.patch
similarity index 100%
rename from 0137-Fix-build-error-with-the-fdt-module-on-risc-v.patch
rename to 0125-Fix-build-error-with-the-fdt-module-on-risc-v.patch
diff --git a/0138-grub-set-bootflag-Update-comment-about-running-as-ro.patch b/0126-grub-set-bootflag-Update-comment-about-running-as-ro.patch
similarity index 100%
rename from 0138-grub-set-bootflag-Update-comment-about-running-as-ro.patch
rename to 0126-grub-set-bootflag-Update-comment-about-running-as-ro.patch
diff --git a/0139-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch b/0127-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
similarity index 100%
rename from 0139-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
rename to 0127-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
diff --git a/0140-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/0128-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
similarity index 100%
rename from 0140-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
rename to 0128-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
diff --git a/0141-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch b/0129-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch
similarity index 100%
rename from 0141-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch
rename to 0129-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch
diff --git a/0142-chainloader-Define-machine-types-for-RISC-V.patch b/0130-chainloader-Define-machine-types-for-RISC-V.patch
similarity index 100%
rename from 0142-chainloader-Define-machine-types-for-RISC-V.patch
rename to 0130-chainloader-Define-machine-types-for-RISC-V.patch
diff --git a/0143-Add-start-symbol-for-RISC-V.patch b/0131-Add-start-symbol-for-RISC-V.patch
similarity index 100%
rename from 0143-Add-start-symbol-for-RISC-V.patch
rename to 0131-Add-start-symbol-for-RISC-V.patch
diff --git a/0144-bootstrap.conf-Force-autogen.sh-to-use-python3.patch b/0132-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
similarity index 100%
rename from 0144-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
rename to 0132-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
diff --git a/0145-efi-http-Export-fw-http-_path-variables-to-make-them.patch b/0133-efi-http-Export-fw-http-_path-variables-to-make-them.patch
similarity index 97%
rename from 0145-efi-http-Export-fw-http-_path-variables-to-make-them.patch
rename to 0133-efi-http-Export-fw-http-_path-variables-to-make-them.patch
index 6f2e93dd..74183bc3 100644
--- a/0145-efi-http-Export-fw-http-_path-variables-to-make-them.patch
+++ b/0133-efi-http-Export-fw-http-_path-variables-to-make-them.patch
@@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 4ec3f5e4d33..0285e95a2bb 100644
+index 1c540fc8c26..b573be6650d 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -143,6 +143,7 @@ grub_set_prefix_and_root (void)
diff --git a/0146-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch b/0134-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
similarity index 100%
rename from 0146-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
rename to 0134-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
diff --git a/0147-efi-net-Allow-to-specify-a-port-number-in-addresses.patch b/0135-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
similarity index 100%
rename from 0147-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
rename to 0135-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
diff --git a/0148-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch b/0136-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
similarity index 100%
rename from 0148-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
rename to 0136-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
diff --git a/0149-efi-net-Print-a-debug-message-if-parsing-the-address.patch b/0137-efi-net-Print-a-debug-message-if-parsing-the-address.patch
similarity index 100%
rename from 0149-efi-net-Print-a-debug-message-if-parsing-the-address.patch
rename to 0137-efi-net-Print-a-debug-message-if-parsing-the-address.patch
diff --git a/0150-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch b/0138-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
similarity index 100%
rename from 0150-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
rename to 0138-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
diff --git a/0151-efi-Set-image-base-address-before-jumping-to-the-PE-.patch b/0139-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
similarity index 100%
rename from 0151-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
rename to 0139-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
diff --git a/0152-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch b/0140-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
similarity index 100%
rename from 0152-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
rename to 0140-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
diff --git a/0153-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch b/0141-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
similarity index 100%
rename from 0153-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
rename to 0141-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
diff --git a/0154-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch b/0142-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
similarity index 100%
rename from 0154-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
rename to 0142-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
diff --git a/0155-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch b/0143-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
similarity index 100%
rename from 0155-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
rename to 0143-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
diff --git a/0156-efi-dhcp-fix-some-allocation-error-checking.patch b/0144-efi-dhcp-fix-some-allocation-error-checking.patch
similarity index 100%
rename from 0156-efi-dhcp-fix-some-allocation-error-checking.patch
rename to 0144-efi-dhcp-fix-some-allocation-error-checking.patch
diff --git a/0157-efi-http-fix-some-allocation-error-checking.patch b/0145-efi-http-fix-some-allocation-error-checking.patch
similarity index 100%
rename from 0157-efi-http-fix-some-allocation-error-checking.patch
rename to 0145-efi-http-fix-some-allocation-error-checking.patch
diff --git a/0158-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch b/0146-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
similarity index 100%
rename from 0158-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
rename to 0146-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
diff --git a/0159-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/0147-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
similarity index 100%
rename from 0159-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
rename to 0147-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
diff --git a/0160-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/0148-linuxefi-fail-kernel-validation-without-shim-protoco.patch
similarity index 100%
rename from 0160-linuxefi-fail-kernel-validation-without-shim-protoco.patch
rename to 0148-linuxefi-fail-kernel-validation-without-shim-protoco.patch
diff --git a/0161-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch b/0149-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
similarity index 100%
rename from 0161-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
rename to 0149-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
diff --git a/0162-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch b/0150-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
similarity index 100%
rename from 0162-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
rename to 0150-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
diff --git a/0163-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch b/0151-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
similarity index 100%
rename from 0163-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
rename to 0151-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
diff --git a/0164-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch b/0152-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
similarity index 100%
rename from 0164-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
rename to 0152-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
diff --git a/0165-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch b/0153-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
similarity index 100%
rename from 0165-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
rename to 0153-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
diff --git a/0166-Add-systemd-integration-scripts-to-make-systemctl-re.patch b/0154-Add-systemd-integration-scripts-to-make-systemctl-re.patch
similarity index 100%
rename from 0166-Add-systemd-integration-scripts-to-make-systemctl-re.patch
rename to 0154-Add-systemd-integration-scripts-to-make-systemctl-re.patch
diff --git a/0167-systemd-integration.sh-Also-set-old-menu_show_once-g.patch b/0155-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
similarity index 100%
rename from 0167-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
rename to 0155-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
diff --git a/0168-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch b/0156-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
similarity index 100%
rename from 0168-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
rename to 0156-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
diff --git a/0169-grub-install-disable-support-for-EFI-platforms.patch b/0157-grub-install-disable-support-for-EFI-platforms.patch
similarity index 100%
rename from 0169-grub-install-disable-support-for-EFI-platforms.patch
rename to 0157-grub-install-disable-support-for-EFI-platforms.patch
diff --git a/0170-New-with-debug-timestamps-configure-flag-to-prepend-.patch b/0158-New-with-debug-timestamps-configure-flag-to-prepend-.patch
similarity index 100%
rename from 0170-New-with-debug-timestamps-configure-flag-to-prepend-.patch
rename to 0158-New-with-debug-timestamps-configure-flag-to-prepend-.patch
diff --git a/0171-Added-debug-statements-to-grub_disk_open-and-grub_di.patch b/0159-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
similarity index 100%
rename from 0171-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
rename to 0159-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
diff --git a/0172-Introduce-function-grub_debug_is_enabled-void-return.patch b/0160-Introduce-function-grub_debug_is_enabled-void-return.patch
similarity index 100%
rename from 0172-Introduce-function-grub_debug_is_enabled-void-return.patch
rename to 0160-Introduce-function-grub_debug_is_enabled-void-return.patch
diff --git a/0173-Don-t-clear-screen-when-debugging-is-enabled.patch b/0161-Don-t-clear-screen-when-debugging-is-enabled.patch
similarity index 55%
rename from 0173-Don-t-clear-screen-when-debugging-is-enabled.patch
rename to 0161-Don-t-clear-screen-when-debugging-is-enabled.patch
index d2a59886..d17b080c 100644
--- a/0173-Don-t-clear-screen-when-debugging-is-enabled.patch
+++ b/0161-Don-t-clear-screen-when-debugging-is-enabled.patch
@@ -7,21 +7,25 @@ Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
+[rharwood@redhat.com: rebase fuzz]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/normal/main.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ grub-core/normal/main.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index e349303c29b..155bf366da2 100644
+index 1970e4816a8..4ebdbd228d4 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -210,7 +210,8 @@ void
- grub_normal_init_page (struct grub_term_output *term,
- 		       int y __attribute__((__unused__)))
- {
+@@ -215,8 +215,9 @@ grub_normal_init_page (struct grub_term_output *term,
+   char *msg_formatted;
+   grub_uint32_t *unicode_msg;
+   grub_uint32_t *last_position;
+- 
 -  grub_term_cls (term);
++
 +  if (! grub_debug_is_enabled ())
 +    grub_term_cls (term);
  
- #if 0
-   grub_ssize_t msg_len;
+   msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
+   if (!msg_formatted)
diff --git a/0174-grub_file_-instrumentation-new-file-debug-tag.patch b/0162-grub_file_-instrumentation-new-file-debug-tag.patch
similarity index 100%
rename from 0174-grub_file_-instrumentation-new-file-debug-tag.patch
rename to 0162-grub_file_-instrumentation-new-file-debug-tag.patch
diff --git a/0175-ieee1275-Avoiding-many-unecessary-open-close.patch b/0163-ieee1275-Avoiding-many-unecessary-open-close.patch
similarity index 100%
rename from 0175-ieee1275-Avoiding-many-unecessary-open-close.patch
rename to 0163-ieee1275-Avoiding-many-unecessary-open-close.patch
diff --git a/0176-ieee1275-powerpc-implements-fibre-channel-discovery-.patch b/0164-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
similarity index 100%
rename from 0176-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
rename to 0164-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
diff --git a/0177-ieee1275-powerpc-enables-device-mapper-discovery.patch b/0165-ieee1275-powerpc-enables-device-mapper-discovery.patch
similarity index 100%
rename from 0177-ieee1275-powerpc-enables-device-mapper-discovery.patch
rename to 0165-ieee1275-powerpc-enables-device-mapper-discovery.patch
diff --git a/0178-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch b/0166-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
similarity index 97%
rename from 0178-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
rename to 0166-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
index 968a9c14..01e7e678 100644
--- a/0178-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
+++ b/0166-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
@@ -2,6 +2,9 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
 Date: Fri, 18 Dec 2020 15:39:26 +0100
 Subject: [PATCH] Add 'at_keyboard_fallback_set' var to force the set manually
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 This seems required with HP DL380p Gen 8 systems.
 Indeed, with this system, we can see the following sequence:
@@ -24,6 +27,9 @@ solution":
 - https://wiki.osdev.org/%228042%22_PS/2_Controller
 - http://www-ug.eecg.toronto.edu/msl/nios_devices/datasheets/PS2%20Keyboard%20Protocol.htm
 - http://www.s100computers.com/My%20System%20Pages/MSDOS%20Board/PC%20Keyboard.pdf
+
+Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/term/at_keyboard.c | 121 ++++++++++++++++++++++++++++++++++---------
  1 file changed, 96 insertions(+), 25 deletions(-)
diff --git a/0179-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/0167-Add-suport-for-signing-grub-with-an-appended-signatu.patch
similarity index 98%
rename from 0179-Add-suport-for-signing-grub-with-an-appended-signatu.patch
rename to 0167-Add-suport-for-signing-grub-with-an-appended-signatu.patch
index 86075510..caab8d58 100644
--- a/0179-Add-suport-for-signing-grub-with-an-appended-signatu.patch
+++ b/0167-Add-suport-for-signing-grub-with-an-appended-signatu.patch
@@ -44,12 +44,12 @@ I will be proposing this for inclusion in a future Power Architecture
 Platform Reference (PAPR).
 ---
  util/grub-install-common.c  | 18 ++++++++++++++++--
- util/grub-mkimage.c         | 16 ++++++++++++++--
+ util/grub-mkimage.c         | 15 +++++++++++++--
  util/grub-mkimagexx.c       | 39 ++++++++++++++++++++++++++++++++++++++-
  util/mkimage.c              | 13 +++++++------
  include/grub/util/install.h |  8 ++++++--
  include/grub/util/mkimage.h |  4 ++--
- 6 files changed, 83 insertions(+), 15 deletions(-)
+ 6 files changed, 82 insertions(+), 15 deletions(-)
 
 diff --git a/util/grub-install-common.c b/util/grub-install-common.c
 index 4e212e690c5..aab2a941f85 100644
@@ -106,7 +106,7 @@ index 4e212e690c5..aab2a941f85 100644
    while (dc--)
      grub_install_pop_module ();
 diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
-index c0d55993702..94c9893230f 100644
+index c0d55993702..8a53310548b 100644
 --- a/util/grub-mkimage.c
 +++ b/util/grub-mkimage.c
 @@ -84,6 +84,7 @@ static struct argp_option options[] = {
@@ -147,14 +147,13 @@ index c0d55993702..94c9893230f 100644
      case 'm':
        if (arguments->memdisk)
  	free (arguments->memdisk);
-@@ -324,8 +334,10 @@ main (int argc, char *argv[])
+@@ -324,8 +334,9 @@ main (int argc, char *argv[])
  			       arguments.memdisk, arguments.pubkeys,
  			       arguments.npubkeys, arguments.config,
  			       arguments.image_target, arguments.note,
 -			       arguments.comp, arguments.dtb,
 -			       arguments.sbat, arguments.disable_shim_lock);
-+
-+			       arguments.comp, arguments.appsig_size,
++			       arguments.appsig_size, arguments.comp,
 +			       arguments.dtb, arguments.sbat,
 +			       arguments.disable_shim_lock);
  
diff --git a/0180-docs-grub-Document-signing-grub-under-UEFI.patch b/0168-docs-grub-Document-signing-grub-under-UEFI.patch
similarity index 100%
rename from 0180-docs-grub-Document-signing-grub-under-UEFI.patch
rename to 0168-docs-grub-Document-signing-grub-under-UEFI.patch
diff --git a/0181-docs-grub-Document-signing-grub-with-an-appended-sig.patch b/0169-docs-grub-Document-signing-grub-with-an-appended-sig.patch
similarity index 100%
rename from 0181-docs-grub-Document-signing-grub-with-an-appended-sig.patch
rename to 0169-docs-grub-Document-signing-grub-with-an-appended-sig.patch
diff --git a/0182-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch b/0170-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
similarity index 100%
rename from 0182-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
rename to 0170-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
diff --git a/0183-pgp-factor-out-rsa_pad.patch b/0171-pgp-factor-out-rsa_pad.patch
similarity index 100%
rename from 0183-pgp-factor-out-rsa_pad.patch
rename to 0171-pgp-factor-out-rsa_pad.patch
diff --git a/0184-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch b/0172-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
similarity index 100%
rename from 0184-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
rename to 0172-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
diff --git a/0185-posix_wrap-tweaks-in-preparation-for-libtasn1.patch b/0173-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
similarity index 100%
rename from 0185-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
rename to 0173-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
diff --git a/0186-libtasn1-import-libtasn1-4.16.0.patch b/0174-libtasn1-import-libtasn1-4.16.0.patch
similarity index 100%
rename from 0186-libtasn1-import-libtasn1-4.16.0.patch
rename to 0174-libtasn1-import-libtasn1-4.16.0.patch
diff --git a/0187-libtasn1-disable-code-not-needed-in-grub.patch b/0175-libtasn1-disable-code-not-needed-in-grub.patch
similarity index 100%
rename from 0187-libtasn1-disable-code-not-needed-in-grub.patch
rename to 0175-libtasn1-disable-code-not-needed-in-grub.patch
diff --git a/0188-libtasn1-changes-for-grub-compatibility.patch b/0176-libtasn1-changes-for-grub-compatibility.patch
similarity index 100%
rename from 0188-libtasn1-changes-for-grub-compatibility.patch
rename to 0176-libtasn1-changes-for-grub-compatibility.patch
diff --git a/0189-libtasn1-compile-into-asn1-module.patch b/0177-libtasn1-compile-into-asn1-module.patch
similarity index 100%
rename from 0189-libtasn1-compile-into-asn1-module.patch
rename to 0177-libtasn1-compile-into-asn1-module.patch
diff --git a/0190-test_asn1-test-module-for-libtasn1.patch b/0178-test_asn1-test-module-for-libtasn1.patch
similarity index 100%
rename from 0190-test_asn1-test-module-for-libtasn1.patch
rename to 0178-test_asn1-test-module-for-libtasn1.patch
diff --git a/0191-grub-install-support-embedding-x509-certificates.patch b/0179-grub-install-support-embedding-x509-certificates.patch
similarity index 98%
rename from 0191-grub-install-support-embedding-x509-certificates.patch
rename to 0179-grub-install-support-embedding-x509-certificates.patch
index 04722ad7..bd02e6de 100644
--- a/0191-grub-install-support-embedding-x509-certificates.patch
+++ b/0179-grub-install-support-embedding-x509-certificates.patch
@@ -94,7 +94,7 @@ index aab2a941f85..422f82362c7 100644
  			       disable_shim_lock);
    while (dc--)
 diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
-index 26d1ecbf74e..c5cdda498eb 100644
+index 8a53310548b..e1f1112784a 100644
 --- a/util/grub-mkimage.c
 +++ b/util/grub-mkimage.c
 @@ -75,7 +75,8 @@ static struct argp_option options[] = {
@@ -138,8 +138,8 @@ index 26d1ecbf74e..c5cdda498eb 100644
 +			       arguments.npubkeys, arguments.x509keys,
 +			       arguments.nx509keys, arguments.config,
  			       arguments.image_target, arguments.note,
- 
- 			       arguments.comp, arguments.appsig_size,
+ 			       arguments.appsig_size, arguments.comp,
+ 			       arguments.dtb, arguments.sbat,
 diff --git a/util/mkimage.c b/util/mkimage.c
 index bab12276010..8319e8dfbde 100644
 --- a/util/mkimage.c
diff --git a/0192-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch b/0180-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
similarity index 100%
rename from 0192-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
rename to 0180-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
diff --git a/0193-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch b/0181-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
similarity index 100%
rename from 0193-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
rename to 0181-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
diff --git a/0194-appended-signatures-support-verifying-appended-signa.patch b/0182-appended-signatures-support-verifying-appended-signa.patch
similarity index 100%
rename from 0194-appended-signatures-support-verifying-appended-signa.patch
rename to 0182-appended-signatures-support-verifying-appended-signa.patch
diff --git a/0195-appended-signatures-verification-tests.patch b/0183-appended-signatures-verification-tests.patch
similarity index 100%
rename from 0195-appended-signatures-verification-tests.patch
rename to 0183-appended-signatures-verification-tests.patch
diff --git a/0196-appended-signatures-documentation.patch b/0184-appended-signatures-documentation.patch
similarity index 100%
rename from 0196-appended-signatures-documentation.patch
rename to 0184-appended-signatures-documentation.patch
diff --git a/0197-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch b/0185-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
similarity index 100%
rename from 0197-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
rename to 0185-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
diff --git a/0198-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/0186-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
similarity index 100%
rename from 0198-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
rename to 0186-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
diff --git a/0199-ieee1275-claim-more-memory.patch b/0187-ieee1275-claim-more-memory.patch
similarity index 100%
rename from 0199-ieee1275-claim-more-memory.patch
rename to 0187-ieee1275-claim-more-memory.patch
diff --git a/0200-ieee1275-request-memory-with-ibm-client-architecture.patch b/0188-ieee1275-request-memory-with-ibm-client-architecture.patch
similarity index 100%
rename from 0200-ieee1275-request-memory-with-ibm-client-architecture.patch
rename to 0188-ieee1275-request-memory-with-ibm-client-architecture.patch
diff --git a/0201-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch b/0189-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
similarity index 100%
rename from 0201-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
rename to 0189-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
diff --git a/0202-ieee1275-ofdisk-retry-on-open-failure.patch b/0190-ieee1275-ofdisk-retry-on-open-failure.patch
similarity index 100%
rename from 0202-ieee1275-ofdisk-retry-on-open-failure.patch
rename to 0190-ieee1275-ofdisk-retry-on-open-failure.patch
diff --git a/0203-01_menu_auto_hide.in-fix-a-then-than-typo.patch b/0191-01_menu_auto_hide.in-fix-a-then-than-typo.patch
similarity index 100%
rename from 0203-01_menu_auto_hide.in-fix-a-then-than-typo.patch
rename to 0191-01_menu_auto_hide.in-fix-a-then-than-typo.patch
diff --git a/0204-Fix-disabling-grub-rpm-sort.patch b/0192-Fix-disabling-grub-rpm-sort.patch
similarity index 95%
rename from 0204-Fix-disabling-grub-rpm-sort.patch
rename to 0192-Fix-disabling-grub-rpm-sort.patch
index dccde3c4..ccde7519 100644
--- a/0204-Fix-disabling-grub-rpm-sort.patch
+++ b/0192-Fix-disabling-grub-rpm-sort.patch
@@ -7,6 +7,9 @@ Currently, grub-rpm-sort is unconditionally compiled whether
 ./configure has been called with --disable-rpm-sort or not.  This adds
 the necessary logic to configure.ac and Makefile.util.def and some
 debug output to ./configure and fixes #44.
+
+Signed-off-by: Tim Landscheidt <tim@tim-landscheidt.de>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  configure.ac      | 8 ++++++++
  Makefile.util.def | 1 +
diff --git a/0205-Don-t-check-for-rpmvercmp-in-librpm.patch b/0193-Don-t-check-for-rpmvercmp-in-librpm.patch
similarity index 100%
rename from 0205-Don-t-check-for-rpmvercmp-in-librpm.patch
rename to 0193-Don-t-check-for-rpmvercmp-in-librpm.patch
diff --git a/0206-Allow-chainloading-EFI-apps-from-loop-mounts.patch b/0194-Allow-chainloading-EFI-apps-from-loop-mounts.patch
similarity index 97%
rename from 0206-Allow-chainloading-EFI-apps-from-loop-mounts.patch
rename to 0194-Allow-chainloading-EFI-apps-from-loop-mounts.patch
index e48f1021..66e61a7e 100644
--- a/0206-Allow-chainloading-EFI-apps-from-loop-mounts.patch
+++ b/0194-Allow-chainloading-EFI-apps-from-loop-mounts.patch
@@ -3,6 +3,8 @@ From: Dimitri John Ledkov <xnox@ubuntu.com>
 Date: Fri, 11 Jun 2021 13:51:20 +0200
 Subject: [PATCH] Allow chainloading EFI apps from loop mounts.
 
+Signed-off-by: Dimitri John Ledkov <Dimitri.ledkov@canonical.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/disk/loopback.c          |  9 +--------
  grub-core/loader/efi/chainloader.c | 23 +++++++++++++++++++++++
diff --git a/0207-efinet-Add-DHCP-proxy-support.patch b/0195-efinet-Add-DHCP-proxy-support.patch
similarity index 95%
rename from 0207-efinet-Add-DHCP-proxy-support.patch
rename to 0195-efinet-Add-DHCP-proxy-support.patch
index a8755a39..dcaac6fb 100644
--- a/0207-efinet-Add-DHCP-proxy-support.patch
+++ b/0195-efinet-Add-DHCP-proxy-support.patch
@@ -6,6 +6,9 @@ Subject: [PATCH] efinet: Add DHCP proxy support
 If a proxyDHCP configuration is used, the server name, server IP and boot
 file values should be taken from the DHCP proxy offer instead of the DHCP
 server ack packet. Currently that case is not handled, add support for it.
+
+Signed-off-by: Ian Page Hands <iphands@gmail.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/net/drivers/efi/efinet.c | 25 +++++++++++++++++++++++--
  1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/0208-fs-ext2-Ignore-checksum-seed-incompat-feature.patch b/0196-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
similarity index 100%
rename from 0208-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
rename to 0196-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
diff --git a/0209-Don-t-update-the-cmdline-when-generating-legacy-menu.patch b/0197-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
similarity index 97%
rename from 0209-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
rename to 0197-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
index c55b7e3c..84997a90 100644
--- a/0209-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
+++ b/0197-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
@@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 68adb55d893..c9296154f51 100644
+index fdf324b7ab1..518624f336e 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -261,7 +261,9 @@ if [ -z "\${kernelopts}" ]; then
diff --git a/0210-Suppress-gettext-error-message.patch b/0198-Suppress-gettext-error-message.patch
similarity index 96%
rename from 0210-Suppress-gettext-error-message.patch
rename to 0198-Suppress-gettext-error-message.patch
index c57e7ff4..c42dd0d5 100644
--- a/0210-Suppress-gettext-error-message.patch
+++ b/0198-Suppress-gettext-error-message.patch
@@ -14,7 +14,7 @@ Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 84d520cd494..87a912ac6e5 100644
+index 4d02e62c109..7ec81ca0b48 100644
 --- a/grub-core/gettext/gettext.c
 +++ b/grub-core/gettext/gettext.c
 @@ -424,6 +424,13 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx,
diff --git a/0211-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch b/0199-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch
similarity index 100%
rename from 0211-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch
rename to 0199-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch
diff --git a/0212-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch b/0200-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
similarity index 100%
rename from 0212-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
rename to 0200-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
diff --git a/0213-Remove-outdated-URL-for-BLS-document.patch b/0201-Remove-outdated-URL-for-BLS-document.patch
similarity index 96%
rename from 0213-Remove-outdated-URL-for-BLS-document.patch
rename to 0201-Remove-outdated-URL-for-BLS-document.patch
index d380fe88..c4d5d726 100644
--- a/0213-Remove-outdated-URL-for-BLS-document.patch
+++ b/0201-Remove-outdated-URL-for-BLS-document.patch
@@ -14,7 +14,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index c9296154f51..6ee0a2cf3d0 100644
+index 518624f336e..b95a9a8d7ca 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -96,7 +96,7 @@ cat <<EOF
diff --git a/0214-templates-Check-for-EFI-at-runtime-instead-of-config.patch b/0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch
similarity index 100%
rename from 0214-templates-Check-for-EFI-at-runtime-instead-of-config.patch
rename to 0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch
diff --git a/0215-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch b/0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
similarity index 100%
rename from 0215-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
rename to 0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
diff --git a/0216-arm64-Fix-EFI-loader-kernel-image-allocation.patch b/0204-arm64-Fix-EFI-loader-kernel-image-allocation.patch
similarity index 100%
rename from 0216-arm64-Fix-EFI-loader-kernel-image-allocation.patch
rename to 0204-arm64-Fix-EFI-loader-kernel-image-allocation.patch
diff --git a/0217-normal-main-Discover-the-device-to-read-the-config-f.patch b/0205-normal-main-Discover-the-device-to-read-the-config-f.patch
similarity index 92%
rename from 0217-normal-main-Discover-the-device-to-read-the-config-f.patch
rename to 0205-normal-main-Discover-the-device-to-read-the-config-f.patch
index cf12fd6e..80090388 100644
--- a/0217-normal-main-Discover-the-device-to-read-the-config-f.patch
+++ b/0205-normal-main-Discover-the-device-to-read-the-config-f.patch
@@ -26,10 +26,10 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 51 insertions(+), 7 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 155bf366da2..f9ccca502ee 100644
+index 4ebdbd228d4..b72fe3d653c 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -339,18 +339,13 @@ grub_enter_normal_mode (const char *config)
+@@ -337,18 +337,13 @@ grub_enter_normal_mode (const char *config)
  }
  
  static grub_err_t
@@ -49,7 +49,7 @@ index 155bf366da2..f9ccca502ee 100644
      net_search_cfg = grub_env_get ("feature_net_search_cfg");
      if (net_search_cfg && net_search_cfg[0] == 'n')
        disable_net_search = 1;
-@@ -364,7 +359,7 @@ grub_try_normal (const char *variable)
+@@ -362,7 +357,7 @@ grub_try_normal (const char *variable)
         config = grub_malloc (config_len);
  
         if (! config)
@@ -58,7 +58,7 @@ index 155bf366da2..f9ccca502ee 100644
  
         grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
         err = grub_net_search_config_file (config);
-@@ -393,6 +388,53 @@ grub_try_normal (const char *variable)
+@@ -391,6 +386,53 @@ grub_try_normal (const char *variable)
      return err;
  }
  
@@ -112,7 +112,7 @@ index 155bf366da2..f9ccca502ee 100644
  /* Enter normal mode from rescue mode.  */
  static grub_err_t
  grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
-@@ -407,6 +449,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -405,6 +447,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
        err = grub_try_normal ("fw_path");
        if (err == GRUB_ERR_FILE_NOT_FOUND)
          err = grub_try_normal ("prefix");
diff --git a/0218-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch b/0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
similarity index 98%
rename from 0218-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
rename to 0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
index 70b021d2..7ca37887 100644
--- a/0218-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
+++ b/0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
@@ -23,7 +23,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  1 file changed, 33 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 0285e95a2bb..e809a5edec1 100644
+index b573be6650d..58d35be253f 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -216,13 +216,41 @@ grub_set_prefix_and_root (void)
diff --git a/0219-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch b/0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
similarity index 97%
rename from 0219-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
rename to 0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
index 1cb21efa..ce0d889f 100644
--- a/0219-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
+++ b/0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
@@ -15,7 +15,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index e809a5edec1..2d0d2bbd4cf 100644
+index 58d35be253f..3fc34014726 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -236,9 +236,20 @@ grub_set_prefix_and_root (void)
diff --git a/0220-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch b/0208-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch
similarity index 100%
rename from 0220-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch
rename to 0208-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch
diff --git a/0221-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch b/0209-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
similarity index 100%
rename from 0221-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
rename to 0209-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
diff --git a/0210-Print-module-name-on-license-check-failure.patch b/0210-Print-module-name-on-license-check-failure.patch
new file mode 100644
index 00000000..c4b9a134
--- /dev/null
+++ b/0210-Print-module-name-on-license-check-failure.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Tue, 12 Oct 2021 12:34:23 -0400
+Subject: [PATCH] Print module name on license check failure
+
+At the very least, this will make it easier to track down the problem
+module - or, if something else has gone wrong, provide more information
+for debugging.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ grub-core/kern/dl.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index 9557254035e..f3044945742 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -528,14 +528,16 @@ grub_dl_find_section_index (Elf_Ehdr *e, const char *name)
+    Be sure to understand your license obligations.
+ */
+ static grub_err_t
+-grub_dl_check_license (Elf_Ehdr *e)
++grub_dl_check_license (grub_dl_t mod, Elf_Ehdr *e)
+ {
+   Elf_Shdr *s = grub_dl_find_section (e, ".module_license");
+   if (s && (grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv3") == 0
+ 	    || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv3+") == 0
+ 	    || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv2+") == 0))
+     return GRUB_ERR_NONE;
+-  return grub_error (GRUB_ERR_BAD_MODULE, "incompatible license");
++  return grub_error (GRUB_ERR_BAD_MODULE,
++		     "incompatible license in module %s: %s", mod->name,
++		     (char *) e + s->sh_offset);
+ }
+ 
+ static grub_err_t
+@@ -743,8 +745,8 @@ grub_dl_load_core_noinit (void *addr, grub_size_t size)
+      constitutes linking) and GRUB core being licensed under GPLv3+.
+      Be sure to understand your license obligations.
+   */
+-  if (grub_dl_check_license (e)
+-      || grub_dl_resolve_name (mod, e)
++  if (grub_dl_resolve_name (mod, e)
++      || grub_dl_check_license (mod, e)
+       || grub_dl_resolve_dependencies (mod, e)
+       || grub_dl_load_segments (mod, e)
+       || grub_dl_resolve_symbols (mod, e)
diff --git a/0211-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch b/0211-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
new file mode 100644
index 00000000..a80727e0
--- /dev/null
+++ b/0211-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
@@ -0,0 +1,106 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens <dja@axtens.net>
+Date: Fri, 22 Oct 2021 09:53:15 +1100
+Subject: [PATCH] powerpc-ieee1275: load grub at 4MB, not 2MB
+
+This was first reported under PFW but reproduces under SLOF.
+
+ - The core.elf was 2126152 = 0x207148 bytes in size with the following
+   program headers (per readelf):
+
+Entry point 0x200000
+There are 4 program headers, starting at offset 52
+
+Program Headers:
+  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
+  LOAD           0x000160 0x00200000 0x00200000 0x21f98 0x2971c RWE 0x8
+  GNU_STACK      0x0220f8 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4
+  LOAD           0x0220f8 0x00232000 0x00232000 0x1e4e50 0x1e4e50 RWE 0x4
+  NOTE           0x206f48 0x00000000 0x00000000 0x00200 0x00000 R   0x4
+
+ - SLOF places the ELF file at 0x4000 (after the reserved space for
+   interrupt handlers etc.) upwards. The image was 2126152 = 0x207148
+   bytes in size, so it runs from 0x4000 - 0x20b148. We'll call 0x4000 the
+   load address.
+
+0x0        0x4000         0x20b148
+ |----------|--------------|
+ | reserved | ELF contents |
+
+ - SLOF then copies the first LOAD program header (for .text). That runs
+   for 0x21f98 bytes. It runs from
+      (load addr + 0x160) to (load addr + 0x160 + 0x21f98)
+    = 0x4160 to 0x260f8
+   and we copy it to 0x200000 to 0x221f98. This overwrites the end of the
+   image:
+
+0x0       0x4000     0x200000        0x221f98
+ |----------|------------|---------------|
+ | reserved | ELF cont.. | .text section |
+
+ - SLOF zeros the bss up to PhysAddr + MemSize = 0x22971c
+
+0x0       0x4000      0x200000       0x221f98 0x22971c
+ |----------|------------|---------------|--------|
+ | reserved | ELF cont.. | .text section | bss 0s |
+
+ - SLOF then goes to fulfil the next LOAD header (for mods), which is
+   for 0x1e4e50 bytes. We copy from
+      (load addr + 0x220f8) to (load addr + 0x220f8 + 0x1e4e50)
+    = 0x260f8 to 0x20af48
+   and we copy it to 0x232000 to 0x416e50:
+
+0x0       0x4000      0x200000       0x221f98 0x22971c
+ |----------|------------|---------------|--------|
+ | reserved | ELF cont.. | .text section | bss 0s |
+               |-------------|
+               | copied area |
+            0x260f8      0x20af48
+
+   This goes poorly:
+
+0x0       0x4000      0x200000       0x221f98 0x22971c 0x232000 0x40bf08      0x416e50
+ |----------|------------|---------------|--------|-----|-----------|-------------|
+ | reserved | ELF cont.. | .text section | bss 0s | pad | some mods | .text start |
+
+This matches the observations on the running system - 0x40bf08 was where
+the contents of memory no longer matched the contents of the ELF file.
+
+This was reported as a license verification failure on SLOF as the
+last module's .module_license section fell past where the corruption
+began.
+
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+[rharwood@redhat.com: trim very detailed commit message]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ grub-core/Makefile.core.def | 2 +-
+ include/grub/offsets.h      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 3f3459b2c70..6b00eb55575 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -89,7 +89,7 @@ kernel = {
+   i386_xen_pvh_ldflags     = '$(TARGET_IMG_BASE_LDOPT),0x100000';
+ 
+   mips_loongson_ldflags    = '-Wl,-Ttext,0x80200000';
+-  powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x200000';
++  powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x400000';
+   sparc64_ieee1275_ldflags = '-Wl,-Ttext,0x4400';
+   mips_arc_ldflags    = '-Wl,-Ttext,$(TARGET_LINK_ADDR)';
+   mips_qemu_mips_ldflags    = '-Wl,-Ttext,0x80200000';
+diff --git a/include/grub/offsets.h b/include/grub/offsets.h
+index 871e1cd4c38..69211aa798b 100644
+--- a/include/grub/offsets.h
++++ b/include/grub/offsets.h
+@@ -63,7 +63,7 @@
+ #define GRUB_KERNEL_SPARC64_IEEE1275_LINK_ADDR 0x4400
+ 
+ #define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ALIGN 4
+-#define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ADDR 0x200000
++#define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ADDR 0x400000
+ 
+ #define GRUB_KERNEL_MIPS_LOONGSON_LINK_ADDR         0x80200000
+ 
diff --git a/grub.patches b/grub.patches
index f474e1fc..4a349cd5 100644
--- a/grub.patches
+++ b/grub.patches
@@ -20,202 +20,192 @@ Patch0019: 0019-Add-fw_path-variable-revised.patch
 Patch0020: 0020-Pass-x-hex-hex-straight-through-unmolested.patch
 Patch0021: 0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
 Patch0022: 0022-Add-devicetree-loading.patch
-Patch0023: 0023-Don-t-write-messages-to-the-screen.patch
-Patch0024: 0024-Don-t-print-GNU-GRUB-header.patch
-Patch0025: 0025-Don-t-add-to-highlighted-row.patch
-Patch0026: 0026-Message-string-cleanups.patch
-Patch0027: 0027-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
-Patch0028: 0028-Use-the-correct-indentation-for-the-term-help-text.patch
-Patch0029: 0029-Indent-menu-entries.patch
-Patch0030: 0030-Fix-margins.patch
-Patch0031: 0031-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
-Patch0032: 0032-Enable-pager-by-default.-985860.patch
-Patch0033: 0033-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
-Patch0034: 0034-Don-t-say-GNU-Linux-in-generated-menus.patch
-Patch0035: 0035-Don-t-draw-a-border-around-the-menu.patch
-Patch0036: 0036-Use-the-standard-margin-for-the-timeout-string.patch
-Patch0037: 0037-Add-.eh_frame-to-list-of-relocations-stripped.patch
-Patch0038: 0038-Don-t-require-a-password-to-boot-entries-generated-b.patch
-Patch0039: 0039-Don-t-emit-Booting-.-message.patch
-Patch0040: 0040-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
-Patch0041: 0041-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
-Patch0042: 0042-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
-Patch0043: 0043-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
-Patch0044: 0044-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
-Patch0045: 0045-Try-prefix-if-fw_path-doesn-t-work.patch
-Patch0046: 0046-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
-Patch0047: 0047-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
-Patch0048: 0048-Add-friendly-grub2-password-config-tool-985962.patch
-Patch0049: 0049-tcp-add-window-scaling-support.patch
-Patch0050: 0050-efinet-and-bootp-add-support-for-dhcpv6.patch
-Patch0051: 0051-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
-Patch0052: 0052-bz1374141-fix-incorrect-mask-for-ppc64.patch
-Patch0053: 0053-Make-grub_fatal-also-backtrace.patch
-Patch0054: 0054-Fix-up-some-man-pages-rpmdiff-noticed.patch
-Patch0055: 0055-Make-our-info-pages-say-grub2-where-appropriate.patch
-Patch0056: 0056-macos-just-build-chainloader-entries-don-t-try-any-x.patch
-Patch0057: 0057-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
-Patch0058: 0058-export-btrfs_subvol-and-btrfs_subvolid.patch
-Patch0059: 0059-grub2-btrfs-03-follow_default.patch
-Patch0060: 0060-grub2-btrfs-04-grub2-install.patch
-Patch0061: 0061-grub2-btrfs-05-grub2-mkconfig.patch
-Patch0062: 0062-grub2-btrfs-06-subvol-mount.patch
-Patch0063: 0063-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
-Patch0064: 0064-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
-Patch0065: 0065-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
-Patch0066: 0066-Use-grub_efi_.-memory-helpers-where-reasonable.patch
-Patch0067: 0067-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
-Patch0068: 0068-don-t-use-int-for-efi-status.patch
-Patch0069: 0069-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
-Patch0070: 0070-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
-Patch0071: 0071-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
-Patch0072: 0072-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
-Patch0073: 0073-align-struct-efi_variable-better.patch
-Patch0074: 0074-Add-BLS-support-to-grub-mkconfig.patch
-Patch0075: 0075-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
-Patch0076: 0076-Add-linux-and-initrd-commands-for-grub-emu.patch
-Patch0077: 0077-Add-grub2-switch-to-blscfg.patch
-Patch0078: 0078-make-better-backtraces.patch
-Patch0079: 0079-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
-Patch0080: 0080-Work-around-some-minor-include-path-weirdnesses.patch
-Patch0081: 0081-Make-it-possible-to-enabled-build-id-sha1.patch
-Patch0082: 0082-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
-Patch0083: 0083-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
-Patch0084: 0084-Fixup-for-newer-compiler.patch
-Patch0085: 0085-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
-Patch0086: 0086-Fixup-for-newer-compiler.patch
-Patch0087: 0087-Add-support-for-non-Ethernet-network-cards.patch
-Patch0088: 0088-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
-Patch0089: 0089-bootp-New-net_bootp6-command.patch
-Patch0090: 0090-efinet-UEFI-IPv6-PXE-support.patch
-Patch0091: 0091-grub.texi-Add-net_bootp6-doument.patch
-Patch0092: 0092-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
-Patch0093: 0093-efinet-Setting-network-from-UEFI-device-path.patch
-Patch0094: 0094-efinet-Setting-DNS-server-from-UEFI-protocol.patch
-Patch0095: 0095-Support-UEFI-networking-protocols.patch
-Patch0096: 0096-AUDIT-0-http-boot-tracker-bug.patch
-Patch0097: 0097-grub-editenv-Add-incr-command-to-increment-integer-v.patch
-Patch0098: 0098-Add-auto-hide-menu-support.patch
-Patch0099: 0099-Add-grub-set-bootflag-utility.patch
-Patch0100: 0100-docs-Add-grub-boot-indeterminate.service-example.patch
-Patch0101: 0101-gentpl-add-disable-support.patch
-Patch0102: 0102-gentpl-add-pc-firmware-type.patch
-Patch0103: 0103-efinet-also-use-the-firmware-acceleration-for-http.patch
-Patch0104: 0104-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
-Patch0105: 0105-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
-Patch0106: 0106-module-verifier-make-it-possible-to-run-checkers-on-.patch
-Patch0107: 0107-Rework-how-the-fdt-command-builds.patch
-Patch0108: 0108-Disable-non-wordsize-allocations-on-arm.patch
-Patch0109: 0109-Prepend-prefix-when-HTTP-path-is-relative.patch
-Patch0110: 0110-Make-grub_error-more-verbose.patch
-Patch0111: 0111-Make-reset-an-alias-for-the-reboot-command.patch
-Patch0112: 0112-Add-a-version-command.patch
-Patch0113: 0113-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
-Patch0114: 0114-arm-arm64-loader-Better-memory-allocation-and-error-.patch
-Patch0115: 0115-Try-to-pick-better-locations-for-kernel-and-initrd.patch
-Patch0116: 0116-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
-Patch0117: 0117-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
-Patch0118: 0118-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
-Patch0119: 0119-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
-Patch0120: 0120-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
-Patch0121: 0121-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
-Patch0122: 0122-Fix-getroot.c-s-trampolines.patch
-Patch0123: 0123-Do-not-allow-stack-trampolines-anywhere.patch
-Patch0124: 0124-Reimplement-boot_counter.patch
-Patch0125: 0125-Fix-menu-entry-selection-based-on-ID-and-title.patch
-Patch0126: 0126-Make-the-menu-entry-users-option-argument-to-be-opti.patch
-Patch0127: 0127-Add-efi-export-env-and-efi-load-env-commands.patch
-Patch0128: 0128-Make-it-possible-to-subtract-conditions-from-debug.patch
-Patch0129: 0129-Export-all-variables-from-the-initial-context-when-c.patch
-Patch0130: 0130-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
-Patch0131: 0131-Fix-systemctl-kexec-exit-status-check.patch
-Patch0132: 0132-Print-grub-emu-linux-loader-messages-as-debug.patch
-Patch0133: 0133-Don-t-assume-that-boot-commands-will-only-return-on-.patch
-Patch0134: 0134-Fix-undefined-references-for-fdt-when-building-with-.patch
-Patch0135: 0135-Do-better-in-bootstrap.conf.patch
-Patch0136: 0136-Use-git-to-apply-gnulib-patches.patch
-Patch0137: 0137-Fix-build-error-with-the-fdt-module-on-risc-v.patch
-Patch0138: 0138-grub-set-bootflag-Update-comment-about-running-as-ro.patch
-Patch0139: 0139-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
-Patch0140: 0140-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
-Patch0141: 0141-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch
-Patch0142: 0142-chainloader-Define-machine-types-for-RISC-V.patch
-Patch0143: 0143-Add-start-symbol-for-RISC-V.patch
-Patch0144: 0144-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
-Patch0145: 0145-efi-http-Export-fw-http-_path-variables-to-make-them.patch
-Patch0146: 0146-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
-Patch0147: 0147-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
-Patch0148: 0148-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
-Patch0149: 0149-efi-net-Print-a-debug-message-if-parsing-the-address.patch
-Patch0150: 0150-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
-Patch0151: 0151-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
-Patch0152: 0152-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
-Patch0153: 0153-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
-Patch0154: 0154-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
-Patch0155: 0155-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
-Patch0156: 0156-efi-dhcp-fix-some-allocation-error-checking.patch
-Patch0157: 0157-efi-http-fix-some-allocation-error-checking.patch
-Patch0158: 0158-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
-Patch0159: 0159-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
-Patch0160: 0160-linuxefi-fail-kernel-validation-without-shim-protoco.patch
-Patch0161: 0161-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
-Patch0162: 0162-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
-Patch0163: 0163-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
-Patch0164: 0164-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
-Patch0165: 0165-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
-Patch0166: 0166-Add-systemd-integration-scripts-to-make-systemctl-re.patch
-Patch0167: 0167-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
-Patch0168: 0168-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
-Patch0169: 0169-grub-install-disable-support-for-EFI-platforms.patch
-Patch0170: 0170-New-with-debug-timestamps-configure-flag-to-prepend-.patch
-Patch0171: 0171-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
-Patch0172: 0172-Introduce-function-grub_debug_is_enabled-void-return.patch
-Patch0173: 0173-Don-t-clear-screen-when-debugging-is-enabled.patch
-Patch0174: 0174-grub_file_-instrumentation-new-file-debug-tag.patch
-Patch0175: 0175-ieee1275-Avoiding-many-unecessary-open-close.patch
-Patch0176: 0176-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
-Patch0177: 0177-ieee1275-powerpc-enables-device-mapper-discovery.patch
-Patch0178: 0178-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
-Patch0179: 0179-Add-suport-for-signing-grub-with-an-appended-signatu.patch
-Patch0180: 0180-docs-grub-Document-signing-grub-under-UEFI.patch
-Patch0181: 0181-docs-grub-Document-signing-grub-with-an-appended-sig.patch
-Patch0182: 0182-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
-Patch0183: 0183-pgp-factor-out-rsa_pad.patch
-Patch0184: 0184-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
-Patch0185: 0185-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
-Patch0186: 0186-libtasn1-import-libtasn1-4.16.0.patch
-Patch0187: 0187-libtasn1-disable-code-not-needed-in-grub.patch
-Patch0188: 0188-libtasn1-changes-for-grub-compatibility.patch
-Patch0189: 0189-libtasn1-compile-into-asn1-module.patch
-Patch0190: 0190-test_asn1-test-module-for-libtasn1.patch
-Patch0191: 0191-grub-install-support-embedding-x509-certificates.patch
-Patch0192: 0192-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
-Patch0193: 0193-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
-Patch0194: 0194-appended-signatures-support-verifying-appended-signa.patch
-Patch0195: 0195-appended-signatures-verification-tests.patch
-Patch0196: 0196-appended-signatures-documentation.patch
-Patch0197: 0197-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
-Patch0198: 0198-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
-Patch0199: 0199-ieee1275-claim-more-memory.patch
-Patch0200: 0200-ieee1275-request-memory-with-ibm-client-architecture.patch
-Patch0201: 0201-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
-Patch0202: 0202-ieee1275-ofdisk-retry-on-open-failure.patch
-Patch0203: 0203-01_menu_auto_hide.in-fix-a-then-than-typo.patch
-Patch0204: 0204-Fix-disabling-grub-rpm-sort.patch
-Patch0205: 0205-Don-t-check-for-rpmvercmp-in-librpm.patch
-Patch0206: 0206-Allow-chainloading-EFI-apps-from-loop-mounts.patch
-Patch0207: 0207-efinet-Add-DHCP-proxy-support.patch
-Patch0208: 0208-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
-Patch0209: 0209-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
-Patch0210: 0210-Suppress-gettext-error-message.patch
-Patch0211: 0211-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch
-Patch0212: 0212-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
-Patch0213: 0213-Remove-outdated-URL-for-BLS-document.patch
-Patch0214: 0214-templates-Check-for-EFI-at-runtime-instead-of-config.patch
-Patch0215: 0215-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
-Patch0216: 0216-arm64-Fix-EFI-loader-kernel-image-allocation.patch
-Patch0217: 0217-normal-main-Discover-the-device-to-read-the-config-f.patch
-Patch0218: 0218-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
-Patch0219: 0219-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
-Patch0220: 0220-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch
-Patch0221: 0221-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
+Patch0023: 0023-Enable-pager-by-default.-985860.patch
+Patch0024: 0024-Don-t-say-GNU-Linux-in-generated-menus.patch
+Patch0025: 0025-Add-.eh_frame-to-list-of-relocations-stripped.patch
+Patch0026: 0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
+Patch0027: 0027-Don-t-emit-Booting-.-message.patch
+Patch0028: 0028-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
+Patch0029: 0029-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+Patch0030: 0030-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+Patch0031: 0031-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+Patch0032: 0032-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+Patch0033: 0033-Try-prefix-if-fw_path-doesn-t-work.patch
+Patch0034: 0034-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
+Patch0035: 0035-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+Patch0036: 0036-Add-friendly-grub2-password-config-tool-985962.patch
+Patch0037: 0037-tcp-add-window-scaling-support.patch
+Patch0038: 0038-efinet-and-bootp-add-support-for-dhcpv6.patch
+Patch0039: 0039-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+Patch0040: 0040-bz1374141-fix-incorrect-mask-for-ppc64.patch
+Patch0041: 0041-Make-grub_fatal-also-backtrace.patch
+Patch0042: 0042-Fix-up-some-man-pages-rpmdiff-noticed.patch
+Patch0043: 0043-Make-our-info-pages-say-grub2-where-appropriate.patch
+Patch0044: 0044-macos-just-build-chainloader-entries-don-t-try-any-x.patch
+Patch0045: 0045-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
+Patch0046: 0046-export-btrfs_subvol-and-btrfs_subvolid.patch
+Patch0047: 0047-grub2-btrfs-03-follow_default.patch
+Patch0048: 0048-grub2-btrfs-04-grub2-install.patch
+Patch0049: 0049-grub2-btrfs-05-grub2-mkconfig.patch
+Patch0050: 0050-grub2-btrfs-06-subvol-mount.patch
+Patch0051: 0051-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
+Patch0052: 0052-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+Patch0053: 0053-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
+Patch0054: 0054-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+Patch0055: 0055-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+Patch0056: 0056-don-t-use-int-for-efi-status.patch
+Patch0057: 0057-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
+Patch0058: 0058-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
+Patch0059: 0059-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
+Patch0060: 0060-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
+Patch0061: 0061-align-struct-efi_variable-better.patch
+Patch0062: 0062-Add-BLS-support-to-grub-mkconfig.patch
+Patch0063: 0063-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
+Patch0064: 0064-Add-linux-and-initrd-commands-for-grub-emu.patch
+Patch0065: 0065-Add-grub2-switch-to-blscfg.patch
+Patch0066: 0066-make-better-backtraces.patch
+Patch0067: 0067-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
+Patch0068: 0068-Work-around-some-minor-include-path-weirdnesses.patch
+Patch0069: 0069-Make-it-possible-to-enabled-build-id-sha1.patch
+Patch0070: 0070-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
+Patch0071: 0071-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
+Patch0072: 0072-Fixup-for-newer-compiler.patch
+Patch0073: 0073-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
+Patch0074: 0074-Fixup-for-newer-compiler.patch
+Patch0075: 0075-Add-support-for-non-Ethernet-network-cards.patch
+Patch0076: 0076-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
+Patch0077: 0077-bootp-New-net_bootp6-command.patch
+Patch0078: 0078-efinet-UEFI-IPv6-PXE-support.patch
+Patch0079: 0079-grub.texi-Add-net_bootp6-doument.patch
+Patch0080: 0080-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
+Patch0081: 0081-efinet-Setting-network-from-UEFI-device-path.patch
+Patch0082: 0082-efinet-Setting-DNS-server-from-UEFI-protocol.patch
+Patch0083: 0083-Support-UEFI-networking-protocols.patch
+Patch0084: 0084-AUDIT-0-http-boot-tracker-bug.patch
+Patch0085: 0085-grub-editenv-Add-incr-command-to-increment-integer-v.patch
+Patch0086: 0086-Add-auto-hide-menu-support.patch
+Patch0087: 0087-Add-grub-set-bootflag-utility.patch
+Patch0088: 0088-docs-Add-grub-boot-indeterminate.service-example.patch
+Patch0089: 0089-gentpl-add-disable-support.patch
+Patch0090: 0090-gentpl-add-pc-firmware-type.patch
+Patch0091: 0091-efinet-also-use-the-firmware-acceleration-for-http.patch
+Patch0092: 0092-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
+Patch0093: 0093-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
+Patch0094: 0094-module-verifier-make-it-possible-to-run-checkers-on-.patch
+Patch0095: 0095-Rework-how-the-fdt-command-builds.patch
+Patch0096: 0096-Disable-non-wordsize-allocations-on-arm.patch
+Patch0097: 0097-Prepend-prefix-when-HTTP-path-is-relative.patch
+Patch0098: 0098-Make-grub_error-more-verbose.patch
+Patch0099: 0099-Make-reset-an-alias-for-the-reboot-command.patch
+Patch0100: 0100-Add-a-version-command.patch
+Patch0101: 0101-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
+Patch0102: 0102-arm-arm64-loader-Better-memory-allocation-and-error-.patch
+Patch0103: 0103-Try-to-pick-better-locations-for-kernel-and-initrd.patch
+Patch0104: 0104-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
+Patch0105: 0105-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
+Patch0106: 0106-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
+Patch0107: 0107-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
+Patch0108: 0108-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
+Patch0109: 0109-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
+Patch0110: 0110-Fix-getroot.c-s-trampolines.patch
+Patch0111: 0111-Do-not-allow-stack-trampolines-anywhere.patch
+Patch0112: 0112-Reimplement-boot_counter.patch
+Patch0113: 0113-Fix-menu-entry-selection-based-on-ID-and-title.patch
+Patch0114: 0114-Make-the-menu-entry-users-option-argument-to-be-opti.patch
+Patch0115: 0115-Add-efi-export-env-and-efi-load-env-commands.patch
+Patch0116: 0116-Make-it-possible-to-subtract-conditions-from-debug.patch
+Patch0117: 0117-Export-all-variables-from-the-initial-context-when-c.patch
+Patch0118: 0118-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
+Patch0119: 0119-Fix-systemctl-kexec-exit-status-check.patch
+Patch0120: 0120-Print-grub-emu-linux-loader-messages-as-debug.patch
+Patch0121: 0121-Don-t-assume-that-boot-commands-will-only-return-on-.patch
+Patch0122: 0122-Fix-undefined-references-for-fdt-when-building-with-.patch
+Patch0123: 0123-Do-better-in-bootstrap.conf.patch
+Patch0124: 0124-Use-git-to-apply-gnulib-patches.patch
+Patch0125: 0125-Fix-build-error-with-the-fdt-module-on-risc-v.patch
+Patch0126: 0126-grub-set-bootflag-Update-comment-about-running-as-ro.patch
+Patch0127: 0127-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
+Patch0128: 0128-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
+Patch0129: 0129-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch
+Patch0130: 0130-chainloader-Define-machine-types-for-RISC-V.patch
+Patch0131: 0131-Add-start-symbol-for-RISC-V.patch
+Patch0132: 0132-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
+Patch0133: 0133-efi-http-Export-fw-http-_path-variables-to-make-them.patch
+Patch0134: 0134-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
+Patch0135: 0135-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
+Patch0136: 0136-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
+Patch0137: 0137-efi-net-Print-a-debug-message-if-parsing-the-address.patch
+Patch0138: 0138-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
+Patch0139: 0139-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
+Patch0140: 0140-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
+Patch0141: 0141-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
+Patch0142: 0142-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
+Patch0143: 0143-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
+Patch0144: 0144-efi-dhcp-fix-some-allocation-error-checking.patch
+Patch0145: 0145-efi-http-fix-some-allocation-error-checking.patch
+Patch0146: 0146-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
+Patch0147: 0147-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+Patch0148: 0148-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+Patch0149: 0149-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
+Patch0150: 0150-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
+Patch0151: 0151-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
+Patch0152: 0152-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
+Patch0153: 0153-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
+Patch0154: 0154-Add-systemd-integration-scripts-to-make-systemctl-re.patch
+Patch0155: 0155-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
+Patch0156: 0156-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
+Patch0157: 0157-grub-install-disable-support-for-EFI-platforms.patch
+Patch0158: 0158-New-with-debug-timestamps-configure-flag-to-prepend-.patch
+Patch0159: 0159-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
+Patch0160: 0160-Introduce-function-grub_debug_is_enabled-void-return.patch
+Patch0161: 0161-Don-t-clear-screen-when-debugging-is-enabled.patch
+Patch0162: 0162-grub_file_-instrumentation-new-file-debug-tag.patch
+Patch0163: 0163-ieee1275-Avoiding-many-unecessary-open-close.patch
+Patch0164: 0164-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
+Patch0165: 0165-ieee1275-powerpc-enables-device-mapper-discovery.patch
+Patch0166: 0166-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
+Patch0167: 0167-Add-suport-for-signing-grub-with-an-appended-signatu.patch
+Patch0168: 0168-docs-grub-Document-signing-grub-under-UEFI.patch
+Patch0169: 0169-docs-grub-Document-signing-grub-with-an-appended-sig.patch
+Patch0170: 0170-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
+Patch0171: 0171-pgp-factor-out-rsa_pad.patch
+Patch0172: 0172-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
+Patch0173: 0173-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
+Patch0174: 0174-libtasn1-import-libtasn1-4.16.0.patch
+Patch0175: 0175-libtasn1-disable-code-not-needed-in-grub.patch
+Patch0176: 0176-libtasn1-changes-for-grub-compatibility.patch
+Patch0177: 0177-libtasn1-compile-into-asn1-module.patch
+Patch0178: 0178-test_asn1-test-module-for-libtasn1.patch
+Patch0179: 0179-grub-install-support-embedding-x509-certificates.patch
+Patch0180: 0180-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
+Patch0181: 0181-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
+Patch0182: 0182-appended-signatures-support-verifying-appended-signa.patch
+Patch0183: 0183-appended-signatures-verification-tests.patch
+Patch0184: 0184-appended-signatures-documentation.patch
+Patch0185: 0185-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
+Patch0186: 0186-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
+Patch0187: 0187-ieee1275-claim-more-memory.patch
+Patch0188: 0188-ieee1275-request-memory-with-ibm-client-architecture.patch
+Patch0189: 0189-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
+Patch0190: 0190-ieee1275-ofdisk-retry-on-open-failure.patch
+Patch0191: 0191-01_menu_auto_hide.in-fix-a-then-than-typo.patch
+Patch0192: 0192-Fix-disabling-grub-rpm-sort.patch
+Patch0193: 0193-Don-t-check-for-rpmvercmp-in-librpm.patch
+Patch0194: 0194-Allow-chainloading-EFI-apps-from-loop-mounts.patch
+Patch0195: 0195-efinet-Add-DHCP-proxy-support.patch
+Patch0196: 0196-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
+Patch0197: 0197-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
+Patch0198: 0198-Suppress-gettext-error-message.patch
+Patch0199: 0199-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch
+Patch0200: 0200-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
+Patch0201: 0201-Remove-outdated-URL-for-BLS-document.patch
+Patch0202: 0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch
+Patch0203: 0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
+Patch0204: 0204-arm64-Fix-EFI-loader-kernel-image-allocation.patch
+Patch0205: 0205-normal-main-Discover-the-device-to-read-the-config-f.patch
+Patch0206: 0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
+Patch0207: 0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
+Patch0208: 0208-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch
+Patch0209: 0209-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
+Patch0210: 0210-Print-module-name-on-license-check-failure.patch
+Patch0211: 0211-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
diff --git a/grub2.spec b/grub2.spec
index 21404f3b..25b2b52f 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -14,7 +14,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -523,6 +523,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Thu Nov 04 2021 Robbie Harwood <rharwood@redhat.com> - 2.06-9
+- Drop UI patches and update provenance information
+
 * Thu Oct 07 2021 Peter Jones <pjones@redhat.com> - 2.06-8
 - Fix "grub2-mkimage --appended-signature-size" parsing.