From bbc6a8998ae4949ca7354e18585fa3e9eee1eae1 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 16 Aug 2017 11:14:30 -0400
Subject: [PATCH] Rebased to newer upstream for fedora-27

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 0001-Bump-version-to-2.03.patch               |   4 +-
 0002-Remove-bashisms-from-tests.patch         |   4 +-
 0003-fs-tester-make-sh-compatible.patch       |   4 +-
 0004-support-busybox-date.patch               |   4 +-
 ...retrieve-fstime-when-it-s-not-useful.patch |   4 +-
 0006-Support-lseek64.patch                    |   4 +-
 0007-Use-SHELL-rather-than-bin-sh.patch       |   4 +-
 0008-po-Use-SHELL-rather-than-bin-sh.patch    |   4 +-
 0009-Add-termux-path-to-dict.patch            |   4 +-
 0010-Fix-shebang-for-termux.patch             |   4 +-
 0011-Add-strtoull-test.patch                  |   4 +-
 ...x-behaviour-on-chars-between-9-and-a.patch |   4 +-
 0013-Add-Virtual-LAN-support.patch            |   4 +-
 ...out-to-mkimage_generate_elfXX-rather.patch |   4 +-
 ...r-arm-uboot-code-to-make-it-genereic.patch |   4 +-
 ...-parts-that-are-platform-independent.patch |   4 +-
 ...-Rename-uboot-halt.c-to-dummy-halt.c.patch |   4 +-
 ...ame-uboot-datetime-to-dummy-datetime.patch |   4 +-
 0019-arm-coreboot-Start-new-port.patch        |   4 +-
 ...upport-for-device-tree-based-drivers.patch |   4 +-
 ...-coreboot-Support-for-vexpress-timer.patch |   4 +-
 0022-arm-coreboot-Export-FDT-routines.patch   |   4 +-
 ...-Split-protocol-from-controller-code.patch |   4 +-
 ...reboot-Support-keyboard-for-vexpress.patch |   4 +-
 ...m_coreboot-Support-grub-mkstandalone.patch |   4 +-
 ...oreboot-Support-loading-linux-images.patch |   4 +-
 0027-arm_coreboot-Support-DMA.patch           |   4 +-
 0028-ehci-Split-core-code-from-PCI-part.patch |   4 +-
 0029-arm_coreboot-Support-EHCI.patch          |   4 +-
 ...n-FDT-nodes-with-compatible-property.patch |   4 +-
 ...ty-to-send-receive-messages-on-paren.patch |   4 +-
 0032-rk3288_spi-Add-SPI-driver.patch          |   4 +-
 ...eboot-Add-Chromebook-keyboard-driver.patch |   4 +-
 0034-Missing-parts-of-previous-commit.patch   |   4 +-
 ...-cbmemc-to-support-updated-console-f.patch |   4 +-
 ...t_keyboard-Fix-falco-chromebook-case.patch |   4 +-
 0037-sparc64-Close-cdboot-ihandle.patch       |   4 +-
 ...-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch |   4 +-
 ...p-option-support-in-xen_module-comma.patch |   4 +-
 ...inux_xen.in-Add-xen_boot-command-sup.patch |   4 +-
 ...-introduction-of-Xen-boot-commands-i.patch |   4 +-
 ...se-devspec-to-determine-the-OBP-path.patch |   4 +-
 ...unt-ext2-3-4-filesystems-that-have-t.patch |   4 +-
 0044-ehci-Fix-compilation-for-amd64.patch     |   4 +-
 ...-compilation-for-ppc-sparc-and-arm64.patch |   4 +-
 0046-ehci-Fix-compilation-on-i386.patch       |   4 +-
 0047-crypto-Fix-use-after-free.patch          |   4 +-
 0048-arm-efi-Fix-compilation.patch            |   4 +-
 0049-fdt-silence-clang-warning.patch          |   4 +-
 ...atch => 0050-Fix-a-segfault-in-lsefi.patch |  30 +-
 ...zr-s-ignore-artificats-in-.gitignore.patch | 361 -------------
 ...t-typedef-and-use-grub_size_t-instea.patch |  59 +++
 ...x-reading-label-lvd.ident-is-dstring.patch |  54 ++
 ...b-core-fs-udf.c-Add-support-for-UUID.patch | 191 +++++++
 ...orriso-presence-before-doing-anythin.patch |  50 ++
 0055-Fail-if-xorriso-failed.patch             |  44 ++
 ...efi-refactor-grub_efi_allocate_pages.patch | 120 +++++
 0057-Remove-grub_efi_allocate_pages.patch     | 252 +++++++++
 0058-efi-move-fdt-helper-library.patch        |  93 ++++
 0059-efi-Add-GRUB_PE32_MAGIC-definition.patch |  59 +++
 ...inux-loader-improve-type-portability.patch | 115 ++++
 ...allocation-type-to-GRUB_EFI_LOADER_C.patch |  36 ++
 ...RM_-definitions-when-handling-term-c.patch | 265 ++++++++++
 ...B_GZ-prefix-to-gzio-specific-defines.patch |  85 +++
 0064-info-in-builddir.patch                   |  22 +
 0065-re-write-.gitignore.patch                | 500 ++++++++++++++++++
 ...ient-architecture-CAS-reboot-support.patch |   6 +-
 ...nsole-display-attr-when-clear-screen.patch |   8 +-
 ...video-support-for-IBM-power-machines.patch |   6 +-
 ...when-generating-configuration-by-gru.patch |   6 +-
 ...0-Move-bash-completion-script-922997.patch |   6 +-
 ...patch => 0071-Update-to-minilzo-2.08.patch |   6 +-
 ...o-include-entries-by-title-not-just-.patch |   8 +-
 ....patch => 0073-Add-GRUB_DISABLE_UUID.patch |   6 +-
 ...=> 0074-Make-exit-take-a-return-code.patch |   6 +-
 ...pot-as-binary-so-git-won-t-try-to-di.patch |   6 +-
 ...es-load-an-env-block-from-a-variable.patch |   8 +-
 ...HCP-client-ID-and-UUID-options-added.patch |   6 +-
 ...-trim-arp-packets-with-abnormal-size.patch |   6 +-
 ...Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch |   6 +-
 ...UEFI-operating-systems-returned-by-o.patch |   6 +-
 ...081-Migrate-PPC-from-Yaboot-to-Grub2.patch |   6 +-
 ...=> 0082-Add-fw_path-variable-revised.patch |   6 +-
 ...tch => 0083-Add-support-for-linuxefi.patch |  20 +-
 ...xefi-and-initrdefi-where-appropriate.patch |   6 +-
 ...w-insmod-when-secure-boot-is-enabled.patch |  10 +-
 ...-hex-hex-straight-through-unmolested.patch |   6 +-
 ...087-Add-X-option-to-printf-functions.patch |   6 +-
 ...for-specific-config-file-for-netboot.patch |   6 +-
 ...g-module-to-parse-Boot-Loader-Specif.patch |   8 +-
 ...0-Don-t-write-messages-to-the-screen.patch |   6 +-
 ... => 0091-Don-t-print-GNU-GRUB-header.patch |   6 +-
 ...=> 0092-Don-t-add-to-highlighted-row.patch |   6 +-
 ...atch => 0093-Message-string-cleanups.patch |   6 +-
 ...ing-now-that-we-aren-t-displaying-it.patch |   6 +-
 ...t-indentation-for-the-term-help-text.patch |   6 +-
 ...es.patch => 0096-Indent-menu-entries.patch |   6 +-
 ...ix-margins.patch => 0097-Fix-margins.patch |   6 +-
 ...-1-for-our-right-hand-margin-so-line.patch |   6 +-
 ...-Use-linux16-when-appropriate-880840.patch |   6 +-
 ...0100-Enable-pager-by-default.-985860.patch |   6 +-
 ...-on-serial-so-don-t-tell-the-user-to.patch |   6 +-
 ...n-t-say-GNU-Linux-in-generated-menus.patch |   6 +-
 ...-Don-t-draw-a-border-around-the-menu.patch |   6 +-
 ...andard-margin-for-the-timeout-string.patch |   6 +-
 ...rame-to-list-of-relocations-stripped.patch |   6 +-
 ...rk-with-our-changes-for-linux16-and-.patch |   6 +-
 ...on-t-print-during-fdt-loading-method.patch |   6 +-
 ...spaces-when-we-re-doing-our-cmdline-.patch |   6 +-
 ...password-to-boot-entries-generated-b.patch |   6 +-
 ...=> 0110-Don-t-emit-Booting-.-message.patch |  10 +-
 ...f-man-pages-with-slightly-nicer-ones.patch |   8 +-
 ...ix-when-fallback-searching-for-grub-.patch |   6 +-
 ...-before-grub.cfg-on-tftp-config-file.patch |   6 +-
 ...ert-function-to-support-NVMe-devices.patch |   6 +-
 ...M-Mustang-device-tree-for-hardware-t.patch |   6 +-
 ...device-tree-from-the-grub-default-fi.patch |   6 +-
 ...P-protocol-for-exclusive-use-by-grub.patch |   6 +-
 ...P-protocol-for-exclusive-use-by-grub.patch |   6 +-
 ...patch => 0119-Add-grub_util_readlink.patch |   6 +-
 ...se-symlinks-including-those-across-d.patch |   6 +-
 ...CLASS-in-10_linux-from-etc-os-releas.patch |   6 +-
 ...t-ordering-for-.debug-and-rescue-ker.patch |   6 +-
 ...tch => 0123-Load-arm-with-SB-enabled.patch |  35 +-
 ...4-Try-prefix-if-fw_path-doesn-t-work.patch |   6 +-
 ...-grub.cfg-netboot-selection-order-11.patch |   6 +-
 ...-Package-Sort-for-grub2-mkconfig-112.patch |  29 +-
 ... => 0127-Handle-rssd-storage-devices.patch |   6 +-
 ...x16-initrd16-and-linuxefi-initrdefi-.patch |   6 +-
 ...fig-construct-titles-that-look-like-.patch |   6 +-
 ...ly-grub2-password-config-tool-985962.patch |  29 +-
 ...e-the-Stall-EFI-boot-service-on-GRUB.patch |   6 +-
 ...fig-construct-titles-that-look-like-.patch |   6 +-
 ...-configure.ac-and-grub-rpm-sort-play.patch |   6 +-
 ... 0134-tcp-add-window-scaling-support.patch |   6 +-
 ...net-retransmit-if-our-device-is-busy.patch |   6 +-
 ...out-actually-using-the-configured-ne.patch |   6 +-
 ...r-for-the-first-exclusive-reopen-of-.patch |   6 +-
 ...ue-when-reading-username-and-passwor.patch |  14 +-
 ...ub-password-will-not-be-read-1290803.patch |   6 +-
 ...ub-setpassword-documentation-1290799.patch |   6 +-
 ...le-issue-in-grub-setpassword-1294243.patch |   6 +-
 ...rsistent-RAM-and-unknown-possible-fu.patch |   6 +-
 ... 0143-efiemu-Fix-compilation-failure.patch |   6 +-
 ...P-protocol-for-exclusive-use-by-grub.patch |   6 +-
 ...arser.patch => 0145-Add-a-url-parser.patch |   8 +-
 ...net-and-bootp-add-support-for-dhcpv6.patch |   6 +-
 ...rnel-settings-and-use-it-in-10_linux.patch |  29 +-
 ...0148-Normalize-slashes-in-tftp-paths.patch |   6 +-
 ...h => 0149-Fix-malformed-tftp-packets.patch |   6 +-
 ...h => 0150-Fix-race-in-EFI-validation.patch |   6 +-
 ...1374141-fix-incorrect-mask-for-ppc64.patch |   6 +-
 ...art-of-chainloader-target-if-present.patch |   6 +-
 ...ecureboot-support-on-efi-chainloader.patch |  12 +-
 ...loaders-that-link-in-efi-mode-honor-.patch |  12 +-
 ... 0155-Make-grub_fatal-also-backtrace.patch |   8 +-
 ...d.patch => 0156-Rework-linux-command.patch |   6 +-
 ...patch => 0157-Rework-linux16-command.patch |   6 +-
 ...> 0158-Make-grub-editenv-build-again.patch |   6 +-
 ...ix-up-some-man-pages-rpmdiff-noticed.patch |   6 +-
 ...-work-some-intricacies-of-PE-loading.patch |  12 +-
 ...-of-efi-chainload-so-non-sb-cases-wo.patch |  12 +-
 ...-double-free-on-verification-failure.patch |   6 +-
 ...machine-type-test-in-30_os-prober.in.patch |   6 +-
 ...fix-wrong-sanity-check-in-relocate_c.patch |   6 +-
 ...truncate-overlong-relocation-section.patch |   6 +-
 ...atch => 0166-linuxefi-minor-cleanups.patch |   6 +-
 ...rch-64-on-32-boot-in-linuxefi-loader.patch |  12 +-
 ...ch => 0168-Fix-up-linux-params-usage.patch |   6 +-
 ...=> 0169-Make-exit-take-a-return-code.patch |   6 +-
 ...fdt-has-address-cells-and-size-cells.patch |  10 +-
 ...rintf-in-the-secure-boot-verify-code.patch |   6 +-
 ...fo-pages-say-grub2-where-appropriate.patch |   6 +-
 ...more-debug-info-in-our-module-loader.patch |   6 +-
 ...-chainloader-entries-don-t-try-any-x.patch |   6 +-
 ...-Add-ability-to-boot-from-subvolumes.patch |   6 +-
 ...port-btrfs_subvol-and-btrfs_subvolid.patch |   6 +-
 ...> 0177-grub2-btrfs-03-follow_default.patch |   6 +-
 ...=> 0178-grub2-btrfs-04-grub2-install.patch |   6 +-
 ...> 0179-grub2-btrfs-05-grub2-mkconfig.patch |   6 +-
 ... => 0180-grub2-btrfs-06-subvol-mount.patch |   6 +-
 ...ootable-Snapshot-submenu-in-grub.cfg.patch |   6 +-
 ...subvol-name-scheme-to-support-old-sn.patch |   6 +-
 ...-correctly-with-btrfs-snapshots-bsc-.patch |   6 +-
 ...ocate_pool-and-grub_efi_free_pool-wr.patch |  12 +-
 ...fi_.-memory-helpers-where-reasonable.patch |   6 +-
 ...6-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch |   6 +-
 ...c-sized-arrays-since-we-don-t-build-.patch |   6 +-
 ...nst.patch => 0188-don-t-ignore-const.patch |   6 +-
 ...=> 0189-don-t-use-int-for-efi-status.patch |   6 +-
 ...INIT-declare-its-function-prototypes.patch |   6 +-
 ...p-some-errors-in-the-linuxefi-loader.patch |  12 +-
 0192-editenv-handle-relative-symlinks.patch   |  53 ++
 grub.patches                                  | 271 +++++-----
 grub2.spec                                    |   5 +-
 195 files changed, 2731 insertions(+), 1074 deletions(-)
 rename 0177-Fix-a-segfault-in-lsefi.patch => 0050-Fix-a-segfault-in-lsefi.patch (53%)
 delete mode 100644 0050-Fix-bzr-s-ignore-artificats-in-.gitignore.patch
 create mode 100644 0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch
 create mode 100644 0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch
 create mode 100644 0053-grub-core-fs-udf.c-Add-support-for-UUID.patch
 create mode 100644 0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch
 create mode 100644 0055-Fail-if-xorriso-failed.patch
 create mode 100644 0056-efi-refactor-grub_efi_allocate_pages.patch
 create mode 100644 0057-Remove-grub_efi_allocate_pages.patch
 create mode 100644 0058-efi-move-fdt-helper-library.patch
 create mode 100644 0059-efi-Add-GRUB_PE32_MAGIC-definition.patch
 create mode 100644 0060-arm64-linux-loader-improve-type-portability.patch
 create mode 100644 0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch
 create mode 100644 0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch
 create mode 100644 0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch
 create mode 100644 0064-info-in-builddir.patch
 create mode 100644 0065-re-write-.gitignore.patch
 rename 0051-IBM-client-architecture-CAS-reboot-support.patch => 0066-IBM-client-architecture-CAS-reboot-support.patch (97%)
 rename 0052-for-ppc-reset-console-display-attr-when-clear-screen.patch => 0067-for-ppc-reset-console-display-attr-when-clear-screen.patch (87%)
 rename 0053-Disable-GRUB-video-support-for-IBM-power-machines.patch => 0068-Disable-GRUB-video-support-for-IBM-power-machines.patch (94%)
 rename 0054-Honor-a-symlink-when-generating-configuration-by-gru.patch => 0069-Honor-a-symlink-when-generating-configuration-by-gru.patch (85%)
 rename 0055-Move-bash-completion-script-922997.patch => 0070-Move-bash-completion-script-922997.patch (92%)
 rename 0056-Update-to-minilzo-2.08.patch => 0071-Update-to-minilzo-2.08.patch (99%)
 rename 0057-Allow-fallback-to-include-entries-by-title-not-just-.patch => 0072-Allow-fallback-to-include-entries-by-title-not-just-.patch (95%)
 rename 0058-Add-GRUB_DISABLE_UUID.patch => 0073-Add-GRUB_DISABLE_UUID.patch (97%)
 rename 0059-Make-exit-take-a-return-code.patch => 0074-Make-exit-take-a-return-code.patch (98%)
 rename 0060-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch => 0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch (75%)
 rename 0061-Make-efi-machines-load-an-env-block-from-a-variable.patch => 0076-Make-efi-machines-load-an-env-block-from-a-variable.patch (92%)
 rename 0062-DHCP-client-ID-and-UUID-options-added.patch => 0077-DHCP-client-ID-and-UUID-options-added.patch (96%)
 rename 0063-trim-arp-packets-with-abnormal-size.patch => 0078-trim-arp-packets-with-abnormal-size.patch (88%)
 rename 0064-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch => 0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch (89%)
 rename 0065-Add-support-for-UEFI-operating-systems-returned-by-o.patch => 0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch (90%)
 rename 0066-Migrate-PPC-from-Yaboot-to-Grub2.patch => 0081-Migrate-PPC-from-Yaboot-to-Grub2.patch (96%)
 rename 0067-Add-fw_path-variable-revised.patch => 0082-Add-fw_path-variable-revised.patch (94%)
 rename 0068-Add-support-for-linuxefi.patch => 0083-Add-support-for-linuxefi.patch (96%)
 rename 0069-Use-linuxefi-and-initrdefi-where-appropriate.patch => 0084-Use-linuxefi-and-initrdefi-where-appropriate.patch (91%)
 rename 0070-Don-t-allow-insmod-when-secure-boot-is-enabled.patch => 0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch (93%)
 rename 0071-Pass-x-hex-hex-straight-through-unmolested.patch => 0086-Pass-x-hex-hex-straight-through-unmolested.patch (97%)
 rename 0072-Add-X-option-to-printf-functions.patch => 0087-Add-X-option-to-printf-functions.patch (91%)
 rename 0073-Search-for-specific-config-file-for-netboot.patch => 0088-Search-for-specific-config-file-for-netboot.patch (97%)
 rename 0074-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch => 0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch (97%)
 rename 0075-Don-t-write-messages-to-the-screen.patch => 0090-Don-t-write-messages-to-the-screen.patch (97%)
 rename 0076-Don-t-print-GNU-GRUB-header.patch => 0091-Don-t-print-GNU-GRUB-header.patch (89%)
 rename 0077-Don-t-add-to-highlighted-row.patch => 0092-Don-t-add-to-highlighted-row.patch (84%)
 rename 0078-Message-string-cleanups.patch => 0093-Message-string-cleanups.patch (96%)
 rename 0079-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch => 0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch (87%)
 rename 0080-Use-the-correct-indentation-for-the-term-help-text.patch => 0095-Use-the-correct-indentation-for-the-term-help-text.patch (87%)
 rename 0081-Indent-menu-entries.patch => 0096-Indent-menu-entries.patch (85%)
 rename 0082-Fix-margins.patch => 0097-Fix-margins.patch (91%)
 rename 0083-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch => 0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch (84%)
 rename 0084-Use-linux16-when-appropriate-880840.patch => 0099-Use-linux16-when-appropriate-880840.patch (90%)
 rename 0085-Enable-pager-by-default.-985860.patch => 0100-Enable-pager-by-default.-985860.patch (82%)
 rename 0086-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch => 0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch (87%)
 rename 0087-Don-t-say-GNU-Linux-in-generated-menus.patch => 0102-Don-t-say-GNU-Linux-in-generated-menus.patch (91%)
 rename 0088-Don-t-draw-a-border-around-the-menu.patch => 0103-Don-t-draw-a-border-around-the-menu.patch (95%)
 rename 0089-Use-the-standard-margin-for-the-timeout-string.patch => 0104-Use-the-standard-margin-for-the-timeout-string.patch (91%)
 rename 0090-Add-.eh_frame-to-list-of-relocations-stripped.patch => 0105-Add-.eh_frame-to-list-of-relocations-stripped.patch (88%)
 rename 0091-Make-10_linux-work-with-our-changes-for-linux16-and-.patch => 0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch (94%)
 rename 0092-Don-t-print-during-fdt-loading-method.patch => 0107-Don-t-print-during-fdt-loading-method.patch (81%)
 rename 0093-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch => 0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch (86%)
 rename 0094-Don-t-require-a-password-to-boot-entries-generated-b.patch => 0109-Don-t-require-a-password-to-boot-entries-generated-b.patch (86%)
 rename 0095-Don-t-emit-Booting-.-message.patch => 0110-Don-t-emit-Booting-.-message.patch (87%)
 rename 0096-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch => 0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch (99%)
 rename 0097-use-fw_path-prefix-when-fallback-searching-for-grub-.patch => 0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch (91%)
 rename 0098-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch => 0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch (95%)
 rename 0099-Fix-convert-function-to-support-NVMe-devices.patch => 0114-Fix-convert-function-to-support-NVMe-devices.patch (91%)
 rename 0100-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch => 0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch (84%)
 rename 0101-Use-the-default-device-tree-from-the-grub-default-fi.patch => 0116-Use-the-default-device-tree-from-the-grub-default-fi.patch (90%)
 rename 0102-reopen-SNP-protocol-for-exclusive-use-by-grub.patch => 0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch (90%)
 rename 0103-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch => 0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch (92%)
 rename 0104-Add-grub_util_readlink.patch => 0119-Add-grub_util_readlink.patch (99%)
 rename 0105-Make-editenv-chase-symlinks-including-those-across-d.patch => 0120-Make-editenv-chase-symlinks-including-those-across-d.patch (95%)
 rename 0106-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch => 0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch (89%)
 rename 0107-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch => 0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch (88%)
 rename 0108-Load-arm-with-SB-enabled.patch => 0123-Load-arm-with-SB-enabled.patch (93%)
 rename 0109-Try-prefix-if-fw_path-doesn-t-work.patch => 0124-Try-prefix-if-fw_path-doesn-t-work.patch (97%)
 rename 0110-Update-info-with-grub.cfg-netboot-selection-order-11.patch => 0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch (93%)
 rename 0111-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch => 0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch (96%)
 rename 0112-Handle-rssd-storage-devices.patch => 0127-Handle-rssd-storage-devices.patch (88%)
 rename 0113-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch => 0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch (93%)
 rename 0114-Make-grub2-mkconfig-construct-titles-that-look-like-.patch => 0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch (94%)
 rename 0115-Add-friendly-grub2-password-config-tool-985962.patch => 0130-Add-friendly-grub2-password-config-tool-985962.patch (93%)
 rename 0116-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch => 0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch (95%)
 rename 0117-Make-grub2-mkconfig-construct-titles-that-look-like-.patch => 0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch (93%)
 rename 0118-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch => 0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch (92%)
 rename 0119-tcp-add-window-scaling-support.patch => 0134-tcp-add-window-scaling-support.patch (95%)
 rename 0120-efinet-retransmit-if-our-device-is-busy.patch => 0135-efinet-retransmit-if-our-device-is-busy.patch (92%)
 rename 0121-Be-more-aggro-about-actually-using-the-configured-ne.patch => 0136-Be-more-aggro-about-actually-using-the-configured-ne.patch (98%)
 rename 0122-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch => 0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch (94%)
 rename 0123-Fix-security-issue-when-reading-username-and-passwor.patch => 0138-Fix-security-issue-when-reading-username-and-passwor.patch (77%)
 rename 0124-Warn-if-grub-password-will-not-be-read-1290803.patch => 0139-Warn-if-grub-password-will-not-be-read-1290803.patch (88%)
 rename 0125-Clean-up-grub-setpassword-documentation-1290799.patch => 0140-Clean-up-grub-setpassword-documentation-1290799.patch (93%)
 rename 0126-Fix-locale-issue-in-grub-setpassword-1294243.patch => 0141-Fix-locale-issue-in-grub-setpassword-1294243.patch (86%)
 rename 0127-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch => 0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch (86%)
 rename 0128-efiemu-Fix-compilation-failure.patch => 0143-efiemu-Fix-compilation-failure.patch (86%)
 rename 0129-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch => 0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch (94%)
 rename 0130-Add-a-url-parser.patch => 0145-Add-a-url-parser.patch (99%)
 rename 0131-efinet-and-bootp-add-support-for-dhcpv6.patch => 0146-efinet-and-bootp-add-support-for-dhcpv6.patch (99%)
 rename 0132-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch => 0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch (95%)
 rename 0133-Normalize-slashes-in-tftp-paths.patch => 0148-Normalize-slashes-in-tftp-paths.patch (92%)
 rename 0134-Fix-malformed-tftp-packets.patch => 0149-Fix-malformed-tftp-packets.patch (90%)
 rename 0135-Fix-race-in-EFI-validation.patch => 0150-Fix-race-in-EFI-validation.patch (95%)
 rename 0136-bz1374141-fix-incorrect-mask-for-ppc64.patch => 0151-bz1374141-fix-incorrect-mask-for-ppc64.patch (94%)
 rename 0137-Use-device-part-of-chainloader-target-if-present.patch => 0152-Use-device-part-of-chainloader-target-if-present.patch (88%)
 rename 0138-Add-secureboot-support-on-efi-chainloader.patch => 0153-Add-secureboot-support-on-efi-chainloader.patch (98%)
 rename 0139-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch => 0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch (98%)
 rename 0140-Make-grub_fatal-also-backtrace.patch => 0155-Make-grub_fatal-also-backtrace.patch (96%)
 rename 0141-Rework-linux-command.patch => 0156-Rework-linux-command.patch (96%)
 rename 0142-Rework-linux16-command.patch => 0157-Rework-linux16-command.patch (96%)
 rename 0143-Make-grub-editenv-build-again.patch => 0158-Make-grub-editenv-build-again.patch (87%)
 rename 0144-Fix-up-some-man-pages-rpmdiff-noticed.patch => 0159-Fix-up-some-man-pages-rpmdiff-noticed.patch (96%)
 rename 0145-Re-work-some-intricacies-of-PE-loading.patch => 0160-Re-work-some-intricacies-of-PE-loading.patch (97%)
 rename 0146-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch => 0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch (97%)
 rename 0147-linuxefi-fix-double-free-on-verification-failure.patch => 0162-linuxefi-fix-double-free-on-verification-failure.patch (82%)
 rename 0148-fix-machine-type-test-in-30_os-prober.in.patch => 0163-fix-machine-type-test-in-30_os-prober.in.patch (80%)
 rename 0149-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch => 0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch (90%)
 rename 0150-efi-chainloader-truncate-overlong-relocation-section.patch => 0165-efi-chainloader-truncate-overlong-relocation-section.patch (96%)
 rename 0151-linuxefi-minor-cleanups.patch => 0166-linuxefi-minor-cleanups.patch (96%)
 rename 0152-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch => 0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch (97%)
 rename 0153-Fix-up-linux-params-usage.patch => 0168-Fix-up-linux-params-usage.patch (91%)
 rename 0154-Make-exit-take-a-return-code.patch => 0169-Make-exit-take-a-return-code.patch (90%)
 rename 0155-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch => 0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch (84%)
 rename 0156-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch => 0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch (90%)
 rename 0157-Make-our-info-pages-say-grub2-where-appropriate.patch => 0172-Make-our-info-pages-say-grub2-where-appropriate.patch (99%)
 rename 0158-print-more-debug-info-in-our-module-loader.patch => 0173-print-more-debug-info-in-our-module-loader.patch (89%)
 rename 0159-macos-just-build-chainloader-entries-don-t-try-any-x.patch => 0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch (97%)
 rename 0160-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch => 0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch (99%)
 rename 0161-export-btrfs_subvol-and-btrfs_subvolid.patch => 0176-export-btrfs_subvol-and-btrfs_subvolid.patch (85%)
 rename 0162-grub2-btrfs-03-follow_default.patch => 0177-grub2-btrfs-03-follow_default.patch (97%)
 rename 0163-grub2-btrfs-04-grub2-install.patch => 0178-grub2-btrfs-04-grub2-install.patch (97%)
 rename 0164-grub2-btrfs-05-grub2-mkconfig.patch => 0179-grub2-btrfs-05-grub2-mkconfig.patch (96%)
 rename 0165-grub2-btrfs-06-subvol-mount.patch => 0180-grub2-btrfs-06-subvol-mount.patch (99%)
 rename 0166-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch => 0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch (86%)
 rename 0167-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch => 0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch (92%)
 rename 0168-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch => 0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch (98%)
 rename 0169-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch => 0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch (88%)
 rename 0170-Use-grub_efi_.-memory-helpers-where-reasonable.patch => 0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch (96%)
 rename 0171-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch => 0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch (92%)
 rename 0172-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch => 0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch (90%)
 rename 0173-don-t-ignore-const.patch => 0188-don-t-ignore-const.patch (82%)
 rename 0174-don-t-use-int-for-efi-status.patch => 0189-don-t-use-int-for-efi-status.patch (82%)
 rename 0175-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch => 0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch (86%)
 rename 0176-Clean-up-some-errors-in-the-linuxefi-loader.patch => 0191-Clean-up-some-errors-in-the-linuxefi-loader.patch (89%)
 create mode 100644 0192-editenv-handle-relative-symlinks.patch

diff --git a/0001-Bump-version-to-2.03.patch b/0001-Bump-version-to-2.03.patch
index 9e39a78..655a81f 100644
--- a/0001-Bump-version-to-2.03.patch
+++ b/0001-Bump-version-to-2.03.patch
@@ -1,7 +1,7 @@
 From b0bad6fd9449d3333fe1ab58953c0e6c1ce12c0d Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 3 May 2017 11:55:52 +0200
-Subject: [PATCH 001/177] Bump version to 2.03
+Subject: [PATCH 001/192] Bump version to 2.03
 
 ---
  configure.ac                |   2 +-
@@ -226,5 +226,5 @@ index 68d8ce7c7..921e57ff4 100644
    { "videotest", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0x7033079c, 0x7033079c, 0x7033079c, 0x7033079c, 0x7033079c, }, 5 },
    { "videotest", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xff583fbf, 0xff583fbf, 0xff583fbf, 0xff583fbf, 0xff583fbf, }, 5 },
 -- 
-2.13.3
+2.13.4
 
diff --git a/0002-Remove-bashisms-from-tests.patch b/0002-Remove-bashisms-from-tests.patch
index 70dc1ae..f276dfc 100644
--- a/0002-Remove-bashisms-from-tests.patch
+++ b/0002-Remove-bashisms-from-tests.patch
@@ -1,7 +1,7 @@
 From 5a0c548ba388b343b0bb6d2a38888e7eac5bbb96 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 23 Jan 2017 03:47:13 +0300
-Subject: [PATCH 002/177] Remove bashisms from tests.
+Subject: [PATCH 002/192] Remove bashisms from tests.
 
 Those tests don't actually need bash. Just use common shebang.
 ---
@@ -129,5 +129,5 @@ index d5ef7f9ea..80ebdc59f 100644
  # create a randome file
  file="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
 -- 
-2.13.3
+2.13.4
 
diff --git a/0003-fs-tester-make-sh-compatible.patch b/0003-fs-tester-make-sh-compatible.patch
index 33480a8..a786c2c 100644
--- a/0003-fs-tester-make-sh-compatible.patch
+++ b/0003-fs-tester-make-sh-compatible.patch
@@ -1,7 +1,7 @@
 From 37865c2c4ad26cd5e947b08abf1fde8145699919 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 23 Jan 2017 14:35:59 +0300
-Subject: [PATCH 003/177] fs-tester: make sh-compatible
+Subject: [PATCH 003/192] fs-tester: make sh-compatible
 
 ---
  tests/util/grub-fs-tester.in | 306 ++++++++++++++++++++++++-------------------
@@ -742,5 +742,5 @@ index 2337771a1..4515d165e 100644
  	    if [ x"$fs" = x"zfs" ]; then
  		rmdir "$MNTPOINTRW"/"grub fs"  || true
 -- 
-2.13.3
+2.13.4
 
diff --git a/0004-support-busybox-date.patch b/0004-support-busybox-date.patch
index 7ed1714..cf91c6f 100644
--- a/0004-support-busybox-date.patch
+++ b/0004-support-busybox-date.patch
@@ -1,7 +1,7 @@
 From b43b8cacc813c2c15347de1e35cc88d9aa912d22 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 23 Jan 2017 14:31:36 +0300
-Subject: [PATCH 004/177] support busybox date.
+Subject: [PATCH 004/192] support busybox date.
 
 Busybox date doesn't understand weekdays in -d input,
 so strip them beforehand.
@@ -39,5 +39,5 @@ index 05b8f6b73..ac51d4209 100644
  # Ignore QEMU bug
  if [ "${grub_modinfo_target_cpu}" = arm ] && [ $((dt2 - dt1)) -ge 15 ] && [ $((dt2 - dt1)) -le 17 ]; then
 -- 
-2.13.3
+2.13.4
 
diff --git a/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch b/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch
index c49fb1f..205d26b 100644
--- a/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch
+++ b/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch
@@ -1,7 +1,7 @@
 From 6dec3a26b37e128ded5d912e08abc5cee1592499 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 23 Jan 2017 21:24:05 +0300
-Subject: [PATCH 005/177] Don't retrieve fstime when it's not useful.
+Subject: [PATCH 005/192] Don't retrieve fstime when it's not useful.
 
 ---
  tests/util/grub-fs-tester.in | 48 ++++++++++++++++++++++----------------------
@@ -68,5 +68,5 @@ index 4515d165e..bf47305f3 100644
  
  	    if [ x$NOHARDLINK != xy ]; then
 -- 
-2.13.3
+2.13.4
 
diff --git a/0006-Support-lseek64.patch b/0006-Support-lseek64.patch
index e1ef13d..a7b44a8 100644
--- a/0006-Support-lseek64.patch
+++ b/0006-Support-lseek64.patch
@@ -1,7 +1,7 @@
 From 608bec51128008afb81c9e3f297283e9f830a146 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 23 Jan 2017 20:21:05 +0300
-Subject: [PATCH 006/177] Support lseek64.
+Subject: [PATCH 006/192] Support lseek64.
 
 Android doesn't have 64-bit off_t, so use off64_t instead.
 ---
@@ -50,5 +50,5 @@ index 2a8c5882e..5450cf416 100644
  }
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0007-Use-SHELL-rather-than-bin-sh.patch b/0007-Use-SHELL-rather-than-bin-sh.patch
index 1635ab5..a938f4f 100644
--- a/0007-Use-SHELL-rather-than-bin-sh.patch
+++ b/0007-Use-SHELL-rather-than-bin-sh.patch
@@ -1,7 +1,7 @@
 From c2ea443446b7feea868e54f94a87781f69820375 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 23 Jan 2017 00:55:30 +0300
-Subject: [PATCH 007/177] Use $(SHELL) rather than /bin/sh.
+Subject: [PATCH 007/192] Use $(SHELL) rather than /bin/sh.
 
 /bin/sh doesn't exist under termux.
 ---
@@ -22,5 +22,5 @@ index 04e9395fd..809a8aa26 100644
  CLEANFILES += symlist.c
  BUILT_SOURCES += symlist.c
 -- 
-2.13.3
+2.13.4
 
diff --git a/0008-po-Use-SHELL-rather-than-bin-sh.patch b/0008-po-Use-SHELL-rather-than-bin-sh.patch
index 6edad5b..f50343a 100644
--- a/0008-po-Use-SHELL-rather-than-bin-sh.patch
+++ b/0008-po-Use-SHELL-rather-than-bin-sh.patch
@@ -1,7 +1,7 @@
 From 4341f82af0b61d3dfbe675670d4105dc759c0df3 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 23 Jan 2017 14:54:03 +0300
-Subject: [PATCH 008/177] po: Use @SHELL@ rather than /bin/sh.
+Subject: [PATCH 008/192] po: Use @SHELL@ rather than /bin/sh.
 
 /bin/sh might not exist.
 ---
@@ -22,5 +22,5 @@ index 3619458e8..e68e9da84 100644
  
  srcdir = @srcdir@
 -- 
-2.13.3
+2.13.4
 
diff --git a/0009-Add-termux-path-to-dict.patch b/0009-Add-termux-path-to-dict.patch
index 7b8c0db..2c5db0d 100644
--- a/0009-Add-termux-path-to-dict.patch
+++ b/0009-Add-termux-path-to-dict.patch
@@ -1,7 +1,7 @@
 From 1073ddb12078f3c8edbdb74bb8f5afc674983f40 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 23 Jan 2017 14:52:48 +0300
-Subject: [PATCH 009/177] Add termux path to dict.
+Subject: [PATCH 009/192] Add termux path to dict.
 
 ---
  tests/util/grub-fs-tester.in | 2 +-
@@ -21,5 +21,5 @@ index bf47305f3..468d9e785 100644
  		    CFILESRC="$cand"
  		    break
 -- 
-2.13.3
+2.13.4
 
diff --git a/0010-Fix-shebang-for-termux.patch b/0010-Fix-shebang-for-termux.patch
index 175dd09..c6838c1 100644
--- a/0010-Fix-shebang-for-termux.patch
+++ b/0010-Fix-shebang-for-termux.patch
@@ -1,7 +1,7 @@
 From a827807a1330d5ad619faa103bc7f12d89fc8bee Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sun, 22 Jan 2017 20:22:34 +0300
-Subject: [PATCH 010/177] Fix shebang for termux.
+Subject: [PATCH 010/192] Fix shebang for termux.
 
 Termux doesn't have a /bin/sh. So we needto use $SHELL.
 Keep /bin/sh as much as possible.
@@ -680,5 +680,5 @@ index 047120e47..eee62c10d 100644
  set -e
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0011-Add-strtoull-test.patch b/0011-Add-strtoull-test.patch
index 6757bde..8665d58 100644
--- a/0011-Add-strtoull-test.patch
+++ b/0011-Add-strtoull-test.patch
@@ -1,7 +1,7 @@
 From ede6c9689395499f98a4c14d76b97151b4de5f54 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 3 May 2017 12:58:15 +0200
-Subject: [PATCH 011/177] Add strtoull test.
+Subject: [PATCH 011/192] Add strtoull test.
 
 ---
  grub-core/Makefile.core.def | 5 +++++
@@ -24,5 +24,5 @@ index 2dfa22a92..8dcd0e5a9 100644
    common = tests/setjmp_test.c;
  };
 -- 
-2.13.3
+2.13.4
 
diff --git a/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch b/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch
index d596bc2..ba8a675 100644
--- a/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch
+++ b/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch
@@ -1,7 +1,7 @@
 From dc6e1b5af83eb1c4290baf97c2d221c0865127be Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 10 Aug 2016 17:49:42 +0200
-Subject: [PATCH 012/177] strtoull: Fix behaviour on chars between '9' and 'a'.
+Subject: [PATCH 012/192] strtoull: Fix behaviour on chars between '9' and 'a'.
 
 Reported by: Aaron Miller <aaronmiller@fb.com>
 ---
@@ -64,5 +64,5 @@ index d4822a124..96781fb39 100644
        ok = ok && !grub_test_run (test);
        grub_errno = 0;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0013-Add-Virtual-LAN-support.patch b/0013-Add-Virtual-LAN-support.patch
index 8b01298..3ac50df 100644
--- a/0013-Add-Virtual-LAN-support.patch
+++ b/0013-Add-Virtual-LAN-support.patch
@@ -1,7 +1,7 @@
 From d9f7de0ae3c0c09cff7257c55418450261f3e082 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Mon, 23 Dec 2013 12:32:02 -0200
-Subject: [PATCH 013/177] Add Virtual LAN support.
+Subject: [PATCH 013/192] Add Virtual LAN support.
 
 This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows
 multiple VLANs in a bridged network to share the same physical network link
@@ -345,5 +345,5 @@ index dcceaa568..ab9d68f98 100644
  grub_err_t
  grub_net_send_ip_packet (struct grub_net_network_level_interface *inf,
 -- 
-2.13.3
+2.13.4
 
diff --git a/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch b/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch
index 820a746..14d65da 100644
--- a/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch
+++ b/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch
@@ -1,7 +1,7 @@
 From a35ac854308b0af7c86c2c7b199f6abdfa2110b0 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 17:32:15 +0200
-Subject: [PATCH 014/177] mkimage: Pass layout to mkimage_generate_elfXX rather
+Subject: [PATCH 014/192] mkimage: Pass layout to mkimage_generate_elfXX rather
  than some fields.
 
 This allows easier extension of this function without having too long of
@@ -164,5 +164,5 @@ index 9ad4cfe42..528166c87 100644
        break;
      }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch b/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch
index 39b1ec4..5010968 100644
--- a/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch
+++ b/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch
@@ -1,7 +1,7 @@
 From d08c9685149e7788001ac9a209baa1d84c3628e0 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 17:47:57 +0200
-Subject: [PATCH 015/177] Refactor arm-uboot code to make it genereic.
+Subject: [PATCH 015/192] Refactor arm-uboot code to make it genereic.
 
 arm-coreboot startup code can be very similar to arm-uboot but current code has
 U-Boot specific references. So split U-Boot part from generic part.
@@ -400,5 +400,5 @@ index 000000000..9afb6c57c
 +
 +#endif
 -- 
-2.13.3
+2.13.4
 
diff --git a/0016-coreboot-Split-parts-that-are-platform-independent.patch b/0016-coreboot-Split-parts-that-are-platform-independent.patch
index 394484b..f326efb 100644
--- a/0016-coreboot-Split-parts-that-are-platform-independent.patch
+++ b/0016-coreboot-Split-parts-that-are-platform-independent.patch
@@ -1,7 +1,7 @@
 From 461bfab7b7e47fd0a76bf6076a438af1b7e2184a Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 19:06:22 +0200
-Subject: [PATCH 016/177] coreboot: Split parts that are platform-independent.
+Subject: [PATCH 016/192] coreboot: Split parts that are platform-independent.
 
 We currently assume that coreboot is always i386, it's no longer the case,
 so split i386-coreboot parts from generic coreboot code.
@@ -340,5 +340,5 @@ index 1c3fa6f19..5076d36c7 100644
 +
  #endif
 -- 
-2.13.3
+2.13.4
 
diff --git a/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch b/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch
index e34de26..9c63406 100644
--- a/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch
+++ b/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch
@@ -1,7 +1,7 @@
 From 1daa716c7017f1858de117a20a31da66815435c5 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 19:31:55 +0200
-Subject: [PATCH 017/177] Rename uboot/halt.c to dummy/halt.c.
+Subject: [PATCH 017/192] Rename uboot/halt.c to dummy/halt.c.
 
 It's not U-Boot specific and it's a stub.
 ---
@@ -28,5 +28,5 @@ similarity index 100%
 rename from grub-core/lib/uboot/halt.c
 rename to grub-core/lib/dummy/halt.c
 -- 
-2.13.3
+2.13.4
 
diff --git a/0018-Rename-uboot-datetime-to-dummy-datetime.patch b/0018-Rename-uboot-datetime-to-dummy-datetime.patch
index 1e1b4e5..309e309 100644
--- a/0018-Rename-uboot-datetime-to-dummy-datetime.patch
+++ b/0018-Rename-uboot-datetime-to-dummy-datetime.patch
@@ -1,7 +1,7 @@
 From 9808c3ef956c6472a96790b60cf74f4eaa742010 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 19:37:29 +0200
-Subject: [PATCH 018/177] Rename uboot/datetime to dummy/datetime.
+Subject: [PATCH 018/192] Rename uboot/datetime to dummy/datetime.
 
 It's just a stub and is not UBoot-specific.
 ---
@@ -54,5 +54,5 @@ index 4be716928..cf693fc6b 100644
 +		     "can\'t set datetime on this machine");
  }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0019-arm-coreboot-Start-new-port.patch b/0019-arm-coreboot-Start-new-port.patch
index 2c8885d..03e6f32 100644
--- a/0019-arm-coreboot-Start-new-port.patch
+++ b/0019-arm-coreboot-Start-new-port.patch
@@ -1,7 +1,7 @@
 From 24e37a885269bdec9b27babf1da0bba3692d55c0 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 20:53:28 +0200
-Subject: [PATCH 019/177] arm-coreboot: Start new port.
+Subject: [PATCH 019/192] arm-coreboot: Start new port.
 
 ---
  configure.ac                           |   2 +
@@ -823,5 +823,5 @@ index 528166c87..6aa77ed73 100644
  			   (unsigned) layout.kernel_size + (unsigned) layout.bss_size
  			   + GRUB_KERNEL_I386_PC_LINK_ADDR,
 -- 
-2.13.3
+2.13.4
 
diff --git a/0020-Add-support-for-device-tree-based-drivers.patch b/0020-Add-support-for-device-tree-based-drivers.patch
index 242406d..d2bdfa1 100644
--- a/0020-Add-support-for-device-tree-based-drivers.patch
+++ b/0020-Add-support-for-device-tree-based-drivers.patch
@@ -1,7 +1,7 @@
 From fcbb723d4b1f7ad4687191562621dd0eb25f4d9e Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 21:19:59 +0200
-Subject: [PATCH 020/177] Add support for device-tree-based drivers.
+Subject: [PATCH 020/192] Add support for device-tree-based drivers.
 
 ---
  conf/Makefile.common               |   4 +-
@@ -847,5 +847,5 @@ index 6aa77ed73..e22d82afa 100644
      {
        struct grub_module_header *header;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0021-arm-coreboot-Support-for-vexpress-timer.patch b/0021-arm-coreboot-Support-for-vexpress-timer.patch
index 445d370..e38b9c9 100644
--- a/0021-arm-coreboot-Support-for-vexpress-timer.patch
+++ b/0021-arm-coreboot-Support-for-vexpress-timer.patch
@@ -1,7 +1,7 @@
 From 5a865b37866ee8cd64c080bc6fb1e537f8e2b3c6 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 21:26:36 +0200
-Subject: [PATCH 021/177] arm-coreboot: Support for vexpress timer.
+Subject: [PATCH 021/192] arm-coreboot: Support for vexpress timer.
 
 ---
  grub-core/kern/arm/coreboot/timer.c | 36 ++++++++++++++++++++++++++++++++++++
@@ -69,5 +69,5 @@ index ebefb99d5..d97b844f8 100644
      try_generic_timer ();
    if (!have_timer)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0022-arm-coreboot-Export-FDT-routines.patch b/0022-arm-coreboot-Export-FDT-routines.patch
index 685d181..4532b31 100644
--- a/0022-arm-coreboot-Export-FDT-routines.patch
+++ b/0022-arm-coreboot-Export-FDT-routines.patch
@@ -1,7 +1,7 @@
 From ac6b41b89fbb82a3ba843a7ed19115d81432b604 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 21:29:48 +0200
-Subject: [PATCH 022/177] arm-coreboot: Export FDT routines.
+Subject: [PATCH 022/192] arm-coreboot: Export FDT routines.
 
 We need to use them from modules as well.
 ---
@@ -23,5 +23,5 @@ index fc6ca3051..147e6959c 100644
  
  if COND_arm_efi
 -- 
-2.13.3
+2.13.4
 
diff --git a/0023-at_keyboard-Split-protocol-from-controller-code.patch b/0023-at_keyboard-Split-protocol-from-controller-code.patch
index c5fd622..02eb6bb 100644
--- a/0023-at_keyboard-Split-protocol-from-controller-code.patch
+++ b/0023-at_keyboard-Split-protocol-from-controller-code.patch
@@ -1,7 +1,7 @@
 From 216950a4eea1a1ead1c28eaca94e34ea2ef2ad19 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 21:41:22 +0200
-Subject: [PATCH 023/177] at_keyboard: Split protocol from controller code.
+Subject: [PATCH 023/192] at_keyboard: Split protocol from controller code.
 
 On vexpress controller is different but protocol is the same, so reuse the
 code.
@@ -1023,5 +1023,5 @@ index 000000000..4f2e527e4
 +
 +#endif
 -- 
-2.13.3
+2.13.4
 
diff --git a/0024-arm_coreboot-Support-keyboard-for-vexpress.patch b/0024-arm_coreboot-Support-keyboard-for-vexpress.patch
index e9e1325..961600d 100644
--- a/0024-arm_coreboot-Support-keyboard-for-vexpress.patch
+++ b/0024-arm_coreboot-Support-keyboard-for-vexpress.patch
@@ -1,7 +1,7 @@
 From 848bed9d92cf20e9f25db4c69a20efad23996ca0 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 21:42:37 +0200
-Subject: [PATCH 024/177] arm_coreboot: Support keyboard for vexpress.
+Subject: [PATCH 024/192] arm_coreboot: Support keyboard for vexpress.
 
 ---
  grub-core/Makefile.am              |   1 +
@@ -245,5 +245,5 @@ index 000000000..e4cda3056
 +  grub_fdtbus_register (&pl050);
 +}
 -- 
-2.13.3
+2.13.4
 
diff --git a/0025-arm_coreboot-Support-grub-mkstandalone.patch b/0025-arm_coreboot-Support-grub-mkstandalone.patch
index f92678e..77f5d1c 100644
--- a/0025-arm_coreboot-Support-grub-mkstandalone.patch
+++ b/0025-arm_coreboot-Support-grub-mkstandalone.patch
@@ -1,7 +1,7 @@
 From 3edabad8fefb112cc4b2d43be6e97d43c909ceee Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 21:59:48 +0200
-Subject: [PATCH 025/177] arm_coreboot: Support grub-mkstandalone.
+Subject: [PATCH 025/192] arm_coreboot: Support grub-mkstandalone.
 
 ---
  include/grub/util/install.h |  6 +++++-
@@ -154,5 +154,5 @@ index 9074d3e9e..75e3e5ba6 100644
      case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:
      case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
 -- 
-2.13.3
+2.13.4
 
diff --git a/0026-arm_coreboot-Support-loading-linux-images.patch b/0026-arm_coreboot-Support-loading-linux-images.patch
index 9237999..061cdf0 100644
--- a/0026-arm_coreboot-Support-loading-linux-images.patch
+++ b/0026-arm_coreboot-Support-loading-linux-images.patch
@@ -1,7 +1,7 @@
 From 656c3b0d7fbe23f0e1ab561c8faa4ac4a37364d1 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 22:00:06 +0200
-Subject: [PATCH 026/177] arm_coreboot: Support loading linux images.
+Subject: [PATCH 026/192] arm_coreboot: Support loading linux images.
 
 ---
  grub-core/loader/arm/linux.c | 132 ++++++++++++++++++++++---------------------
@@ -298,5 +298,5 @@ index a66caad13..f217f8281 100644
  
  #define FDT_ADDITIONAL_ENTRIES_SIZE	0x300
 -- 
-2.13.3
+2.13.4
 
diff --git a/0027-arm_coreboot-Support-DMA.patch b/0027-arm_coreboot-Support-DMA.patch
index 17b1fb2..1741ffe 100644
--- a/0027-arm_coreboot-Support-DMA.patch
+++ b/0027-arm_coreboot-Support-DMA.patch
@@ -1,7 +1,7 @@
 From 265292f2b0da0eb414c409871ba0f94a99ec33c1 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 22:06:04 +0200
-Subject: [PATCH 027/177] arm_coreboot: Support DMA.
+Subject: [PATCH 027/192] arm_coreboot: Support DMA.
 
 This is needed to support USB and some other busses.
 ---
@@ -288,5 +288,5 @@ index 70d9a0513..262c89b74 100644
  grub_uint8_t
  EXPORT_FUNC (grub_pci_find_capability) (grub_pci_device_t dev, grub_uint8_t cap);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0028-ehci-Split-core-code-from-PCI-part.patch b/0028-ehci-Split-core-code-from-PCI-part.patch
index a43717c..0062feb 100644
--- a/0028-ehci-Split-core-code-from-PCI-part.patch
+++ b/0028-ehci-Split-core-code-from-PCI-part.patch
@@ -1,7 +1,7 @@
 From 058df7b5a9cc7aaa9872eaa916b715544a8f9840 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 22:10:26 +0200
-Subject: [PATCH 028/177] ehci: Split core  code from PCI part.
+Subject: [PATCH 028/192] ehci: Split core  code from PCI part.
 
 On ARM often EHCI is present without PCI and just declared in device
 tree. So splitcore from PCI part.
@@ -567,5 +567,5 @@ index 5f4297bb2..c772e7654 100644
    grub_usb_controller_dev_register (&usb_controller);
    grub_boot_time ("EHCI driver registered");
 -- 
-2.13.3
+2.13.4
 
diff --git a/0029-arm_coreboot-Support-EHCI.patch b/0029-arm_coreboot-Support-EHCI.patch
index 04633cc..56141bb 100644
--- a/0029-arm_coreboot-Support-EHCI.patch
+++ b/0029-arm_coreboot-Support-EHCI.patch
@@ -1,7 +1,7 @@
 From d11ced1e1fb93676942e51618eb53c140f541890 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 22:14:28 +0200
-Subject: [PATCH 029/177] arm_coreboot: Support EHCI.
+Subject: [PATCH 029/192] arm_coreboot: Support EHCI.
 
 ---
  gentpl.py                    |  2 +-
@@ -119,5 +119,5 @@ index 11d96481f..512ae1dd0 100644
  
  #endif /* GRUB_USB_H */
 -- 
-2.13.3
+2.13.4
 
diff --git a/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch b/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch
index 8600115..6121523 100644
--- a/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch
+++ b/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch
@@ -1,7 +1,7 @@
 From 4f8471532d454b2db96434c28bf7105ed69e0f4d Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Tue, 9 May 2017 08:39:40 +0200
-Subject: [PATCH 030/177] Fix bug on FDT nodes with compatible property
+Subject: [PATCH 030/192] Fix bug on FDT nodes with compatible property
 
 ---
  grub-core/bus/fdt.c | 2 ++
@@ -21,5 +21,5 @@ index 6fb077000..34d535457 100644
    while (compatible < compatible_end)
      {
 -- 
-2.13.3
+2.13.4
 
diff --git a/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch b/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch
index 3e0caf8..5a42fad 100644
--- a/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch
+++ b/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch
@@ -1,7 +1,7 @@
 From c4313c812dc14e82a774b580b5e34d40e7f3fae6 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Tue, 9 May 2017 08:40:29 +0200
-Subject: [PATCH 031/177] fdtbus: Add ability to send/receive messages on
+Subject: [PATCH 031/192] fdtbus: Add ability to send/receive messages on
  parent busses.
 
 ---
@@ -130,5 +130,5 @@ index 985837e55..f519c40ec 100644
  /* dtb is assumed to be unfreeable and must remain
     valid for lifetime of GRUB.
 -- 
-2.13.3
+2.13.4
 
diff --git a/0032-rk3288_spi-Add-SPI-driver.patch b/0032-rk3288_spi-Add-SPI-driver.patch
index bcdb9aa..3168323 100644
--- a/0032-rk3288_spi-Add-SPI-driver.patch
+++ b/0032-rk3288_spi-Add-SPI-driver.patch
@@ -1,7 +1,7 @@
 From b0b1b81a11f8bae8ab9e8edd87ac3f4f7949d03b Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Tue, 9 May 2017 08:42:14 +0200
-Subject: [PATCH 032/177] rk3288_spi: Add SPI driver
+Subject: [PATCH 032/192] rk3288_spi: Add SPI driver
 
 ---
  grub-core/Makefile.core.def        |   1 +
@@ -161,5 +161,5 @@ index 09cd7fe32..269505342 100644
  #endif /* ! ASM_FILE */
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch b/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch
index 430c3e3..a7f8de0 100644
--- a/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch
+++ b/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch
@@ -1,7 +1,7 @@
 From 5c3fd1b135bd73c8e3467b9b635b25ca4d360a19 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Tue, 9 May 2017 08:47:34 +0200
-Subject: [PATCH 033/177] arm_coreboot: Add Chromebook keyboard driver.
+Subject: [PATCH 033/192] arm_coreboot: Add Chromebook keyboard driver.
 
 ---
  grub-core/term/arm/cros.c    | 125 +++++++++++++++++++++++
@@ -415,5 +415,5 @@ index 000000000..45a372572
 +
 +#endif
 -- 
-2.13.3
+2.13.4
 
diff --git a/0034-Missing-parts-of-previous-commit.patch b/0034-Missing-parts-of-previous-commit.patch
index f84cb20..718d03b 100644
--- a/0034-Missing-parts-of-previous-commit.patch
+++ b/0034-Missing-parts-of-previous-commit.patch
@@ -1,7 +1,7 @@
 From c6eaa982d12e3cfc5465dda5ea372774188b6b81 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Tue, 9 May 2017 09:02:15 +0200
-Subject: [PATCH 034/177] Missing parts of previous commit
+Subject: [PATCH 034/192] Missing parts of previous commit
 
 ---
  grub-core/Makefile.core.def        | 2 ++
@@ -34,5 +34,5 @@ index 0126ff638..8d8c5b829 100644
  }
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch b/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch
index 7e5f384..5aa9e00 100644
--- a/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch
+++ b/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch
@@ -1,7 +1,7 @@
 From 70b555a52a065b2beb91e6fc97a6b358c931b303 Mon Sep 17 00:00:00 2001
 From: Julius Werner <jwerner@chromium.org>
 Date: Tue, 9 May 2017 09:03:02 +0200
-Subject: [PATCH 035/177] coreboot: Changed cbmemc to support updated console
+Subject: [PATCH 035/192] coreboot: Changed cbmemc to support updated console
  format from coreboot.
 
 ---
@@ -94,5 +94,5 @@ index 129248c7f..cea9b8431 100644
  }
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0036-at_keyboard-Fix-falco-chromebook-case.patch b/0036-at_keyboard-Fix-falco-chromebook-case.patch
index 0650a17..31ac73b 100644
--- a/0036-at_keyboard-Fix-falco-chromebook-case.patch
+++ b/0036-at_keyboard-Fix-falco-chromebook-case.patch
@@ -1,7 +1,7 @@
 From c4b8bec5fee4e30a165fd14a188cf3ab8eccd095 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Tue, 9 May 2017 14:27:52 +0200
-Subject: [PATCH 036/177] at_keyboard: Fix falco chromebook case.
+Subject: [PATCH 036/192] at_keyboard: Fix falco chromebook case.
 
 EC is slow, so we need few delays for it to toggle the bits correctly.
 
@@ -85,5 +85,5 @@ index b031523eb..bcb4d9ba7 100644
  #define KEYBOARD_ISMAKE(x)	!((x) & 0x80)
  #define KEYBOARD_ISREADY(x)	((x) & 0x01)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0037-sparc64-Close-cdboot-ihandle.patch b/0037-sparc64-Close-cdboot-ihandle.patch
index f90982e..b99216d 100644
--- a/0037-sparc64-Close-cdboot-ihandle.patch
+++ b/0037-sparc64-Close-cdboot-ihandle.patch
@@ -1,7 +1,7 @@
 From bd4e40aadded7093908d786d03b4acf60b7b1707 Mon Sep 17 00:00:00 2001
 From: Eric Snowberg <eric.snowberg@oracle.com>
 Date: Thu, 11 May 2017 18:42:23 -0700
-Subject: [PATCH 037/177] sparc64: Close cdboot ihandle
+Subject: [PATCH 037/192] sparc64: Close cdboot ihandle
 
 The ihandle is left open with a cd-core image.  This will cause a delay
 booting grub from a virtual cdrom in a LDOM.  It will also cause problems
@@ -44,5 +44,5 @@ index 586efb401..9ea9b4e06 100644
  	 mov	512, %o3
  #endif
 -- 
-2.13.3
+2.13.4
 
diff --git a/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch b/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch
index d7700e7..91c4b21 100644
--- a/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch
+++ b/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch
@@ -1,7 +1,7 @@
 From ae5817f1dcbf0b99f7a849f56afe442165317840 Mon Sep 17 00:00:00 2001
 From: Julien Grall <julien.grall@linaro.org>
 Date: Fri, 19 Feb 2016 16:28:52 +0000
-Subject: [PATCH 038/177] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64
+Subject: [PATCH 038/192] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64
 
 Xen is currently crashing because of malformed compatible property for
 the boot module. This is because the property string is not
@@ -28,5 +28,5 @@ index a914eb8e2..8ae43d7e8 100644
      return grub_error (GRUB_ERR_IO, "failed to update FDT");
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch b/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch
index 91901da..35b6b4e 100644
--- a/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch
+++ b/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch
@@ -1,7 +1,7 @@
 From 8eed7be8a61c295df700e918744a984162378ca9 Mon Sep 17 00:00:00 2001
 From: Fu Wei <fu.wei@linaro.org>
 Date: Sun, 14 May 2017 15:43:45 +0800
-Subject: [PATCH 039/177] arm64: Add "--nounzip" option support in xen_module
+Subject: [PATCH 039/192] arm64: Add "--nounzip" option support in xen_module
  command
 
 This patch adds "--nounzip" option support in order to
@@ -52,5 +52,5 @@ index 8ae43d7e8..27ede46ca 100644
    if (!file)
      goto fail;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch b/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch
index e6bc3f8..cfb14a5 100644
--- a/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch
+++ b/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch
@@ -1,7 +1,7 @@
 From d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe Mon Sep 17 00:00:00 2001
 From: Fu Wei <fu.wei@linaro.org>
 Date: Sun, 14 May 2017 15:43:46 +0800
-Subject: [PATCH 040/177] util/grub.d/20_linux_xen.in: Add xen_boot command
+Subject: [PATCH 040/192] util/grub.d/20_linux_xen.in: Add xen_boot command
  support for aarch64
 
 This patch adds the support of xen_boot command for aarch64:
@@ -59,5 +59,5 @@ index c48af948d..c002fc9f9 100644
  	linux=`version_find_latest $list`
  	gettext_printf "Found linux image: %s\n" "$linux" >&2
 -- 
-2.13.3
+2.13.4
 
diff --git a/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch b/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch
index 5e290f6..4a894b6 100644
--- a/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch
+++ b/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch
@@ -1,7 +1,7 @@
 From 26c2f306fd425d2c0348023b8dcb7eb40a01851a Mon Sep 17 00:00:00 2001
 From: Fu Wei <fu.wei@linaro.org>
 Date: Sun, 14 May 2017 15:43:47 +0800
-Subject: [PATCH 041/177] arm64: Update the introduction of Xen boot commands
+Subject: [PATCH 041/192] arm64: Update the introduction of Xen boot commands
  in docs/grub.texi
 
 delete: xen_linux, xen_initrd, xen_xsm
@@ -89,5 +89,5 @@ index e935af33e..a0c4b9e4e 100644
  @section The list of networking commands
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch b/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch
index f950d35..ad0806e 100644
--- a/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch
+++ b/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch
@@ -1,7 +1,7 @@
 From f8679cedff703b437171f4708d46adbfcff80a65 Mon Sep 17 00:00:00 2001
 From: Eric Snowberg <eric.snowberg@oracle.com>
 Date: Thu, 18 May 2017 17:10:22 -0600
-Subject: [PATCH 042/177] sparc64: Don't use devspec to determine the OBP path
+Subject: [PATCH 042/192] sparc64: Don't use devspec to determine the OBP path
 
 Don't use devspec to determine the OBP path on SPARC hardware.  Within all
 versions of Linux on SPARC, the devspec returns one of three values:
@@ -49,5 +49,5 @@ index a79682a5e..dce4e59d0 100644
        if (fd < 0 || fstat (fd, &st) < 0)
  	{
 -- 
-2.13.3
+2.13.4
 
diff --git a/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch b/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch
index f8a78ac..451b51b 100644
--- a/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch
+++ b/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch
@@ -1,7 +1,7 @@
 From 734668238fcc0ef691a080839e04f33854fa133a Mon Sep 17 00:00:00 2001
 From: Eric Biggers <ebiggers@google.com>
 Date: Thu, 29 Jun 2017 13:27:49 +0000
-Subject: [PATCH 043/177] Allow GRUB to mount ext2/3/4 filesystems that have
+Subject: [PATCH 043/192] Allow GRUB to mount ext2/3/4 filesystems that have
  the encryption feature.
 
 On such a filesystem, inodes may have EXT4_ENCRYPT_FLAG set.
@@ -136,5 +136,5 @@ index 88cbe7365..fd7e0f14b 100644
  		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.$fs" -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;;
  		xxfs)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0044-ehci-Fix-compilation-for-amd64.patch b/0044-ehci-Fix-compilation-for-amd64.patch
index c44a7cc..664d9a6 100644
--- a/0044-ehci-Fix-compilation-for-amd64.patch
+++ b/0044-ehci-Fix-compilation-for-amd64.patch
@@ -1,7 +1,7 @@
 From edb37fb30bbc8a3b6bec67911c7200e4eb071127 Mon Sep 17 00:00:00 2001
 From: phcoder <phcoder@sid.debian.laptop.phnet>
 Date: Sun, 9 Jul 2017 20:58:31 +0200
-Subject: [PATCH 044/177] ehci: Fix compilation for amd64
+Subject: [PATCH 044/192] ehci: Fix compilation for amd64
 
 ---
  grub-core/bus/usb/ehci.c | 8 ++++----
@@ -34,5 +34,5 @@ index c772e7654..7b7061f53 100644
  		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
    grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
 -- 
-2.13.3
+2.13.4
 
diff --git a/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch b/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch
index cf5ba20..31e6144 100644
--- a/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch
+++ b/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch
@@ -1,7 +1,7 @@
 From d8901e3ba115d705c9c08ecedd201aca8b4867b8 Mon Sep 17 00:00:00 2001
 From: phcoder <phcoder@sid.debian.laptop.phnet>
 Date: Sun, 9 Jul 2017 20:59:15 +0200
-Subject: [PATCH 045/177] cache: Fix compilation for ppc, sparc and arm64
+Subject: [PATCH 045/192] cache: Fix compilation for ppc, sparc and arm64
 
 ---
  include/grub/cache.h | 4 +++-
@@ -23,5 +23,5 @@ index 1c98ce270..ccfa717e6 100644
  grub_arch_sync_dma_caches (volatile void *address __attribute__ ((unused)),
  			   grub_size_t len __attribute__ ((unused)))
 -- 
-2.13.3
+2.13.4
 
diff --git a/0046-ehci-Fix-compilation-on-i386.patch b/0046-ehci-Fix-compilation-on-i386.patch
index 7e33e07..9196dfc 100644
--- a/0046-ehci-Fix-compilation-on-i386.patch
+++ b/0046-ehci-Fix-compilation-on-i386.patch
@@ -1,7 +1,7 @@
 From 284afab081ef7ed7db2c59151853aa3c92d988f2 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sun, 9 Jul 2017 21:31:19 +0200
-Subject: [PATCH 046/177] ehci: Fix compilation on i386
+Subject: [PATCH 046/192] ehci: Fix compilation on i386
 
 ---
  grub-core/bus/usb/ehci.c | 4 ++--
@@ -30,5 +30,5 @@ index 7b7061f53..d966fc210 100644
  		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
    grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
 -- 
-2.13.3
+2.13.4
 
diff --git a/0047-crypto-Fix-use-after-free.patch b/0047-crypto-Fix-use-after-free.patch
index f34f53a..b9d4a8b 100644
--- a/0047-crypto-Fix-use-after-free.patch
+++ b/0047-crypto-Fix-use-after-free.patch
@@ -1,7 +1,7 @@
 From a0fe0c26aa8a1c0ad66d9527611bd726b849c623 Mon Sep 17 00:00:00 2001
 From: AppChecker <appchecker>
 Date: Sun, 9 Jul 2017 21:57:35 +0200
-Subject: [PATCH 047/177] crypto: Fix use after free.
+Subject: [PATCH 047/192] crypto: Fix use after free.
 
 Reported by: AppChecker
 Transformed to patch by: Satish Govindarajan
@@ -24,5 +24,5 @@ index 2bfd67c8e..e6d345f33 100644
  	}
        cur->next = crypto_specs;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0048-arm-efi-Fix-compilation.patch b/0048-arm-efi-Fix-compilation.patch
index 703da29..05f6aa7 100644
--- a/0048-arm-efi-Fix-compilation.patch
+++ b/0048-arm-efi-Fix-compilation.patch
@@ -1,7 +1,7 @@
 From cb8b7e4e36bf32dccbbba8252aa44ad3ada4fbc1 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sun, 9 Jul 2017 21:48:37 +0000
-Subject: [PATCH 048/177] arm-efi: Fix compilation
+Subject: [PATCH 048/192] arm-efi: Fix compilation
 
 ---
  grub-core/loader/arm/linux.c | 8 ++++----
@@ -37,5 +37,5 @@ index 260cbf068..e64c79a95 100644
  }
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0049-fdt-silence-clang-warning.patch b/0049-fdt-silence-clang-warning.patch
index 8353a04..2067ccf 100644
--- a/0049-fdt-silence-clang-warning.patch
+++ b/0049-fdt-silence-clang-warning.patch
@@ -1,7 +1,7 @@
 From 68d54b55f49249c5e0517bf189f0f3df7ee6a36f Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 10 Jul 2017 01:34:22 +0000
-Subject: [PATCH 049/177] fdt: silence clang warning.
+Subject: [PATCH 049/192] fdt: silence clang warning.
 
 ---
  grub-core/lib/fdt.c | 3 ++-
@@ -22,5 +22,5 @@ index bdc630244..2705f2629 100644
            return 0;
  	return token;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0177-Fix-a-segfault-in-lsefi.patch b/0050-Fix-a-segfault-in-lsefi.patch
similarity index 53%
rename from 0177-Fix-a-segfault-in-lsefi.patch
rename to 0050-Fix-a-segfault-in-lsefi.patch
index 88997e3..8e0dc53 100644
--- a/0177-Fix-a-segfault-in-lsefi.patch
+++ b/0050-Fix-a-segfault-in-lsefi.patch
@@ -1,33 +1,33 @@
-From 18356b411280c1d6da77198370948505b2e362c4 Mon Sep 17 00:00:00 2001
+From e8ab5a1a9e2889eb59d1fa494ba441a53698dcd2 Mon Sep 17 00:00:00 2001
 From: Rob Clark <rclark@redhat.com>
-Date: Wed, 19 Jul 2017 15:43:12 -0400
-Subject: [PATCH 177/177] Fix a segfault in lsefi
+Date: Wed, 19 Jul 2017 15:47:41 -0400
+Subject: [PATCH 050/192] Fix a segfault in lsefi
 
 when protocols_per_handle returns error, we can't use the pointers we
 passed to it, and that includes trusting num_protocols.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
 ---
- grub-core/commands/efi/lsefi.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ grub-core/commands/efi/lsefi.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/commands/efi/lsefi.c b/grub-core/commands/efi/lsefi.c
-index d901c3892..9c0c071c8 100644
+index d901c3892..d1ce99af4 100644
 --- a/grub-core/commands/efi/lsefi.c
 +++ b/grub-core/commands/efi/lsefi.c
-@@ -110,7 +110,11 @@ grub_cmd_lsefi (grub_command_t cmd __attribute__ ((unused)),
+@@ -109,8 +109,10 @@ grub_cmd_lsefi (grub_command_t cmd __attribute__ ((unused)),
+ 
        status = efi_call_3 (grub_efi_system_table->boot_services->protocols_per_handle,
  			   handle, &protocols, &num_protocols);
-       if (status != GRUB_EFI_SUCCESS)
--	grub_printf ("Unable to retrieve protocols\n");
-+	{
-+	  grub_printf ("Unable to retrieve protocols\n");
-+	  continue;
-+	}
-+
+-      if (status != GRUB_EFI_SUCCESS)
++      if (status != GRUB_EFI_SUCCESS) {
+ 	grub_printf ("Unable to retrieve protocols\n");
++	continue;
++      }
        for (j = 0; j < num_protocols; j++)
  	{
  	  for (k = 0; k < ARRAY_SIZE (known_protocols); k++)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0050-Fix-bzr-s-ignore-artificats-in-.gitignore.patch b/0050-Fix-bzr-s-ignore-artificats-in-.gitignore.patch
deleted file mode 100644
index 6b55aa0..0000000
--- a/0050-Fix-bzr-s-ignore-artificats-in-.gitignore.patch
+++ /dev/null
@@ -1,361 +0,0 @@
-From 229239b69319cd39d36d85551144dfe7ebf0d5e1 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 7 Jul 2015 10:13:14 -0400
-Subject: [PATCH 050/177] Fix bzr's ignore artificats in .gitignore
-
-We lost a man page because of incompatibilities between bzr's ignore
-system and .gitignore, so solve that slightly better.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- .gitignore | 257 ++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 127 insertions(+), 130 deletions(-)
-
-diff --git a/.gitignore b/.gitignore
-index eca17bec9..e82aa55b1 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,93 +1,154 @@
--00_header
--10_*
--20_linux_xen
--30_os-prober
--40_custom
--41_custom
--*.1
--*.8
-+!util/*.[[:digit:]]
-+!util/grub.d/[[:digit:]][[:digit:]]_*.in
-+*.[[:digit:]]
-+*.a
-+*.exe
-+*.exec
-+*.image
-+*.img
-+*.log
-+*.lst
-+*.marker
-+*.mod
-+*.o
-+*.pf2
-+*.pp
-+*.trs
-+.deps
-+.deps-core
-+.deps-util
-+.dirstamp
-+DISTLIST
-+GPATH
-+GRTAGS
-+GSYMS
-+GTAGS
-+Makefile
-+Makefile.in
-+Makefile.util.am
-+Makefile.utilgcry.def
-+[[:digit:]][[:digit:]]_*
- aclocal.m4
- ahci_test
- ascii.bitmaps
- ascii.h
- autom4te.cache
-+build-aux/test-driver
- build-grub-gen-asciih
- build-grub-gen-widthspec
- build-grub-mkfont
- cdboot_test
- cmp_test
--config.cache
--config.guess
--config.h
--config-util.h
--config-util.h.in
--config.log
--config.status
--config.sub
--configure
-+compile
-+/config-util.h
-+/config-util.h.in
-+/config.cache
-+/config.guess
-+/config.h
-+/config.log
-+/config.status
-+/config.sub
-+/configure
-+contrib
- core_compress_test
--DISTLIST
-+depcomp
- docs/*.info
-+docs/stamp-1
- docs/stamp-vti
-+docs/version-dev.texi
- docs/version.texi
- ehci_test
- example_grub_script_test
- example_scripted_test
- example_unit_test
--*.exec
--*.exec.exe
- fddboot_test
-+garbage-gen
- genkernsyms.sh
- gensymlist.sh
- gentrigtables
--gentrigtables.exe
- gettext_strings_test
- grub-bin2h
--/grub-bios-setup
--/grub-bios-setup.exe
-+grub-bios-setup
-+grub-core/*.module
-+grub-core/*.pp
-+grub-core/Makefile.core.am
-+grub-core/Makefile.gcry.def
-+grub-core/bootinfo.txt
-+grub-core/contrib
-+grub-core/gdb_grub
-+grub-core/genmod.sh
-+grub-core/gensyminfo.sh
-+grub-core/gmodule.pl
-+grub-core/gnulib/alloca.h
-+grub-core/gnulib/arg-nonnull.h
-+grub-core/gnulib/c++defs.h
-+grub-core/gnulib/charset.alias
-+grub-core/gnulib/configmake.h
-+grub-core/gnulib/float.h
-+grub-core/gnulib/getopt.h
-+grub-core/gnulib/langinfo.h
-+grub-core/gnulib/locale.h
-+grub-core/gnulib/ref-add.sed
-+grub-core/gnulib/ref-del.sed
-+grub-core/gnulib/stdio.h
-+grub-core/gnulib/stdlib.h
-+grub-core/gnulib/string.h
-+grub-core/gnulib/strings.h
-+grub-core/gnulib/sys
-+grub-core/gnulib/unistd.h
-+grub-core/gnulib/unitypes.h
-+grub-core/gnulib/uniwidth.h
-+grub-core/gnulib/warn-on-use.h
-+grub-core/gnulib/wchar.h
-+grub-core/gnulib/wctype.h
-+grub-core/grub.chrp
-+grub-core/kernel.img.bin
-+grub-core/lib/libgcrypt-grub
-+grub-core/modinfo.sh
-+grub-core/rs_decoder.h
-+grub-editenv
-+grub-emu
-+grub-emu-lite
-+grub-file
-+grub-fs-tester
-+grub-fstest
-+grub-glue-efi
-+grub-install
-+grub-kbdcomp
-+grub-macbless
-+grub-macho2img
-+grub-menulst2cfg
-+grub-mk*
-+grub-mount
-+grub-ofpathname
-+grub-probe
-+grub-reboot
-+grub-render-label
-+grub-script-check
-+grub-set-default
-+grub-shell
-+grub-shell-tester
-+grub-sparc64-setup
-+grub-syslinux2cfg
- grub_cmd_date
- grub_cmd_echo
- grub_cmd_regexp
- grub_cmd_set_date
- grub_cmd_sleep
--/grub-editenv
--/grub-editenv.exe
--grub-emu
--grub-emu-lite
--grub-emu.exe
--grub-emu-lite.exe
- grub_emu_init.c
- grub_emu_init.h
--/grub-file
--/grub-file.exe
--grub-fstest
--grub-fstest.exe
- grub_fstest_init.c
- grub_fstest_init.h
- grub_func_test
--grub-install
--grub-install.exe
--grub-kbdcomp
--/grub-macbless
--/grub-macbless.exe
--grub-macho2img
--/grub-menulst2cfg
--/grub-menulst2cfg.exe
--/grub-mk*
--grub-mount
--/grub-ofpathname
--/grub-ofpathname.exe
--grub-core/build-grub-pe2elf.exe
--/grub-probe
--/grub-probe.exe
- grub_probe_init.c
- grub_probe_init.h
--/grub-reboot
-+grub_script.tab.c
-+grub_script.tab.h
-+grub_script.yy.c
-+grub_script.yy.h
- grub_script_blanklines
- grub_script_blockarg
- grub_script_break
--grub-script-check
--grub-script-check.exe
- grub_script_check_init.c
- grub_script_check_init.h
- grub_script_comments
-@@ -113,115 +174,50 @@ grub_script_strcmp
- grub_script_test
- grub_script_vars1
- grub_script_while1
--grub_script.tab.c
--grub_script.tab.h
--grub_script.yy.c
--grub_script.yy.h
--grub-set-default
- grub_setup_init.c
- grub_setup_init.h
--grub-shell
--grub-shell-tester
--grub-sparc64-setup
--grub-sparc64-setup.exe
--/grub-syslinux2cfg
--/grub-syslinux2cfg.exe
- gzcompress_test
- hddboot_test
- help_test
--*.img
--*.image
--*.image.exe
- include/grub/cpu
-+include/grub/gcrypt/g10lib.h
-+include/grub/gcrypt/gcrypt.h
- include/grub/machine
- install-sh
- lib/libgcrypt-grub
- libgrub_a_init.c
--*.log
--*.lst
- lzocompress_test
--*.marker
--Makefile
--*.mod
--mod-*.c
-+mdate-sh
- missing
-+mod-*.c
- netboot_test
--*.o
--*.a
- ohci_test
- partmap_test
- pata_test
--*.pf2
--*.pp
-+po/*.gmo
- po/*.mo
--po/grub.pot
-+po/*.po
-+po/LINGUAS
- po/POTFILES
-+po/POTFILES-shell.in
-+po/POTFILES.in
-+po/grub.pot
-+po/remove-potcdate.sed
- po/stamp-po
- printf_test
- priority_queue_unit_test
- pseries_test
- stamp-h
--stamp-h1
- stamp-h.in
-+stamp-h1
- symlist.c
- symlist.h
-+texinfo.tex
- trigtables.c
--*.trs
- uhci_test
--update-grub_lib
- unidata.c
--xzcompress_test
--Makefile.in
--GPATH
--GRTAGS
--GSYMS
--GTAGS
--compile
--depcomp
--mdate-sh
--texinfo.tex
--grub-core/lib/libgcrypt-grub
--.deps
--.deps-util
--.deps-core
--.dirstamp
--Makefile.util.am
--contrib
--grub-core/bootinfo.txt
--grub-core/Makefile.core.am
--grub-core/Makefile.gcry.def
--grub-core/contrib
--grub-core/gdb_grub
--grub-core/genmod.sh
--grub-core/gensyminfo.sh
--grub-core/gmodule.pl
--grub-core/grub.chrp
--grub-core/modinfo.sh
--grub-core/*.module
--grub-core/*.module.exe
--grub-core/*.pp
--grub-core/kernel.img.bin
-+update-grub_lib
- util/bash-completion.d/grub
--grub-core/gnulib/alloca.h
--grub-core/gnulib/arg-nonnull.h
--grub-core/gnulib/c++defs.h
--grub-core/gnulib/charset.alias
--grub-core/gnulib/configmake.h
--grub-core/gnulib/float.h
--grub-core/gnulib/getopt.h
--grub-core/gnulib/langinfo.h
--grub-core/gnulib/ref-add.sed
--grub-core/gnulib/ref-del.sed
--grub-core/gnulib/stdio.h
--grub-core/gnulib/stdlib.h
--grub-core/gnulib/string.h
--grub-core/gnulib/strings.h
--grub-core/gnulib/sys
--grub-core/gnulib/unistd.h
--grub-core/gnulib/warn-on-use.h
--grub-core/gnulib/wchar.h
--grub-core/gnulib/wctype.h
--grub-core/rs_decoder.h
- widthspec.bin
- widthspec.h
- docs/stamp-1
-@@ -247,3 +243,4 @@ build-aux/test-driver
- /garbage-gen.exe
- /grub-fs-tester
- grub-core/build-grub-module-verifier
-+xzcompress_test
--- 
-2.13.3
-
diff --git a/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch b/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch
new file mode 100644
index 0000000..a87a1b3
--- /dev/null
+++ b/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch
@@ -0,0 +1,59 @@
+From fa42786264cef98c56e972b3bb6b8448000e1c70 Mon Sep 17 00:00:00 2001
+From: Pete Batard <pete@akeo.ie>
+Date: Thu, 3 Aug 2017 15:46:15 +0100
+Subject: [PATCH 051/192] zfs: remove size_t typedef and use grub_size_t
+ instead
+
+* Prevents some toolchains from issuing a warning on size_t redef.
+---
+ grub-core/fs/zfs/zfs_lz4.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/grub-core/fs/zfs/zfs_lz4.c b/grub-core/fs/zfs/zfs_lz4.c
+index 2f73449f0..5453822d0 100644
+--- a/grub-core/fs/zfs/zfs_lz4.c
++++ b/grub-core/fs/zfs/zfs_lz4.c
+@@ -73,7 +73,6 @@ static int LZ4_uncompress_unknownOutputSize(const char *source, char *dest,
+ #define	U32	grub_uint32_t
+ #define	S32	grub_int32_t
+ #define	U64	grub_uint64_t
+-typedef grub_size_t size_t;
+ 
+ typedef struct _U16_S {
+ 	U16 v;
+@@ -133,10 +132,10 @@ typedef struct _U64_S {
+ 
+ /* Decompression functions */
+ grub_err_t
+-lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len);
++lz4_decompress(void *s_start, void *d_start, grub_size_t s_len, grub_size_t d_len);
+ 
+ grub_err_t
+-lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len)
++lz4_decompress(void *s_start, void *d_start, grub_size_t s_len, grub_size_t d_len)
+ {
+ 	const BYTE *src = s_start;
+ 	U32 bufsiz = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) |
+@@ -167,7 +166,7 @@ LZ4_uncompress_unknownOutputSize(const char *source,
+ 	BYTE *const oend = op + maxOutputSize;
+ 	BYTE *cpy;
+ 
+-	size_t dec[] = { 0, 3, 2, 3, 0, 0, 0, 0 };
++	grub_size_t dec[] = { 0, 3, 2, 3, 0, 0, 0, 0 };
+ 
+ 	/* Main Loop */
+ 	while (ip < iend) {
+@@ -237,8 +236,8 @@ LZ4_uncompress_unknownOutputSize(const char *source,
+ 		/* copy repeated sequence */
+ 		if unlikely(op - ref < STEPSIZE) {
+ #if LZ4_ARCH64
+-			size_t dec2table[] = { 0, 0, 0, -1, 0, 1, 2, 3 };
+-			size_t dec2 = dec2table[op - ref];
++			grub_size_t dec2table[] = { 0, 0, 0, -1, 0, 1, 2, 3 };
++			grub_size_t dec2 = dec2table[op - ref];
+ #else
+ 			const int dec2 = 0;
+ #endif
+-- 
+2.13.4
+
diff --git a/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch b/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch
new file mode 100644
index 0000000..ce736cf
--- /dev/null
+++ b/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch
@@ -0,0 +1,54 @@
+From 76188809d5ca40c5285b0ab202b5edea7be3f04d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
+Date: Thu, 22 Jun 2017 14:33:17 +0200
+Subject: [PATCH 052/192] udf: Fix reading label, lvd.ident is dstring
+
+UDF dstring has stored length in the last byte of buffer. Therefore last
+byte is not part of recorded characters. And empty string in dstring is
+encoded as empty buffer, including first byte (compression id).
+---
+ grub-core/fs/udf.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
+index 839bff889..258745633 100644
+--- a/grub-core/fs/udf.c
++++ b/grub-core/fs/udf.c
+@@ -860,6 +860,25 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf)
+   return outbuf;
+ }
+ 
++static char *
++read_dstring (const grub_uint8_t *raw, grub_size_t sz)
++{
++  grub_size_t len;
++
++  if (raw[0] == 0) {
++      char *outbuf = grub_malloc (1);
++      if (!outbuf)
++	return NULL;
++      outbuf[0] = 0;
++      return outbuf;
++    }
++
++  len = raw[sz - 1];
++  if (len > sz - 1)
++    len = sz - 1;
++  return read_string (raw, len, NULL);
++}
++
+ static int
+ grub_udf_iterate_dir (grub_fshelp_node_t dir,
+ 		      grub_fshelp_iterate_dir_hook_t hook, void *hook_data)
+@@ -1197,7 +1216,7 @@ grub_udf_label (grub_device_t device, char **label)
+ 
+   if (data)
+     {
+-      *label = read_string (data->lvd.ident, sizeof (data->lvd.ident), 0);
++      *label = read_dstring (data->lvd.ident, sizeof (data->lvd.ident));
+       grub_free (data);
+     }
+   else
+-- 
+2.13.4
+
diff --git a/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch b/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch
new file mode 100644
index 0000000..53c920e
--- /dev/null
+++ b/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch
@@ -0,0 +1,191 @@
+From 435fa75e01ef40917239c7f775e505e86f70d202 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
+Date: Thu, 22 Jun 2017 14:42:16 +0200
+Subject: [PATCH 053/192] * grub-core/fs/udf.c: Add support for UUID
+
+Use same algorithm as in libblkid from util-linux v2.30.
+
+1. Take first 16 bytes from UTF-8 encoded string of VolumeSetIdentifier
+2. If all bytes are hexadecimal digits, convert to lowercase and use as UUID
+3. If first 8 bytes are not all hexadecimal digits, convert those 8 bytes
+   to their hexadecimal representation, resulting in 16 bytes for UUID
+4. Otherwise, compose UUID from two parts:
+   1. part: converted first 8 bytes (which are hexadecimal digits) to lowercase
+   2. part: encoded following 4 bytes to their hexadecimal representation (16 bytes)
+
+So UUID would always have 16 hexadecimal digits in lowercase variant.
+
+According to UDF specification, first 16 Unicode characters of
+VolumeSetIdentifier should be unique value and first 8 should be
+hexadecimal characters.
+
+In most cases all 16 characters are hexadecimal, but e.g. MS Windows
+format.exe set only first 8 as hexadecimal and remaining as fixed
+(non-unique) which violates specification.
+---
+ grub-core/fs/udf.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 120 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
+index 258745633..00a16098b 100644
+--- a/grub-core/fs/udf.c
++++ b/grub-core/fs/udf.c
+@@ -321,6 +321,32 @@ struct grub_udf_partmap
+   };
+ } GRUB_PACKED;
+ 
++struct grub_udf_pvd
++{
++  struct grub_udf_tag tag;
++  grub_uint32_t seq_num;
++  grub_uint32_t pvd_num;
++  grub_uint8_t ident[32];
++  grub_uint16_t vol_seq_num;
++  grub_uint16_t max_vol_seq_num;
++  grub_uint16_t interchange_level;
++  grub_uint16_t max_interchange_level;
++  grub_uint32_t charset_list;
++  grub_uint32_t max_charset_list;
++  grub_uint8_t volset_ident[128];
++  struct grub_udf_charspec desc_charset;
++  struct grub_udf_charspec expl_charset;
++  struct grub_udf_extent_ad vol_abstract;
++  struct grub_udf_extent_ad vol_copyright;
++  struct grub_udf_regid app_ident;
++  struct grub_udf_timestamp recording_time;
++  struct grub_udf_regid imp_ident;
++  grub_uint8_t imp_use[64];
++  grub_uint32_t pred_vds_loc;
++  grub_uint16_t flags;
++  grub_uint8_t reserved[22];
++} GRUB_PACKED;
++
+ struct grub_udf_lvd
+ {
+   struct grub_udf_tag tag;
+@@ -348,6 +374,7 @@ struct grub_udf_aed
+ struct grub_udf_data
+ {
+   grub_disk_t disk;
++  struct grub_udf_pvd pvd;
+   struct grub_udf_lvd lvd;
+   struct grub_udf_pd pds[GRUB_UDF_MAX_PDS];
+   struct grub_udf_partmap *pms[GRUB_UDF_MAX_PMS];
+@@ -692,7 +719,17 @@ grub_udf_mount (grub_disk_t disk)
+ 	}
+ 
+       tag.tag_ident = U16 (tag.tag_ident);
+-      if (tag.tag_ident == GRUB_UDF_TAG_IDENT_PD)
++      if (tag.tag_ident == GRUB_UDF_TAG_IDENT_PVD)
++	{
++	  if (grub_disk_read (disk, block << lbshift, 0,
++			      sizeof (struct grub_udf_pvd),
++			      &data->pvd))
++	    {
++	      grub_error (GRUB_ERR_BAD_FS, "not an UDF filesystem");
++	      goto fail;
++	    }
++	}
++      else if (tag.tag_ident == GRUB_UDF_TAG_IDENT_PD)
+ 	{
+ 	  if (data->npd >= GRUB_UDF_MAX_PDS)
+ 	    {
+@@ -1225,6 +1262,87 @@ grub_udf_label (grub_device_t device, char **label)
+   return grub_errno;
+ }
+ 
++static char *
++gen_uuid_from_volset (char *volset_ident)
++{
++  grub_size_t i;
++  grub_size_t len;
++  grub_size_t nonhexpos;
++  grub_uint8_t buf[17];
++  char *uuid;
++
++  len = grub_strlen (volset_ident);
++  if (len < 8)
++    return NULL;
++
++  uuid = grub_malloc (17);
++  if (!uuid)
++    return NULL;
++
++  if (len > 16)
++    len = 16;
++
++  grub_memset (buf, 0, sizeof (buf));
++  grub_memcpy (buf, volset_ident, len);
++
++  nonhexpos = 16;
++  for (i = 0; i < 16; ++i)
++    {
++      if (!grub_isxdigit (buf[i]))
++        {
++          nonhexpos = i;
++          break;
++        }
++    }
++
++  if (nonhexpos < 8)
++    {
++      grub_snprintf (uuid, 17, "%02x%02x%02x%02x%02x%02x%02x%02x",
++                    buf[0], buf[1], buf[2], buf[3],
++                    buf[4], buf[5], buf[6], buf[7]);
++    }
++  else if (nonhexpos < 16)
++    {
++      for (i = 0; i < 8; ++i)
++        uuid[i] = grub_tolower (buf[i]);
++      grub_snprintf (uuid+8, 9, "%02x%02x%02x%02x",
++                    buf[8], buf[9], buf[10], buf[11]);
++    }
++  else
++    {
++      for (i = 0; i < 16; ++i)
++        uuid[i] = grub_tolower (buf[i]);
++      uuid[16] = 0;
++    }
++
++  return uuid;
++}
++
++static grub_err_t
++grub_udf_uuid (grub_device_t device, char **uuid)
++{
++  char *volset_ident;
++  struct grub_udf_data *data;
++  data = grub_udf_mount (device->disk);
++
++  if (data)
++    {
++      volset_ident = read_dstring (data->pvd.volset_ident, sizeof (data->pvd.volset_ident));
++      if (volset_ident)
++        {
++          *uuid = gen_uuid_from_volset (volset_ident);
++          grub_free (volset_ident);
++        }
++      else
++        *uuid = 0;
++      grub_free (data);
++    }
++  else
++    *uuid = 0;
++
++  return grub_errno;
++}
++
+ static struct grub_fs grub_udf_fs = {
+   .name = "udf",
+   .dir = grub_udf_dir,
+@@ -1232,6 +1350,7 @@ static struct grub_fs grub_udf_fs = {
+   .read = grub_udf_read,
+   .close = grub_udf_close,
+   .label = grub_udf_label,
++  .uuid = grub_udf_uuid,
+ #ifdef GRUB_UTIL
+   .reserved_first_sector = 1,
+   .blocklist_install = 1,
+-- 
+2.13.4
+
diff --git a/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch b/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch
new file mode 100644
index 0000000..4ea9e95
--- /dev/null
+++ b/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch
@@ -0,0 +1,50 @@
+From 9e962fd3c42081e2eef1f99a0eaab38fd04d2620 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Mon, 7 Aug 2017 18:05:17 +0200
+Subject: [PATCH 054/192] mkrescue: Check xorriso presence before doing
+ anything else.
+
+mkrescue can't do anything useful without xorriso, so abort early if it's
+not available.
+---
+ util/grub-mkrescue.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
+index 238d4840e..38f154397 100644
+--- a/util/grub-mkrescue.c
++++ b/util/grub-mkrescue.c
+@@ -323,6 +323,7 @@ check_xorriso (const char *val)
+   char *buf = NULL;
+   size_t len = 0;
+   int ret = 0;
++  int wstatus = 0;
+ 
+   argv[0] = xorriso;
+   argv[1] = "-as";
+@@ -347,8 +348,10 @@ check_xorriso (const char *val)
+     }
+ 
+   close (fd);
+-  waitpid (pid, NULL, 0);
++  waitpid (pid, &wstatus, 0);
+   free (buf);
++  if (!WIFEXITED (wstatus) || WEXITSTATUS(wstatus) != 0)
++    return 0;
+   return ret;
+ }
+ 
+@@ -478,6 +481,10 @@ main (int argc, char *argv[])
+   if (!output_image)
+     grub_util_error ("%s", _("output file must be specified"));
+ 
++  if (!check_xorriso ("graft-points")) {
++    grub_util_error ("%s", _("xorriso not found"));
++  }
++
+   grub_init_all ();
+   grub_hostfs_init ();
+   grub_host_init ();
+-- 
+2.13.4
+
diff --git a/0055-Fail-if-xorriso-failed.patch b/0055-Fail-if-xorriso-failed.patch
new file mode 100644
index 0000000..2de8c81
--- /dev/null
+++ b/0055-Fail-if-xorriso-failed.patch
@@ -0,0 +1,44 @@
+From e66dc5d71ebfc9763420a76c274e6980d54641c3 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Mon, 7 Aug 2017 18:08:39 +0200
+Subject: [PATCH 055/192] Fail if xorriso failed.
+
+If xorriso failed most likely we didn't generate a meaningful image.
+---
+ util/grub-mkrescue.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
+index 38f154397..9545945d8 100644
+--- a/util/grub-mkrescue.c
++++ b/util/grub-mkrescue.c
+@@ -429,6 +429,7 @@ main (int argc, char *argv[])
+   char **argp_argv;
+   int xorriso_tail_argc;
+   char **xorriso_tail_argv;
++  int rv;
+ 
+   grub_util_host_init (&argc, &argv);
+   grub_util_disable_fd_syncs ();
+@@ -794,7 +795,6 @@ main (int argc, char *argv[])
+       free (efidir_efi_boot);
+ 
+       efiimgfat = grub_util_path_concat (2, iso9660_dir, "efi.img");
+-      int rv;
+       rv = grub_util_exec ((const char * []) { "mformat", "-C", "-f", "2880", "-L", "16", "-i",
+ 	    efiimgfat, "::", NULL });
+       if (rv != 0)
+@@ -967,7 +967,9 @@ main (int argc, char *argv[])
+ 
+   xorriso_argv[xorriso_argc] = NULL;
+ 
+-  grub_util_exec ((const char *const *)xorriso_argv);
++  rv = grub_util_exec ((const char *const *)xorriso_argv);
++  if (rv != 0)
++    grub_util_error ("`%s` invocation failed\n", "xorriso");
+ 
+   grub_util_unlink_recursive (iso9660_dir);
+ 
+-- 
+2.13.4
+
diff --git a/0056-efi-refactor-grub_efi_allocate_pages.patch b/0056-efi-refactor-grub_efi_allocate_pages.patch
new file mode 100644
index 0000000..2b8390d
--- /dev/null
+++ b/0056-efi-refactor-grub_efi_allocate_pages.patch
@@ -0,0 +1,120 @@
+From dd5fde2df83c5c03b7ba04d2cc5b7be96de8da7b Mon Sep 17 00:00:00 2001
+From: Leif Lindholm <leif.lindholm@linaro.org>
+Date: Thu, 3 Aug 2017 11:04:23 +0100
+Subject: [PATCH 056/192] efi: refactor grub_efi_allocate_pages
+
+Expose a new function, grub_efi_allocate_pages_real(), making it possible
+to specify allocation type and memory type as supported by the UEFI
+AllocatePages boot service.
+
+Make grub_efi_allocate_pages() a consumer of the new function,
+maintaining its old functionality.
+
+Also delete some left-around #if 1/#else blocks in the affected
+functions.
+
+Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
+---
+ grub-core/kern/efi/mm.c | 46 ++++++++++++++++++++++++----------------------
+ include/grub/efi/efi.h  |  5 +++++
+ 2 files changed, 29 insertions(+), 22 deletions(-)
+
+diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
+index 20a47aaf5..d88bc5e43 100644
+--- a/grub-core/kern/efi/mm.c
++++ b/grub-core/kern/efi/mm.c
+@@ -51,36 +51,20 @@ int grub_efi_is_finished = 0;
+ 
+ /* Allocate pages. Return the pointer to the first of allocated pages.  */
+ void *
+-grub_efi_allocate_pages (grub_efi_physical_address_t address,
+-			 grub_efi_uintn_t pages)
++grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
++			      grub_efi_uintn_t pages,
++			      grub_efi_allocate_type_t alloctype,
++			      grub_efi_memory_type_t memtype)
+ {
+-  grub_efi_allocate_type_t type;
+   grub_efi_status_t status;
+   grub_efi_boot_services_t *b;
+ 
+-#if 1
+   /* Limit the memory access to less than 4GB for 32-bit platforms.  */
+   if (address > GRUB_EFI_MAX_USABLE_ADDRESS)
+     return 0;
+-#endif
+-
+-#if 1
+-  if (address == 0)
+-    {
+-      type = GRUB_EFI_ALLOCATE_MAX_ADDRESS;
+-      address = GRUB_EFI_MAX_USABLE_ADDRESS;
+-    }
+-  else
+-    type = GRUB_EFI_ALLOCATE_ADDRESS;
+-#else
+-  if (address == 0)
+-    type = GRUB_EFI_ALLOCATE_ANY_PAGES;
+-  else
+-    type = GRUB_EFI_ALLOCATE_ADDRESS;
+-#endif
+ 
+   b = grub_efi_system_table->boot_services;
+-  status = efi_call_4 (b->allocate_pages, type, GRUB_EFI_LOADER_DATA, pages, &address);
++  status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &address);
+   if (status != GRUB_EFI_SUCCESS)
+     return 0;
+ 
+@@ -89,7 +73,7 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address,
+       /* Uggh, the address 0 was allocated... This is too annoying,
+ 	 so reallocate another one.  */
+       address = GRUB_EFI_MAX_USABLE_ADDRESS;
+-      status = efi_call_4 (b->allocate_pages, type, GRUB_EFI_LOADER_DATA, pages, &address);
++      status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &address);
+       grub_efi_free_pages (0, pages);
+       if (status != GRUB_EFI_SUCCESS)
+ 	return 0;
+@@ -98,6 +82,24 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address,
+   return (void *) ((grub_addr_t) address);
+ }
+ 
++void *
++grub_efi_allocate_pages (grub_efi_physical_address_t address,
++			 grub_efi_uintn_t pages)
++{
++  grub_efi_allocate_type_t alloctype;
++
++  if (address == 0)
++    {
++      alloctype = GRUB_EFI_ALLOCATE_MAX_ADDRESS;
++      address = GRUB_EFI_MAX_USABLE_ADDRESS;
++    }
++  else
++    alloctype = GRUB_EFI_ALLOCATE_ADDRESS;
++
++  return grub_efi_allocate_pages_real (address, pages, alloctype,
++				       GRUB_EFI_LOADER_DATA);
++}
++
+ /* Free pages starting from ADDRESS.  */
+ void
+ grub_efi_free_pages (grub_efi_physical_address_t address,
+diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
+index e9c601f34..b4cbebf38 100644
+--- a/include/grub/efi/efi.h
++++ b/include/grub/efi/efi.h
+@@ -38,6 +38,11 @@ void *EXPORT_FUNC(grub_efi_open_protocol) (grub_efi_handle_t handle,
+ int EXPORT_FUNC(grub_efi_set_text_mode) (int on);
+ void EXPORT_FUNC(grub_efi_stall) (grub_efi_uintn_t microseconds);
+ void *
++EXPORT_FUNC(grub_efi_allocate_pages_real) (grub_efi_physical_address_t address,
++				           grub_efi_uintn_t pages,
++					   grub_efi_allocate_type_t alloctype,
++					   grub_efi_memory_type_t memtype);
++void *
+ EXPORT_FUNC(grub_efi_allocate_pages) (grub_efi_physical_address_t address,
+ 				      grub_efi_uintn_t pages);
+ void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
+-- 
+2.13.4
+
diff --git a/0057-Remove-grub_efi_allocate_pages.patch b/0057-Remove-grub_efi_allocate_pages.patch
new file mode 100644
index 0000000..207fc05
--- /dev/null
+++ b/0057-Remove-grub_efi_allocate_pages.patch
@@ -0,0 +1,252 @@
+From 4bc909bf89f5b4ff86c9e4e609d4fe0c11a66b0c Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Mon, 7 Aug 2017 18:33:29 +0200
+Subject: [PATCH 057/192] Remove grub_efi_allocate_pages.
+
+grub_efi_allocate_pages Essentially does 2 unrelated things:
+* Allocate at fixed address.
+* Allocate at any address.
+
+To switch between 2 different functions it uses address == 0 as magic
+value which is wrong as 0 is a perfectly valid fixed adress to allocate at.
+---
+ grub-core/kern/arm/efi/misc.c     |  4 ++--
+ grub-core/kern/efi/mm.c           | 30 ++++++++++++++----------------
+ grub-core/loader/arm64/fdt.c      |  2 +-
+ grub-core/loader/arm64/linux.c    |  7 +++----
+ grub-core/loader/arm64/xen_boot.c |  7 +++----
+ grub-core/loader/ia64/efi/linux.c | 10 +++++-----
+ include/grub/autoefi.h            |  2 +-
+ include/grub/efi/efi.h            |  4 +++-
+ 8 files changed, 32 insertions(+), 34 deletions(-)
+
+diff --git a/grub-core/kern/arm/efi/misc.c b/grub-core/kern/arm/efi/misc.c
+index 7cd41842a..c95e8299d 100644
+--- a/grub-core/kern/arm/efi/misc.c
++++ b/grub-core/kern/arm/efi/misc.c
+@@ -146,7 +146,7 @@ grub_efi_allocate_loader_memory (grub_uint32_t min_offset, grub_uint32_t size)
+ 	continue;
+       grub_dprintf("mm", "%s: let's allocate some (0x%x) pages @ 0x%08x...\n",
+ 		  __FUNCTION__, (size >> PAGE_SHIFT), (grub_addr_t) start);
+-      mem = grub_efi_allocate_pages (start, (size >> PAGE_SHIFT) + 1);
++      mem = grub_efi_allocate_fixed (start, (size >> PAGE_SHIFT) + 1);
+       grub_dprintf("mm", "%s: retval=0x%08x\n",
+ 		   __FUNCTION__, (grub_addr_t) mem);
+       if (! mem)
+@@ -189,7 +189,7 @@ grub_efi_prepare_platform (void)
+   mmap_size = find_mmap_size ();
+   if (! mmap_size)
+     return GRUB_ERR_OUT_OF_MEMORY;
+-  mmap_buf = grub_efi_allocate_pages (0, page_align (mmap_size) >> 12);
++  mmap_buf = grub_efi_allocate_any_pages (page_align (mmap_size) >> 12);
+   if (! mmap_buf)
+     return GRUB_ERR_OUT_OF_MEMORY;
+ 
+diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
+index d88bc5e43..b97b05fe8 100644
+--- a/grub-core/kern/efi/mm.c
++++ b/grub-core/kern/efi/mm.c
+@@ -83,20 +83,19 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
+ }
+ 
+ void *
+-grub_efi_allocate_pages (grub_efi_physical_address_t address,
+-			 grub_efi_uintn_t pages)
++grub_efi_allocate_any_pages (grub_efi_uintn_t pages)
+ {
+-  grub_efi_allocate_type_t alloctype;
+-
+-  if (address == 0)
+-    {
+-      alloctype = GRUB_EFI_ALLOCATE_MAX_ADDRESS;
+-      address = GRUB_EFI_MAX_USABLE_ADDRESS;
+-    }
+-  else
+-    alloctype = GRUB_EFI_ALLOCATE_ADDRESS;
++  return grub_efi_allocate_pages_real (GRUB_EFI_MAX_USABLE_ADDRESS,
++				       pages, GRUB_EFI_ALLOCATE_MAX_ADDRESS,
++				       GRUB_EFI_LOADER_DATA);
++}
+ 
+-  return grub_efi_allocate_pages_real (address, pages, alloctype,
++void *
++grub_efi_allocate_fixed (grub_efi_physical_address_t address,
++			 grub_efi_uintn_t pages)
++{
++  return grub_efi_allocate_pages_real (address, pages,
++				       GRUB_EFI_ALLOCATE_ADDRESS,
+ 				       GRUB_EFI_LOADER_DATA);
+ }
+ 
+@@ -404,7 +403,7 @@ add_memory_regions (grub_efi_memory_descriptor_t *memory_map,
+ 	  pages = required_pages;
+ 	}
+ 
+-      addr = grub_efi_allocate_pages (start, pages);
++      addr = grub_efi_allocate_fixed (start, pages);
+       if (! addr)
+ 	grub_fatal ("cannot allocate conventional memory %p with %u pages",
+ 		    (void *) ((grub_addr_t) start),
+@@ -456,8 +455,7 @@ grub_efi_mm_init (void)
+   int mm_status;
+ 
+   /* Prepare a memory region to store two memory maps.  */
+-  memory_map = grub_efi_allocate_pages (0,
+-					2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
++  memory_map = grub_efi_allocate_any_pages (2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
+   if (! memory_map)
+     grub_fatal ("cannot allocate memory");
+ 
+@@ -475,7 +473,7 @@ grub_efi_mm_init (void)
+       /* Freeing/allocating operations may increase memory map size.  */
+       map_size += desc_size * 32;
+ 
+-      memory_map = grub_efi_allocate_pages (0, 2 * BYTES_TO_PAGES (map_size));
++      memory_map = grub_efi_allocate_any_pages (2 * BYTES_TO_PAGES (map_size));
+       if (! memory_map)
+ 	grub_fatal ("cannot allocate memory");
+ 
+diff --git a/grub-core/loader/arm64/fdt.c b/grub-core/loader/arm64/fdt.c
+index db49cf649..368001696 100644
+--- a/grub-core/loader/arm64/fdt.c
++++ b/grub-core/loader/arm64/fdt.c
+@@ -50,7 +50,7 @@ grub_fdt_load (grub_size_t additional_size)
+   size += additional_size;
+ 
+   grub_dprintf ("linux", "allocating %ld bytes for fdt\n", size);
+-  fdt = grub_efi_allocate_pages (0, GRUB_EFI_BYTES_TO_PAGES (size));
++  fdt = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (size));
+   if (!fdt)
+     return NULL;
+ 
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index 9519d2e4d..ee3fcaa86 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -148,8 +148,7 @@ grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, char *args)
+   loaded_image->load_options_size = len =
+     (grub_strlen (args) + 1) * sizeof (grub_efi_char16_t);
+   loaded_image->load_options =
+-    grub_efi_allocate_pages (0,
+-			     GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
++    grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
+   if (!loaded_image->load_options)
+     return grub_errno;
+ 
+@@ -223,7 +222,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+   grub_dprintf ("linux", "Loading initrd\n");
+ 
+   initrd_pages = (GRUB_EFI_BYTES_TO_PAGES (initrd_size));
+-  initrd_mem = grub_efi_allocate_pages (0, initrd_pages);
++  initrd_mem = grub_efi_allocate_any_pages (initrd_pages);
+   if (!initrd_mem)
+     {
+       grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
+@@ -277,7 +276,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   grub_loader_unset();
+ 
+   grub_dprintf ("linux", "kernel file size: %lld\n", (long long) kernel_size);
+-  kernel_addr = grub_efi_allocate_pages (0, GRUB_EFI_BYTES_TO_PAGES (kernel_size));
++  kernel_addr = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (kernel_size));
+   grub_dprintf ("linux", "kernel numpages: %lld\n",
+ 		(long long) GRUB_EFI_BYTES_TO_PAGES (kernel_size));
+   if (!kernel_addr)
+diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
+index 27ede46ca..6c145a771 100644
+--- a/grub-core/loader/arm64/xen_boot.c
++++ b/grub-core/loader/arm64/xen_boot.c
+@@ -324,10 +324,9 @@ xen_boot_binary_load (struct xen_boot_binary *binary, grub_file_t file,
+   grub_dprintf ("xen_loader", "Xen_boot file size: 0x%lx\n", binary->size);
+ 
+   binary->start
+-    = (grub_addr_t) grub_efi_allocate_pages (0,
+-					     GRUB_EFI_BYTES_TO_PAGES
+-					     (binary->size +
+-					      binary->align));
++    = (grub_addr_t) grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES
++						 (binary->size +
++						  binary->align));
+   if (!binary->start)
+     {
+       grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
+diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
+index efaa42ccd..750330d45 100644
+--- a/grub-core/loader/ia64/efi/linux.c
++++ b/grub-core/loader/ia64/efi/linux.c
+@@ -252,7 +252,7 @@ allocate_pages (grub_uint64_t align, grub_uint64_t size_pages,
+ 	aligned_start += align;
+       if (aligned_start + size > end)
+ 	continue;
+-      mem = grub_efi_allocate_pages (aligned_start, size_pages);
++      mem = grub_efi_allocate_fixed (aligned_start, size_pages);
+       if (! mem)
+ 	{
+ 	  grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate memory");
+@@ -326,7 +326,7 @@ grub_linux_boot (void)
+   mmap_size = find_mmap_size ();
+   if (! mmap_size)
+     return grub_errno;
+-  mmap_buf = grub_efi_allocate_pages (0, page_align (mmap_size) >> 12);
++  mmap_buf = grub_efi_allocate_any_pages (page_align (mmap_size) >> 12);
+   if (! mmap_buf)
+     return grub_error (GRUB_ERR_IO, "cannot allocate memory map");
+   err = grub_efi_finish_boot_services (&mmap_size, mmap_buf, &map_key,
+@@ -422,7 +422,7 @@ grub_load_elf64 (grub_file_t file, void *buffer, const char *filename)
+   relocate = grub_env_get ("linux_relocate");
+   if (!relocate || grub_strcmp (relocate, "force") != 0)
+     {
+-      kernel_mem = grub_efi_allocate_pages (low_addr, kernel_pages);
++      kernel_mem = grub_efi_allocate_fixed (low_addr, kernel_pages);
+       reloc_offset = 0;
+     }
+   /* Try to relocate.  */
+@@ -524,7 +524,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+     len += grub_strlen (argv[i]) + 1;
+   len += sizeof (struct ia64_boot_param) + 512; /* Room for extensions.  */
+   boot_param_pages = page_align (len) >> 12;
+-  boot_param = grub_efi_allocate_pages (0, boot_param_pages);
++  boot_param = grub_efi_allocate_any_pages (boot_param_pages);
+   if (boot_param == 0)
+     {
+       grub_error (GRUB_ERR_OUT_OF_MEMORY,
+@@ -589,7 +589,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+   grub_dprintf ("linux", "Loading initrd\n");
+ 
+   initrd_pages = (page_align (initrd_size) >> 12);
+-  initrd_mem = grub_efi_allocate_pages (0, initrd_pages);
++  initrd_mem = grub_efi_allocate_any_pages (initrd_pages);
+   if (! initrd_mem)
+     {
+       grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate pages");
+diff --git a/include/grub/autoefi.h b/include/grub/autoefi.h
+index b75591176..b7a252e07 100644
+--- a/include/grub/autoefi.h
++++ b/include/grub/autoefi.h
+@@ -55,7 +55,7 @@ static inline grub_err_t grub_autoefi_prepare (void)
+ # define SYSTEM_TABLE_PTR GRUB_EFIEMU_SYSTEM_TABLE_PTR
+ # define SIZEOF_OF_UINTN GRUB_EFIEMU_SIZEOF_OF_UINTN
+ # define SYSTEM_TABLE GRUB_EFIEMU_SYSTEM_TABLE
+-# define grub_efi_allocate_pages(x,y) (x)
++# define grub_efi_allocate_fixed(x,y) (x)
+ # define grub_efi_free_pages(x,y) GRUB_EFI_SUCCESS
+ # define grub_autoefi_finish_boot_services grub_efiemu_finish_boot_services
+ # define EFI_PRESENT 1
+diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
+index b4cbebf38..3fa082816 100644
+--- a/include/grub/efi/efi.h
++++ b/include/grub/efi/efi.h
+@@ -43,8 +43,10 @@ EXPORT_FUNC(grub_efi_allocate_pages_real) (grub_efi_physical_address_t address,
+ 					   grub_efi_allocate_type_t alloctype,
+ 					   grub_efi_memory_type_t memtype);
+ void *
+-EXPORT_FUNC(grub_efi_allocate_pages) (grub_efi_physical_address_t address,
++EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
+ 				      grub_efi_uintn_t pages);
++void *
++EXPORT_FUNC(grub_efi_allocate_any_pages) (grub_efi_uintn_t pages);
+ void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
+ 				       grub_efi_uintn_t pages);
+ int
+-- 
+2.13.4
+
diff --git a/0058-efi-move-fdt-helper-library.patch b/0058-efi-move-fdt-helper-library.patch
new file mode 100644
index 0000000..3ac4ea5
--- /dev/null
+++ b/0058-efi-move-fdt-helper-library.patch
@@ -0,0 +1,93 @@
+From 8c9465fac901caac6802d6872a1374518b001517 Mon Sep 17 00:00:00 2001
+From: Leif Lindholm <leif.lindholm@linaro.org>
+Date: Thu, 3 Aug 2017 11:04:24 +0100
+Subject: [PATCH 058/192] efi: move fdt helper library
+
+There is nothing ARM64 (or even ARM) specific about the efi fdt helper
+library, which is used for locating or overriding a firmware-provided
+devicetree in a UEFI system - so move it to loader/efi for reuse.
+
+Move the fdtload.h include file to grub/efi and update path to
+efi/fdtload.h in source code referring to it.
+
+Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
+---
+ grub-core/Makefile.core.def           | 2 +-
+ grub-core/loader/arm64/linux.c        | 2 +-
+ grub-core/loader/arm64/xen_boot.c     | 2 +-
+ grub-core/loader/{arm64 => efi}/fdt.c | 2 +-
+ include/grub/{arm64 => efi}/fdtload.h | 0
+ 5 files changed, 4 insertions(+), 4 deletions(-)
+ rename grub-core/loader/{arm64 => efi}/fdt.c (99%)
+ rename include/grub/{arm64 => efi}/fdtload.h (100%)
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 1d86bd22e..a65c27f7f 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -1707,7 +1707,7 @@ module = {
+ 
+ module = {
+   name = fdt;
+-  arm64 = loader/arm64/fdt.c;
++  arm64 = loader/efi/fdt.c;
+   common = lib/fdt.c;
+   enable = fdt;
+ };
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index ee3fcaa86..3e2f9b742 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -26,8 +26,8 @@
+ #include <grub/mm.h>
+ #include <grub/types.h>
+ #include <grub/cpu/linux.h>
+-#include <grub/cpu/fdtload.h>
+ #include <grub/efi/efi.h>
++#include <grub/efi/fdtload.h>
+ #include <grub/efi/pe32.h>
+ #include <grub/i18n.h>
+ #include <grub/lib/cmdline.h>
+diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
+index 6c145a771..c95d6c5a8 100644
+--- a/grub-core/loader/arm64/xen_boot.c
++++ b/grub-core/loader/arm64/xen_boot.c
+@@ -27,9 +27,9 @@
+ #include <grub/misc.h>
+ #include <grub/mm.h>
+ #include <grub/types.h>
+-#include <grub/cpu/fdtload.h>
+ #include <grub/cpu/linux.h>
+ #include <grub/efi/efi.h>
++#include <grub/efi/fdtload.h>
+ #include <grub/efi/pe32.h>	/* required by struct xen_hypervisor_header */
+ #include <grub/i18n.h>
+ #include <grub/lib/cmdline.h>
+diff --git a/grub-core/loader/arm64/fdt.c b/grub-core/loader/efi/fdt.c
+similarity index 99%
+rename from grub-core/loader/arm64/fdt.c
+rename to grub-core/loader/efi/fdt.c
+index 368001696..091e9ddf4 100644
+--- a/grub-core/loader/arm64/fdt.c
++++ b/grub-core/loader/efi/fdt.c
+@@ -18,12 +18,12 @@
+ 
+ #include <grub/fdt.h>
+ #include <grub/mm.h>
+-#include <grub/cpu/fdtload.h>
+ #include <grub/err.h>
+ #include <grub/dl.h>
+ #include <grub/command.h>
+ #include <grub/file.h>
+ #include <grub/efi/efi.h>
++#include <grub/efi/fdtload.h>
+ 
+ static void *loaded_fdt;
+ static void *fdt;
+diff --git a/include/grub/arm64/fdtload.h b/include/grub/efi/fdtload.h
+similarity index 100%
+rename from include/grub/arm64/fdtload.h
+rename to include/grub/efi/fdtload.h
+-- 
+2.13.4
+
diff --git a/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch b/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch
new file mode 100644
index 0000000..74da631
--- /dev/null
+++ b/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch
@@ -0,0 +1,59 @@
+From c5841ba7f0d14c193f20854e7e55b4f7ce9207d5 Mon Sep 17 00:00:00 2001
+From: Leif Lindholm <leif.lindholm@linaro.org>
+Date: Thu, 3 Aug 2017 11:04:25 +0100
+Subject: [PATCH 059/192] efi: Add GRUB_PE32_MAGIC definition
+
+Add a generic GRUB_PE32_MAGIC definition for the PE 'MZ' tag and delete
+the existing one in arm64/linux.h.
+
+Update arm64 Linux loader to use this new definition.
+
+Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
+---
+ grub-core/loader/arm64/linux.c | 2 +-
+ include/grub/arm64/linux.h     | 2 --
+ include/grub/efi/pe32.h        | 2 ++
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index 3e2f9b742..a652ee908 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -52,7 +52,7 @@ grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh)
+   if (lh->magic != GRUB_ARM64_LINUX_MAGIC)
+     return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
+ 
+-  if ((lh->code0 & 0xffff) != GRUB_EFI_PE_MAGIC)
++  if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC)
+     return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+ 		       N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));
+ 
+diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
+index 1ea23696e..a981df5d1 100644
+--- a/include/grub/arm64/linux.h
++++ b/include/grub/arm64/linux.h
+@@ -23,8 +23,6 @@
+ 
+ #define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */
+ 
+-#define GRUB_EFI_PE_MAGIC	0x5A4D
+-
+ /* From linux/Documentation/arm64/booting.txt */
+ struct grub_arm64_linux_kernel_header
+ {
+diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
+index f79c36c02..7d44732d2 100644
+--- a/include/grub/efi/pe32.h
++++ b/include/grub/efi/pe32.h
+@@ -45,6 +45,8 @@
+ 
+ #define GRUB_PE32_MSDOS_STUB_SIZE	0x80
+ 
++#define GRUB_PE32_MAGIC			0x5a4d
++
+ /* According to the spec, the minimal alignment is 512 bytes...
+    But some examples (such as EFI drivers in the Intel
+    Sample Implementation) use 32 bytes (0x20) instead, and it seems
+-- 
+2.13.4
+
diff --git a/0060-arm64-linux-loader-improve-type-portability.patch b/0060-arm64-linux-loader-improve-type-portability.patch
new file mode 100644
index 0000000..1f8dcdc
--- /dev/null
+++ b/0060-arm64-linux-loader-improve-type-portability.patch
@@ -0,0 +1,115 @@
+From 91212e0aa07e704a61e4540c18a27f149f5e51c3 Mon Sep 17 00:00:00 2001
+From: Leif Lindholm <leif.lindholm@linaro.org>
+Date: Thu, 3 Aug 2017 11:04:26 +0100
+Subject: [PATCH 060/192] arm64 linux loader: improve type portability
+
+In preparation for turning this into a common loader for 32-bit and 64-bit
+platforms, ensure the code will compile cleanly for either.
+
+Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
+---
+ grub-core/loader/arm64/linux.c | 15 ++++++---------
+ grub-core/loader/efi/fdt.c     |  8 ++++----
+ 2 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index a652ee908..746edd104 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -57,8 +57,6 @@ grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh)
+ 		       N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));
+ 
+   grub_dprintf ("linux", "UEFI stub kernel:\n");
+-  grub_dprintf ("linux", "text_offset = 0x%012llx\n",
+-		(long long unsigned) lh->text_offset);
+   grub_dprintf ("linux", "PE/COFF header @ %08x\n", lh->hdr_offset);
+ 
+   return GRUB_ERR_NONE;
+@@ -86,8 +84,8 @@ finalize_params_linux (void)
+   /* Set initrd info */
+   if (initrd_start && initrd_end > initrd_start)
+     {
+-      grub_dprintf ("linux", "Initrd @ 0x%012lx-0x%012lx\n",
+-		    initrd_start, initrd_end);
++      grub_dprintf ("linux", "Initrd @ %p-%p\n",
++		    (void *) initrd_start, (void *) initrd_end);
+ 
+       retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-start",
+ 				    initrd_start);
+@@ -161,7 +159,7 @@ grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, char *args)
+ 
+   /* When successful, not reached */
+   b->unload_image (image_handle);
+-  grub_efi_free_pages ((grub_efi_physical_address_t) loaded_image->load_options,
++  grub_efi_free_pages ((grub_addr_t) loaded_image->load_options,
+ 		       GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
+ 
+   return grub_errno;
+@@ -188,7 +186,7 @@ grub_linux_unload (void)
+   initrd_start = initrd_end = 0;
+   grub_free (linux_args);
+   if (kernel_addr)
+-    grub_efi_free_pages ((grub_efi_physical_address_t) kernel_addr,
++    grub_efi_free_pages ((grub_addr_t) kernel_addr,
+ 			 GRUB_EFI_BYTES_TO_PAGES (kernel_size));
+   grub_fdt_unload ();
+   return GRUB_ERR_NONE;
+@@ -240,8 +238,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+  fail:
+   grub_initrd_close (&initrd_ctx);
+   if (initrd_mem && !initrd_start)
+-    grub_efi_free_pages ((grub_efi_physical_address_t) initrd_mem,
+-			 initrd_pages);
++    grub_efi_free_pages ((grub_addr_t) initrd_mem, initrd_pages);
+ 
+   return grub_errno;
+ }
+@@ -328,7 +325,7 @@ fail:
+     grub_free (linux_args);
+ 
+   if (kernel_addr && !loaded)
+-    grub_efi_free_pages ((grub_efi_physical_address_t) kernel_addr,
++    grub_efi_free_pages ((grub_addr_t) kernel_addr,
+ 			 GRUB_EFI_BYTES_TO_PAGES (kernel_size));
+ 
+   return grub_errno;
+diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
+index 091e9ddf4..17212c38d 100644
+--- a/grub-core/loader/efi/fdt.c
++++ b/grub-core/loader/efi/fdt.c
+@@ -32,12 +32,12 @@ void *
+ grub_fdt_load (grub_size_t additional_size)
+ {
+   void *raw_fdt;
+-  grub_size_t size;
++  unsigned int size;
+ 
+   if (fdt)
+     {
+       size = GRUB_EFI_BYTES_TO_PAGES (grub_fdt_get_totalsize (fdt));
+-      grub_efi_free_pages ((grub_efi_physical_address_t) fdt, size);
++      grub_efi_free_pages ((grub_addr_t) fdt, size);
+     }
+ 
+   if (loaded_fdt)
+@@ -49,7 +49,7 @@ grub_fdt_load (grub_size_t additional_size)
+     raw_fdt ? grub_fdt_get_totalsize (raw_fdt) : GRUB_FDT_EMPTY_TREE_SZ;
+   size += additional_size;
+ 
+-  grub_dprintf ("linux", "allocating %ld bytes for fdt\n", size);
++  grub_dprintf ("linux", "allocating %d bytes for fdt\n", size);
+   fdt = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (size));
+   if (!fdt)
+     return NULL;
+@@ -88,7 +88,7 @@ grub_fdt_unload (void) {
+   if (!fdt) {
+     return;
+   }
+-  grub_efi_free_pages ((grub_efi_physical_address_t) fdt,
++  grub_efi_free_pages ((grub_addr_t) fdt,
+ 		       GRUB_EFI_BYTES_TO_PAGES (grub_fdt_get_totalsize (fdt)));
+   fdt = NULL;
+ }
+-- 
+2.13.4
+
diff --git a/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch b/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch
new file mode 100644
index 0000000..d3d5191
--- /dev/null
+++ b/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch
@@ -0,0 +1,36 @@
+From f826330683675f0deb55b58fd229afd7d65fb053 Mon Sep 17 00:00:00 2001
+From: Leif Lindholm <leif.lindholm@linaro.org>
+Date: Thu, 3 Aug 2017 11:04:32 +0100
+Subject: [PATCH 061/192] efi: change heap allocation type to
+ GRUB_EFI_LOADER_CODE
+
+With upcoming changes to EDK2, allocations of type EFI_LOADER_DATA may
+not return regions with execute ability. Since modules are loaded onto
+the heap, change the heap allocation type to GRUB_EFI_LOADER_CODE in
+order to permit execution on systems with this feature enabled.
+
+Closes: 50420
+
+Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
+---
+ grub-core/kern/efi/mm.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
+index b97b05fe8..ac2a4c556 100644
+--- a/grub-core/kern/efi/mm.c
++++ b/grub-core/kern/efi/mm.c
+@@ -403,7 +403,9 @@ add_memory_regions (grub_efi_memory_descriptor_t *memory_map,
+ 	  pages = required_pages;
+ 	}
+ 
+-      addr = grub_efi_allocate_fixed (start, pages);
++      addr = grub_efi_allocate_pages_real (start, pages,
++					   GRUB_EFI_ALLOCATE_ADDRESS,
++					   GRUB_EFI_LOADER_CODE);      
+       if (! addr)
+ 	grub_fatal ("cannot allocate conventional memory %p with %u pages",
+ 		    (void *) ((grub_addr_t) start),
+-- 
+2.13.4
+
diff --git a/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch b/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch
new file mode 100644
index 0000000..45efac5
--- /dev/null
+++ b/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch
@@ -0,0 +1,265 @@
+From bdd89d239cd9b4089630bfb5ec862aab8086dca2 Mon Sep 17 00:00:00 2001
+From: Pete Batard <pete@akeo.ie>
+Date: Mon, 7 Aug 2017 16:20:30 +0100
+Subject: [PATCH 062/192] core: use GRUB_TERM_ definitions when handling term
+ characters
+
+* Also use hex value for GRUB_TERM_ESC as '\e' is not in the C standard and is not understood by some compilers
+---
+ grub-core/commands/keylayouts.c    |  6 +++---
+ grub-core/commands/menuentry.c     |  4 ++--
+ grub-core/lib/crypto.c             |  4 ++--
+ grub-core/normal/auth.c            |  6 +++---
+ grub-core/normal/cmdline.c         |  4 ++--
+ grub-core/normal/menu.c            |  2 +-
+ grub-core/normal/menu_entry.c      |  2 +-
+ grub-core/term/efi/console.c       |  2 +-
+ grub-core/term/i386/pc/console.c   |  2 +-
+ grub-core/term/terminfo.c          | 10 +++++-----
+ grub-core/tests/cmdline_cat_test.c |  2 +-
+ grub-core/tests/gfxterm_menu.c     |  2 +-
+ include/grub/term.h                |  3 ++-
+ 13 files changed, 25 insertions(+), 24 deletions(-)
+
+diff --git a/grub-core/commands/keylayouts.c b/grub-core/commands/keylayouts.c
+index f4b773020..f35d3a369 100644
+--- a/grub-core/commands/keylayouts.c
++++ b/grub-core/commands/keylayouts.c
+@@ -40,7 +40,7 @@ static struct grub_keyboard_layout layout_us = {
+     /* 0x10 */ 'm',  'n',  'o',  'p',  'q', 'r', 's', 't',
+     /* 0x18 */ 'u',  'v',  'w',  'x',  'y', 'z', '1', '2',
+     /* 0x20 */ '3',  '4',  '5',  '6',  '7', '8', '9', '0',
+-    /* 0x28 */ '\n', '\e', '\b', '\t', ' ', '-', '=', '[',
++    /* 0x28 */ '\n', GRUB_TERM_ESC, GRUB_TERM_BACKSPACE, GRUB_TERM_TAB, ' ', '-', '=', '[',
+     /* According to usage table 0x31 should be mapped to '/'
+        but testing with real keyboard shows that 0x32 is remapped to '/'.
+        Map 0x31 to 0. 
+@@ -82,8 +82,8 @@ static struct grub_keyboard_layout layout_us = {
+     /* 0x10 */ 'M',  'N',  'O',  'P',  'Q', 'R', 'S', 'T',
+     /* 0x18 */ 'U',  'V',  'W',  'X',  'Y', 'Z', '!', '@',
+     /* 0x20 */ '#',  '$',  '%',  '^',  '&', '*', '(', ')',
+-    /* 0x28 */ '\n' | GRUB_TERM_SHIFT, '\e' | GRUB_TERM_SHIFT, 
+-    /* 0x2a */ '\b' | GRUB_TERM_SHIFT, '\t' | GRUB_TERM_SHIFT, 
++    /* 0x28 */ '\n' | GRUB_TERM_SHIFT, GRUB_TERM_ESC | GRUB_TERM_SHIFT,
++    /* 0x2a */ GRUB_TERM_BACKSPACE | GRUB_TERM_SHIFT, GRUB_TERM_TAB | GRUB_TERM_SHIFT,
+     /* 0x2c */ ' '  | GRUB_TERM_SHIFT,  '_', '+', '{',
+     /* According to usage table 0x31 should be mapped to '/'
+        but testing with real keyboard shows that 0x32 is remapped to '/'.
+diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
+index 58d4dadf6..2c5363da7 100644
+--- a/grub-core/commands/menuentry.c
++++ b/grub-core/commands/menuentry.c
+@@ -52,8 +52,8 @@ static struct
+   int key;
+ } hotkey_aliases[] =
+   {
+-    {"backspace", '\b'},
+-    {"tab", '\t'},
++    {"backspace", GRUB_TERM_BACKSPACE},
++    {"tab", GRUB_TERM_TAB},
+     {"delete", GRUB_TERM_KEY_DC},
+     {"insert", GRUB_TERM_KEY_INSERT},
+     {"f1", GRUB_TERM_KEY_F1},
+diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
+index 683a8aaa7..ca334d5a4 100644
+--- a/grub-core/lib/crypto.c
++++ b/grub-core/lib/crypto.c
+@@ -462,7 +462,7 @@ grub_password_get (char buf[], unsigned buf_size)
+       if (key == '\n' || key == '\r')
+ 	break;
+ 
+-      if (key == '\e')
++      if (key == GRUB_TERM_ESC)
+ 	{
+ 	  cur_len = 0;
+ 	  break;
+@@ -487,7 +487,7 @@ grub_password_get (char buf[], unsigned buf_size)
+   grub_xputs ("\n");
+   grub_refresh ();
+ 
+-  return (key != '\e');
++  return (key != GRUB_TERM_ESC);
+ }
+ #endif
+ 
+diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
+index 7338f8245..6be678c0d 100644
+--- a/grub-core/normal/auth.c
++++ b/grub-core/normal/auth.c
+@@ -166,13 +166,13 @@ grub_username_get (char buf[], unsigned buf_size)
+       if (key == '\n' || key == '\r')
+ 	break;
+ 
+-      if (key == '\e')
++      if (key == GRUB_TERM_ESC)
+ 	{
+ 	  cur_len = 0;
+ 	  break;
+ 	}
+ 
+-      if (key == '\b')
++      if (key == GRUB_TERM_BACKSPACE)
+ 	{
+ 	  if (cur_len)
+ 	    {
+@@ -197,7 +197,7 @@ grub_username_get (char buf[], unsigned buf_size)
+   grub_xputs ("\n");
+   grub_refresh ();
+ 
+-  return (key != '\e');
++  return (key != GRUB_TERM_ESC);
+ }
+ 
+ grub_err_t
+diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
+index a36180d75..c037d5050 100644
+--- a/grub-core/normal/cmdline.c
++++ b/grub-core/normal/cmdline.c
+@@ -626,12 +626,12 @@ grub_cmdline_get (const char *prompt_translated)
+ 	    cl_insert (cl_terms, nterms, &lpos, &llen, &max_len, &buf, kill_buf);
+ 	  break;
+ 
+-	case '\e':
++	case GRUB_TERM_ESC:
+ 	  grub_free (cl_terms);
+ 	  grub_free (buf);
+ 	  return 0;
+ 
+-	case '\b':
++	case GRUB_TERM_BACKSPACE:
+ 	  if (lpos > 0)
+ 	    {
+ 	      lpos--;
+diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
+index 719e2fb1c..e7a83c2d6 100644
+--- a/grub-core/normal/menu.c
++++ b/grub-core/normal/menu.c
+@@ -763,7 +763,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
+               *auto_boot = 0;
+ 	      return current_entry;
+ 
+-	    case '\e':
++	    case GRUB_TERM_ESC:
+ 	      if (nested)
+ 		{
+ 		  menu_fini ();
+diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
+index eeeee5580..cdf3590a3 100644
+--- a/grub-core/normal/menu_entry.c
++++ b/grub-core/normal/menu_entry.c
+@@ -1403,7 +1403,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
+ 	    goto fail;
+ 	  break;
+ 
+-	case '\e':
++	case GRUB_TERM_ESC:
+ 	  destroy_screen (screen);
+ 	  return;
+ 
+diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
+index 7d31095b1..02f64ea74 100644
+--- a/grub-core/term/efi/console.c
++++ b/grub-core/term/efi/console.c
+@@ -104,7 +104,7 @@ const unsigned efi_codes[] =
+     GRUB_TERM_KEY_DC, GRUB_TERM_KEY_PPAGE, GRUB_TERM_KEY_NPAGE, GRUB_TERM_KEY_F1,
+     GRUB_TERM_KEY_F2, GRUB_TERM_KEY_F3, GRUB_TERM_KEY_F4, GRUB_TERM_KEY_F5,
+     GRUB_TERM_KEY_F6, GRUB_TERM_KEY_F7, GRUB_TERM_KEY_F8, GRUB_TERM_KEY_F9,
+-    GRUB_TERM_KEY_F10, GRUB_TERM_KEY_F11, GRUB_TERM_KEY_F12, '\e'
++    GRUB_TERM_KEY_F10, GRUB_TERM_KEY_F11, GRUB_TERM_KEY_F12, GRUB_TERM_ESC
+   };
+ 
+ static int
+diff --git a/grub-core/term/i386/pc/console.c b/grub-core/term/i386/pc/console.c
+index 28de46b57..f6142a2de 100644
+--- a/grub-core/term/i386/pc/console.c
++++ b/grub-core/term/i386/pc/console.c
+@@ -204,7 +204,7 @@ static int
+ grub_console_getkey (struct grub_term_input *term __attribute__ ((unused)))
+ {
+   const grub_uint16_t bypass_table[] = {
+-    0x0100 | '\e', 0x0f00 | '\t', 0x0e00 | '\b', 0x1c00 | '\r', 0x1c00 | '\n'
++    0x0100 | GRUB_TERM_ESC, 0x0f00 | GRUB_TERM_TAB, 0x0e00 | GRUB_TERM_BACKSPACE, 0x1c00 | '\r', 0x1c00 | '\n'
+   };
+   struct grub_bios_int_registers regs;
+   unsigned i;
+diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
+index f0d3e3deb..d317efa36 100644
+--- a/grub-core/term/terminfo.c
++++ b/grub-core/term/terminfo.c
+@@ -426,12 +426,12 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
+     }
+   *len = 1;
+   keys[0] = c;
+-  if (c != ANSI_CSI && c != '\e')
++  if (c != ANSI_CSI && c != GRUB_TERM_ESC)
+     {
+       /* Backspace: Ctrl-h.  */
+       if (c == 0x7f)
+-	c = '\b'; 
+-      if (c < 0x20 && c != '\t' && c!= '\b' && c != '\n' && c != '\r')
++	c = GRUB_TERM_BACKSPACE;
++      if (c < 0x20 && c != GRUB_TERM_TAB && c!= GRUB_TERM_BACKSPACE && c != '\n' && c != '\r')
+ 	c = GRUB_TERM_CTRL | (c - 1 + 'a');
+       *len = 1;
+       keys[0] = c;
+@@ -487,7 +487,7 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
+ 	  GRUB_TERM_KEY_HOME, GRUB_TERM_KEY_END };
+     unsigned i;
+ 
+-    if (c == '\e')
++    if (c == GRUB_TERM_ESC)
+       {
+ 	CONTINUE_READ;
+ 
+@@ -606,7 +606,7 @@ grub_terminfo_getkey (struct grub_term_input *termi)
+ 			 &data->npending, data->readkey);
+ 
+ #if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275)
+-  if (data->npending == 1 && data->input_buf[0] == '\e'
++  if (data->npending == 1 && data->input_buf[0] == GRUB_TERM_ESC
+       && grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_BROKEN_REPEAT)
+       && grub_get_time_ms () - data->last_key_time < 1000
+       && (data->last_key & GRUB_TERM_EXTENDED))
+diff --git a/grub-core/tests/cmdline_cat_test.c b/grub-core/tests/cmdline_cat_test.c
+index f1e21439e..baea7688a 100644
+--- a/grub-core/tests/cmdline_cat_test.c
++++ b/grub-core/tests/cmdline_cat_test.c
+@@ -103,7 +103,7 @@ cmdline_cat_test (void)
+ 					     '/', 't', 'e', 's', 't', '.',
+ 					     't', 'x', 't', '\n',
+ 					     GRUB_TERM_NO_KEY,
+-					     GRUB_TERM_NO_KEY, '\e'},
++					     GRUB_TERM_NO_KEY, GRUB_TERM_ESC},
+ 					 23);
+ 
+       grub_video_checksum ("cmdline_cat");
+diff --git a/grub-core/tests/gfxterm_menu.c b/grub-core/tests/gfxterm_menu.c
+index 8f63dc27a..12836fb96 100644
+--- a/grub-core/tests/gfxterm_menu.c
++++ b/grub-core/tests/gfxterm_menu.c
+@@ -146,7 +146,7 @@ gfxterm_menu (void)
+ 	    return;
+ 	  }
+ 	grub_terminal_input_fake_sequence ((int []) { -1, -1, -1, GRUB_TERM_KEY_DOWN, -1, 'e',
+-	      -1, GRUB_TERM_KEY_RIGHT, -1, 'x', -1,  '\e', -1, '\e' }, 14);
++	      -1, GRUB_TERM_KEY_RIGHT, -1, 'x', -1,  GRUB_TERM_ESC, -1, GRUB_TERM_ESC }, 14);
+ 
+ 	grub_video_checksum (tests[j].name);
+ 
+diff --git a/include/grub/term.h b/include/grub/term.h
+index 5ffb38f69..8117e2a24 100644
+--- a/include/grub/term.h
++++ b/include/grub/term.h
+@@ -55,7 +55,8 @@
+ #define GRUB_TERM_KEY_INSERT    (GRUB_TERM_EXTENDED | 0x52)
+ #define GRUB_TERM_KEY_CENTER    (GRUB_TERM_EXTENDED | 0x4c)
+ 
+-#define GRUB_TERM_ESC		'\e'
++/* Hex value is used for ESC, since '\e' is nonstandard */
++#define GRUB_TERM_ESC		0x1b
+ #define GRUB_TERM_TAB		'\t'
+ #define GRUB_TERM_BACKSPACE	'\b'
+ 
+-- 
+2.13.4
+
diff --git a/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch b/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch
new file mode 100644
index 0000000..4090efd
--- /dev/null
+++ b/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch
@@ -0,0 +1,85 @@
+From 1deebd85ef87cc581e995ce0a51dc0802ac9c367 Mon Sep 17 00:00:00 2001
+From: Pete Batard <pete@akeo.ie>
+Date: Mon, 7 Aug 2017 16:23:12 +0100
+Subject: [PATCH 063/192] io: add a GRUB_GZ prefix to gzio specific defines
+
+* This is done to avoid a conflict with a PACKED define in the EDK2
+---
+ grub-core/io/gzio.c | 40 ++++++++++++++++++++--------------------
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
+index 0f2ea6bd8..a8e33033b 100644
+--- a/grub-core/io/gzio.c
++++ b/grub-core/io/gzio.c
+@@ -140,24 +140,24 @@ eat_field (grub_file_t file, int len)
+ #define OLD_GZIP_MAGIC	grub_le_to_cpu16 (0x9E1F)
+ 
+ /* Compression methods (see algorithm.doc) */
+-#define STORED      0
+-#define COMPRESSED  1
+-#define PACKED      2
+-#define LZHED       3
++#define GRUB_GZ_STORED      0
++#define GRUB_GZ_COMPRESSED  1
++#define GRUB_GZ_PACKED      2
++#define GRUB_GZ_LZHED       3
+ /* methods 4 to 7 reserved */
+-#define DEFLATED    8
+-#define MAX_METHODS 9
++#define GRUB_GZ_DEFLATED    8
++#define GRUB_GZ_MAX_METHODS 9
+ 
+ /* gzip flag byte */
+-#define ASCII_FLAG   0x01	/* bit 0 set: file probably ascii text */
+-#define CONTINUATION 0x02	/* bit 1 set: continuation of multi-part gzip file */
+-#define EXTRA_FIELD  0x04	/* bit 2 set: extra field present */
+-#define ORIG_NAME    0x08	/* bit 3 set: original file name present */
+-#define COMMENT      0x10	/* bit 4 set: file comment present */
+-#define ENCRYPTED    0x20	/* bit 5 set: file is encrypted */
+-#define RESERVED     0xC0	/* bit 6,7:   reserved */
++#define GRUB_GZ_ASCII_FLAG   0x01	/* bit 0 set: file probably ascii text */
++#define GRUB_GZ_CONTINUATION 0x02	/* bit 1 set: continuation of multi-part gzip file */
++#define GRUB_GZ_EXTRA_FIELD  0x04	/* bit 2 set: extra field present */
++#define GRUB_GZ_ORIG_NAME    0x08	/* bit 3 set: original file name present */
++#define GRUB_GZ_COMMENT      0x10	/* bit 4 set: file comment present */
++#define GRUB_GZ_ENCRYPTED    0x20	/* bit 5 set: file is encrypted */
++#define GRUB_GZ_RESERVED     0xC0	/* bit 6,7:   reserved */
+ 
+-#define UNSUPPORTED_FLAGS	(CONTINUATION | ENCRYPTED | RESERVED)
++#define GRUB_GZ_UNSUPPORTED_FLAGS	(GRUB_GZ_CONTINUATION | GRUB_GZ_ENCRYPTED | GRUB_GZ_RESERVED)
+ 
+ /* inflate block codes */
+ #define INFLATE_STORED	0
+@@ -201,14 +201,14 @@ test_gzip_header (grub_file_t file)
+    *  problem occurs from here on, then we have corrupt or otherwise
+    *  bad data, and the error should be reported to the user.
+    */
+-  if (hdr.method != DEFLATED
+-      || (hdr.flags & UNSUPPORTED_FLAGS)
+-      || ((hdr.flags & EXTRA_FIELD)
++  if (hdr.method != GRUB_GZ_DEFLATED
++      || (hdr.flags & GRUB_GZ_UNSUPPORTED_FLAGS)
++      || ((hdr.flags & GRUB_GZ_EXTRA_FIELD)
+ 	  && (grub_file_read (gzio->file, &extra_len, 2) != 2
+ 	      || eat_field (gzio->file,
+ 			    grub_le_to_cpu16 (extra_len))))
+-      || ((hdr.flags & ORIG_NAME) && eat_field (gzio->file, -1))
+-      || ((hdr.flags & COMMENT) && eat_field (gzio->file, -1)))
++      || ((hdr.flags & GRUB_GZ_ORIG_NAME) && eat_field (gzio->file, -1))
++      || ((hdr.flags & GRUB_GZ_COMMENT) && eat_field (gzio->file, -1)))
+     return 0;
+ 
+   gzio->data_offset = grub_file_tell (gzio->file);
+@@ -1183,7 +1183,7 @@ test_zlib_header (grub_gzio_t gzio)
+   flg = get_byte (gzio);
+ 
+   /* Check that compression method is DEFLATE.  */
+-  if ((cmf & 0xf) != DEFLATED)
++  if ((cmf & 0xf) != GRUB_GZ_DEFLATED)
+     {
+       /* TRANSLATORS: It's about given file having some strange format, not
+ 	 complete lack of gzip support.  */
+-- 
+2.13.4
+
diff --git a/0064-info-in-builddir.patch b/0064-info-in-builddir.patch
new file mode 100644
index 0000000..61811a5
--- /dev/null
+++ b/0064-info-in-builddir.patch
@@ -0,0 +1,22 @@
+From 5cf0df8753c19e83251c7244cafe38869a65060f Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 8 Aug 2017 13:08:59 -0400
+Subject: [PATCH 064/192] info-in-builddir
+
+---
+ docs/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index 93eb39627..e396ba10f 100644
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -1,4 +1,4 @@
+-AUTOMAKE_OPTIONS = subdir-objects
++AUTOMAKE_OPTIONS = subdir-objects info-in-builddir
+ 
+ # AM_MAKEINFOFLAGS = --no-split --no-validate
+ info_TEXINFOS = grub.texi grub-dev.texi
+-- 
+2.13.4
+
diff --git a/0065-re-write-.gitignore.patch b/0065-re-write-.gitignore.patch
new file mode 100644
index 0000000..f36028a
--- /dev/null
+++ b/0065-re-write-.gitignore.patch
@@ -0,0 +1,500 @@
+From ff9da35fd789354cc1490b75893e765771808352 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 8 Aug 2017 12:48:04 -0400
+Subject: [PATCH 065/192] re-write .gitignore
+
+---
+ .gitignore                        | 352 ++++++++++++--------------------------
+ build-aux/.gitignore              |   9 +
+ docs/.gitignore                   |   4 +
+ grub-core/.gitignore              |  15 ++
+ grub-core/gnulib/.gitignore       |  22 +++
+ grub-core/lib/.gitignore          |   1 +
+ include/grub/gcrypt/.gitignore    |   2 +
+ po/.gitignore                     |   4 +
+ util/bash-completion.d/.gitignore |   1 +
+ 9 files changed, 170 insertions(+), 240 deletions(-)
+ create mode 100644 build-aux/.gitignore
+ create mode 100644 docs/.gitignore
+ create mode 100644 grub-core/.gitignore
+ create mode 100644 grub-core/gnulib/.gitignore
+ create mode 100644 grub-core/lib/.gitignore
+ create mode 100644 include/grub/gcrypt/.gitignore
+ create mode 100644 po/.gitignore
+ create mode 100644 util/bash-completion.d/.gitignore
+
+diff --git a/.gitignore b/.gitignore
+index eca17bec9..d95fac578 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,249 +1,121 @@
+-00_header
+-10_*
+-20_linux_xen
+-30_os-prober
+-40_custom
+-41_custom
+-*.1
+-*.8
+-aclocal.m4
+-ahci_test
+-ascii.bitmaps
+-ascii.h
+-autom4te.cache
+-build-grub-gen-asciih
+-build-grub-gen-widthspec
+-build-grub-mkfont
+-cdboot_test
+-cmp_test
+-config.cache
+-config.guess
+-config.h
+-config-util.h
+-config-util.h.in
+-config.log
+-config.status
+-config.sub
+-configure
+-core_compress_test
+-DISTLIST
+-docs/*.info
+-docs/stamp-vti
+-docs/version.texi
+-ehci_test
+-example_grub_script_test
+-example_scripted_test
+-example_unit_test
++# things ./autogen.sh will create
++/Makefile.utilgcry.def
++/aclocal.m4
++/autom4te.cache
++/configure
++Makefile
++# we want to enable building in a subdirectory, but we don't want to exclude
++# /build-aux so explicitly don't ignore it.
++/build*/
++!/build-aux/
++
++# things very common editors create that we never want
++*~
++.*.sw?
++
++# built objects across the whole tree
++Makefile.in
++*.a
++*.am
+ *.exec
+-*.exec.exe
+-fddboot_test
+-genkernsyms.sh
+-gensymlist.sh
+-gentrigtables
+-gentrigtables.exe
+-gettext_strings_test
+-grub-bin2h
+-/grub-bios-setup
+-/grub-bios-setup.exe
+-grub_cmd_date
+-grub_cmd_echo
+-grub_cmd_regexp
+-grub_cmd_set_date
+-grub_cmd_sleep
+-/grub-editenv
+-/grub-editenv.exe
+-grub-emu
+-grub-emu-lite
+-grub-emu.exe
+-grub-emu-lite.exe
+-grub_emu_init.c
+-grub_emu_init.h
+-/grub-file
+-/grub-file.exe
+-grub-fstest
+-grub-fstest.exe
+-grub_fstest_init.c
+-grub_fstest_init.h
+-grub_func_test
+-grub-install
+-grub-install.exe
+-grub-kbdcomp
+-/grub-macbless
+-/grub-macbless.exe
+-grub-macho2img
+-/grub-menulst2cfg
+-/grub-menulst2cfg.exe
+-/grub-mk*
+-grub-mount
+-/grub-ofpathname
+-/grub-ofpathname.exe
+-grub-core/build-grub-pe2elf.exe
+-/grub-probe
+-/grub-probe.exe
+-grub_probe_init.c
+-grub_probe_init.h
+-/grub-reboot
+-grub_script_blanklines
+-grub_script_blockarg
+-grub_script_break
+-grub-script-check
+-grub-script-check.exe
+-grub_script_check_init.c
+-grub_script_check_init.h
+-grub_script_comments
+-grub_script_continue
+-grub_script_dollar
+-grub_script_echo1
+-grub_script_echo_keywords
+-grub_script_escape_comma
+-grub_script_eval
+-grub_script_expansion
+-grub_script_final_semicolon
+-grub_script_for1
+-grub_script_functions
+-grub_script_gettext
+-grub_script_if
+-grub_script_leading_whitespace
+-grub_script_no_commands
+-grub_script_not
+-grub_script_return
+-grub_script_setparams
+-grub_script_shift
+-grub_script_strcmp
+-grub_script_test
+-grub_script_vars1
+-grub_script_while1
+-grub_script.tab.c
+-grub_script.tab.h
+-grub_script.yy.c
+-grub_script.yy.h
+-grub-set-default
+-grub_setup_init.c
+-grub_setup_init.h
+-grub-shell
+-grub-shell-tester
+-grub-sparc64-setup
+-grub-sparc64-setup.exe
+-/grub-syslinux2cfg
+-/grub-syslinux2cfg.exe
+-gzcompress_test
+-hddboot_test
+-help_test
+-*.img
+ *.image
+-*.image.exe
+-include/grub/cpu
+-include/grub/machine
+-install-sh
+-lib/libgcrypt-grub
+-libgrub_a_init.c
+-*.log
++*.img
++*.info
+ *.lst
+-lzocompress_test
+ *.marker
+-Makefile
+ *.mod
+-mod-*.c
+-missing
+-netboot_test
++*.module
+ *.o
+-*.a
+-ohci_test
+-partmap_test
+-pata_test
+ *.pf2
+-*.pp
+-po/*.mo
+-po/grub.pot
+-po/POTFILES
+-po/stamp-po
+-printf_test
+-priority_queue_unit_test
+-pseries_test
+-stamp-h
+-stamp-h1
+-stamp-h.in
+-symlist.c
+-symlist.h
+-trigtables.c
+-*.trs
+-uhci_test
+-update-grub_lib
+-unidata.c
+-xzcompress_test
+-Makefile.in
+-GPATH
+-GRTAGS
+-GSYMS
+-GTAGS
+-compile
+-depcomp
+-mdate-sh
+-texinfo.tex
+-grub-core/lib/libgcrypt-grub
+-.deps
+-.deps-util
+-.deps-core
++*.yy.[ch]
++.deps/
++.deps-core/
++.deps-util/
+ .dirstamp
+-Makefile.util.am
+-contrib
+-grub-core/bootinfo.txt
+-grub-core/Makefile.core.am
+-grub-core/Makefile.gcry.def
+-grub-core/contrib
+-grub-core/gdb_grub
+-grub-core/genmod.sh
+-grub-core/gensyminfo.sh
+-grub-core/gmodule.pl
+-grub-core/grub.chrp
+-grub-core/modinfo.sh
+-grub-core/*.module
+-grub-core/*.module.exe
+-grub-core/*.pp
+-grub-core/kernel.img.bin
+-util/bash-completion.d/grub
+-grub-core/gnulib/alloca.h
+-grub-core/gnulib/arg-nonnull.h
+-grub-core/gnulib/c++defs.h
+-grub-core/gnulib/charset.alias
+-grub-core/gnulib/configmake.h
+-grub-core/gnulib/float.h
+-grub-core/gnulib/getopt.h
+-grub-core/gnulib/langinfo.h
+-grub-core/gnulib/ref-add.sed
+-grub-core/gnulib/ref-del.sed
+-grub-core/gnulib/stdio.h
+-grub-core/gnulib/stdlib.h
+-grub-core/gnulib/string.h
+-grub-core/gnulib/strings.h
+-grub-core/gnulib/sys
+-grub-core/gnulib/unistd.h
+-grub-core/gnulib/warn-on-use.h
+-grub-core/gnulib/wchar.h
+-grub-core/gnulib/wctype.h
+-grub-core/rs_decoder.h
+-widthspec.bin
+-widthspec.h
+-docs/stamp-1
+-docs/version-dev.texi
+-Makefile.utilgcry.def
+-po/*.po
+-po/*.gmo
+-po/LINGUAS
+-po/remove-potcdate.sed
+-include/grub/gcrypt/gcrypt.h
+-include/grub/gcrypt/g10lib.h
+-po/POTFILES.in
+-po/POTFILES-shell.in
+-/grub-glue-efi
+-/grub-render-label
+-/grub-glue-efi.exe
+-/grub-render-label.exe
+-grub-core/gnulib/locale.h
+-grub-core/gnulib/unitypes.h
+-grub-core/gnulib/uniwidth.h
+-build-aux/test-driver
++
++# next are things you get if you do ./configure in the topdir (for e.g.
++# "make dist" invocation.
++/config-util.h
++/config.h
++/include/grub/cpu
++/include/grub/machine
++/po/POTFILES
++/stamp-h
++/stamp-h1
++config.log
++config.status
++
++# stuff "make dist" creates
++ChangeLog
++grub-*.tar
++grub-*.tar.*
++
++# stuff "make" creates
++/[[:digit:]][[:digit:]]_?*
++/build-grub-mkfont
++/config-util.h.in
+ /garbage-gen
+-/garbage-gen.exe
+-/grub-fs-tester
+-grub-core/build-grub-module-verifier
++/grub*-bios-setup
++/grub*-bios-setup.8
++/grub*-editenv
++/grub*-editenv.1
++/grub*-file
++/grub*-file.1
++/grub*-fs-tester
++/grub*-fstest
++/grub*-fstest.1
++/grub*-glue-efi
++/grub*-glue-efi.1
++/grub*-install
++/grub*-install.8
++/grub*-kbdcomp
++/grub*-kbdcomp.1
++/grub*-macbless
++/grub*-macbless.8
++/grub*-menulst2cfg
++/grub*-menulst2cfg.1
++/grub*-mkconfig
++/grub*-mkconfig.8
++/grub*-mkconfig_lib
++/grub*-mkfont
++/grub*-mkfont.1
++/grub*-mkimage
++/grub*-mkimage.1
++/grub*-mklayout
++/grub*-mklayout.1
++/grub*-mknetdir
++/grub*-mknetdir.1
++/grub*-mkpasswd-pbkdf2
++/grub*-mkpasswd-pbkdf2.1
++/grub*-mkrelpath
++/grub*-mkrelpath.1
++/grub*-mkrescue
++/grub*-mkrescue.1
++/grub*-mkstandalone
++/grub*-mkstandalone.1
++/grub*-ofpathname
++/grub*-ofpathname.8
++/grub*-probe
++/grub*-probe.8
++/grub*-reboot
++/grub*-reboot.8
++/grub*-render-label
++/grub*-render-label.1
++/grub*-script-check
++/grub*-script-check.1
++/grub*-set-default
++/grub*-set-default.8
++/grub*-shell
++/grub*-shell-tester
++/grub*-sparc64-setup
++/grub*-sparc64-setup.8
++/grub*-syslinux2cfg
++/grub*-syslinux2cfg.1
++/grub_fstest.pp
++/grub_fstest_init.c
++/grub_fstest_init.lst
++/grub_script.tab.[ch]
++/libgrub.pp
++/libgrub_a_init.c
++/libgrub_a_init.lst
++/stamp-h.in
+diff --git a/build-aux/.gitignore b/build-aux/.gitignore
+new file mode 100644
+index 000000000..f2f17aab9
+--- /dev/null
++++ b/build-aux/.gitignore
+@@ -0,0 +1,9 @@
++/compile
++/config.guess
++/config.sub
++/depcomp
++/install-sh
++/mdate-sh
++/missing
++/test-driver
++/texinfo.tex
+diff --git a/docs/.gitignore b/docs/.gitignore
+new file mode 100644
+index 000000000..91aee84d3
+--- /dev/null
++++ b/docs/.gitignore
+@@ -0,0 +1,4 @@
++/*.in
++/stamp-1
++/stamp-vti
++/version*.texi
+diff --git a/grub-core/.gitignore b/grub-core/.gitignore
+new file mode 100644
+index 000000000..c738ac6c6
+--- /dev/null
++++ b/grub-core/.gitignore
+@@ -0,0 +1,15 @@
++/*.lst
++/Makefile.gcry.def
++/unidata.c
++/build-grub-module-verifier
++/gdb_grub
++/genmod.sh
++/gensyminfo.sh
++/gentrigtables
++/gmodule.pl
++/grub_script.tab.[ch]
++/modinfo.sh
++/rs_decoder.h
++/symlist.c
++/symlist.h
++/trigtables.c
+diff --git a/grub-core/gnulib/.gitignore b/grub-core/gnulib/.gitignore
+new file mode 100644
+index 000000000..29e199c2d
+--- /dev/null
++++ b/grub-core/gnulib/.gitignore
+@@ -0,0 +1,22 @@
++/alloca.h
++/arg-nonnull.h
++/c++defs.h
++/charset.alias
++/configmake.h
++/getopt.h
++/langinfo.h
++/libgnu.a
++/locale.h
++/ref-add.sed
++/ref-del.sed
++/stdio.h
++/stdlib.h
++/string.h
++/strings.h
++/sys/
++/unistd.h
++/unitypes.h
++/uniwidth.h
++/warn-on-use.h
++/wchar.h
++/wctype.h
+diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore
+new file mode 100644
+index 000000000..681545914
+--- /dev/null
++++ b/grub-core/lib/.gitignore
+@@ -0,0 +1 @@
++/libgcrypt-grub/
+diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore
+new file mode 100644
+index 000000000..8fbf56462
+--- /dev/null
++++ b/include/grub/gcrypt/.gitignore
+@@ -0,0 +1,2 @@
++g10lib.h
++gcrypt.h
+diff --git a/po/.gitignore b/po/.gitignore
+new file mode 100644
+index 000000000..97b679c31
+--- /dev/null
++++ b/po/.gitignore
+@@ -0,0 +1,4 @@
++/POTFILES*.in
++/grub.pot
++/remove-potcdate.sed
++/stamp-po
+diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore
+new file mode 100644
+index 000000000..b7e1eb124
+--- /dev/null
++++ b/util/bash-completion.d/.gitignore
+@@ -0,0 +1 @@
++grub
+-- 
+2.13.4
+
diff --git a/0051-IBM-client-architecture-CAS-reboot-support.patch b/0066-IBM-client-architecture-CAS-reboot-support.patch
similarity index 97%
rename from 0051-IBM-client-architecture-CAS-reboot-support.patch
rename to 0066-IBM-client-architecture-CAS-reboot-support.patch
index 87ea1d4..2c02308 100644
--- a/0051-IBM-client-architecture-CAS-reboot-support.patch
+++ b/0066-IBM-client-architecture-CAS-reboot-support.patch
@@ -1,7 +1,7 @@
-From a0103db268b36f4c772643afaf818d719143edda Mon Sep 17 00:00:00 2001
+From 34423216f8f3d7ce6086e2f1ee9869407e6a2221 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Thu, 20 Sep 2012 18:07:39 -0300
-Subject: [PATCH 051/177] IBM client architecture (CAS) reboot support
+Subject: [PATCH 066/192] IBM client architecture (CAS) reboot support
 
 This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 
@@ -170,5 +170,5 @@ index 8e4251303..9f26c69a2 100644
  #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));)
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0052-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0067-for-ppc-reset-console-display-attr-when-clear-screen.patch
similarity index 87%
rename from 0052-for-ppc-reset-console-display-attr-when-clear-screen.patch
rename to 0067-for-ppc-reset-console-display-attr-when-clear-screen.patch
index 85c131d..8a45c9e 100644
--- a/0052-for-ppc-reset-console-display-attr-when-clear-screen.patch
+++ b/0067-for-ppc-reset-console-display-attr-when-clear-screen.patch
@@ -1,7 +1,7 @@
-From 86ac14fb559afa7e5009e2b663ee0189b4a55e94 Mon Sep 17 00:00:00 2001
+From 070dc282d3cc6602571296e90945df9d4671aecb Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 24 Apr 2013 10:51:48 -0300
-Subject: [PATCH 052/177] for ppc, reset console display attr when clear screen
+Subject: [PATCH 067/192] for ppc, reset console display attr when clear screen
 
 v2: Also use \x0c instead of a literal ^L to make future patches less
 awkward.
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index f0d3e3deb..9bb75c173 100644
+index d317efa36..29df35e6d 100644
 --- a/grub-core/term/terminfo.c
 +++ b/grub-core/term/terminfo.c
 @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,
@@ -28,5 +28,5 @@ index f0d3e3deb..9bb75c173 100644
        data->reverse_video_off = grub_strdup ("\e[m");
        if (grub_strcmp ("ieee1275", str) == 0)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0053-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0068-Disable-GRUB-video-support-for-IBM-power-machines.patch
similarity index 94%
rename from 0053-Disable-GRUB-video-support-for-IBM-power-machines.patch
rename to 0068-Disable-GRUB-video-support-for-IBM-power-machines.patch
index e6bcdca..4932e92 100644
--- a/0053-Disable-GRUB-video-support-for-IBM-power-machines.patch
+++ b/0068-Disable-GRUB-video-support-for-IBM-power-machines.patch
@@ -1,7 +1,7 @@
-From a87849e382cd6e417bfc4bcf33a907617a5b7494 Mon Sep 17 00:00:00 2001
+From 4e31478fdf4cda470305c1bb2acb9b820e790757 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 11 Jun 2013 15:14:05 -0300
-Subject: [PATCH 053/177] Disable GRUB video support for IBM power machines
+Subject: [PATCH 068/192] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205
@@ -61,5 +61,5 @@ index 9f26c69a2..ab4f284c3 100644
  
  extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0054-Honor-a-symlink-when-generating-configuration-by-gru.patch b/0069-Honor-a-symlink-when-generating-configuration-by-gru.patch
similarity index 85%
rename from 0054-Honor-a-symlink-when-generating-configuration-by-gru.patch
rename to 0069-Honor-a-symlink-when-generating-configuration-by-gru.patch
index 5ce0f08..e8a79de 100644
--- a/0054-Honor-a-symlink-when-generating-configuration-by-gru.patch
+++ b/0069-Honor-a-symlink-when-generating-configuration-by-gru.patch
@@ -1,7 +1,7 @@
-From e34b379ba33181e212952f39b4db1e48f08f0c14 Mon Sep 17 00:00:00 2001
+From 35535549324923af7fecf79cc739baba48246f21 Mon Sep 17 00:00:00 2001
 From: Marcel Kolaja <mkolaja@redhat.com>
 Date: Tue, 21 Jan 2014 10:57:08 -0500
-Subject: [PATCH 054/177] Honor a symlink when generating configuration by
+Subject: [PATCH 069/192] Honor a symlink when generating configuration by
  grub2-mkconfig
 
 Honor a symlink when generating configuration by grub2-mkconfig, so that
@@ -25,5 +25,5 @@ index f8496d28b..3b070fd76 100644
  fi
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0055-Move-bash-completion-script-922997.patch b/0070-Move-bash-completion-script-922997.patch
similarity index 92%
rename from 0055-Move-bash-completion-script-922997.patch
rename to 0070-Move-bash-completion-script-922997.patch
index 0c5ba75..5fe88c6 100644
--- a/0055-Move-bash-completion-script-922997.patch
+++ b/0070-Move-bash-completion-script-922997.patch
@@ -1,7 +1,7 @@
-From 6ba0717b7f678ca175d63673e58a0c9a5e9f7fb0 Mon Sep 17 00:00:00 2001
+From 999bbc2002275efce284aed6e1e31b3ca351fa19 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 055/177] Move bash completion script (#922997)
+Subject: [PATCH 070/192] Move bash completion script (#922997)
 
 Apparently these go in a new place now.
 ---
@@ -51,5 +51,5 @@ index 136287cf1..61108f054 100644
  
  $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
 -- 
-2.13.3
+2.13.4
 
diff --git a/0056-Update-to-minilzo-2.08.patch b/0071-Update-to-minilzo-2.08.patch
similarity index 99%
rename from 0056-Update-to-minilzo-2.08.patch
rename to 0071-Update-to-minilzo-2.08.patch
index 89e81f6..e949241 100644
--- a/0056-Update-to-minilzo-2.08.patch
+++ b/0071-Update-to-minilzo-2.08.patch
@@ -1,7 +1,7 @@
-From 9c517c4205e02f920fd12995710017b7558bffda Mon Sep 17 00:00:00 2001
+From c0977f7fd42e16cc568af7ae667a2aeda85eb583 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Dec 2014 15:36:09 -0500
-Subject: [PATCH 056/177] Update to minilzo-2.08
+Subject: [PATCH 071/192] Update to minilzo-2.08
 
 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow
 
@@ -8786,5 +8786,5 @@ index 74fefa9fe..793745467 100644
  
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0057-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0072-Allow-fallback-to-include-entries-by-title-not-just-.patch
similarity index 95%
rename from 0057-Allow-fallback-to-include-entries-by-title-not-just-.patch
rename to 0072-Allow-fallback-to-include-entries-by-title-not-just-.patch
index 2564e8a..114fae6 100644
--- a/0057-Allow-fallback-to-include-entries-by-title-not-just-.patch
+++ b/0072-Allow-fallback-to-include-entries-by-title-not-just-.patch
@@ -1,7 +1,7 @@
-From 5fcbbf442dfa3b1d922bff02038ec480ea02c866 Mon Sep 17 00:00:00 2001
+From 15e9ccc8abd5621107788bea6ae6f2bdb27a3ed3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 5 Sep 2014 10:07:04 -0400
-Subject: [PATCH 057/177] Allow "fallback" to include entries by title, not
+Subject: [PATCH 072/192] Allow "fallback" to include entries by title, not
  just number.
 
 Resolves: rhbz#1026084
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 58 insertions(+), 27 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 719e2fb1c..2e8a7bd89 100644
+index e7a83c2d6..d2f64b05e 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -163,16 +163,41 @@ grub_menu_set_timeout (int timeout)
@@ -140,5 +140,5 @@ index 719e2fb1c..2e8a7bd89 100644
  static int
  get_entry_number (grub_menu_t menu, const char *name)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0058-Add-GRUB_DISABLE_UUID.patch b/0073-Add-GRUB_DISABLE_UUID.patch
similarity index 97%
rename from 0058-Add-GRUB_DISABLE_UUID.patch
rename to 0073-Add-GRUB_DISABLE_UUID.patch
index eaef077..5e686c7 100644
--- a/0058-Add-GRUB_DISABLE_UUID.patch
+++ b/0073-Add-GRUB_DISABLE_UUID.patch
@@ -1,7 +1,7 @@
-From 9da68ff7f22e8736fba4e1aef91e2acdc2b2b2c3 Mon Sep 17 00:00:00 2001
+From 87602724b509a60628623baabf5a2c7741a68884 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 16:49:25 -0400
-Subject: [PATCH 058/177] Add GRUB_DISABLE_UUID.
+Subject: [PATCH 073/192] Add GRUB_DISABLE_UUID.
 
 This will cause "search --fs-uuid --set=root ..." not to be generated by
 grub2-mkconfig, and instead simply attempt to use the grub device name
@@ -95,5 +95,5 @@ index 60b31cadd..cf35e4174 100644
    else
      echo $device |sed 's, ,_,g'
 -- 
-2.13.3
+2.13.4
 
diff --git a/0059-Make-exit-take-a-return-code.patch b/0074-Make-exit-take-a-return-code.patch
similarity index 98%
rename from 0059-Make-exit-take-a-return-code.patch
rename to 0074-Make-exit-take-a-return-code.patch
index b5e13a7..c8a51bd 100644
--- a/0059-Make-exit-take-a-return-code.patch
+++ b/0074-Make-exit-take-a-return-code.patch
@@ -1,7 +1,7 @@
-From 0dc6c8bd6c7e49868a62a6da4194035d0f70f9ea Mon Sep 17 00:00:00 2001
+From 68d514b51b81911d8359d7825618112dae4a44d9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 26 Feb 2014 21:49:12 -0500
-Subject: [PATCH 059/177] Make "exit" take a return code.
+Subject: [PATCH 074/192] Make "exit" take a return code.
 
 This adds "exit" with a return code.  With this patch, any "exit"
 command /may/ include a return code, and on platforms that support
@@ -255,5 +255,5 @@ index 2a9f87cc2..062081437 100644
  					  grub_uint64_t d,
  					  grub_uint64_t *r);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0060-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch b/0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
similarity index 75%
rename from 0060-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
rename to 0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
index beb83aa..cf69cee 100644
--- a/0060-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
+++ b/0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
@@ -1,7 +1,7 @@
-From 8ef312cf5646d4348bcd2bd1c059c6b6f905eade Mon Sep 17 00:00:00 2001
+From 126f6952b853ea67e784650ed12f365ab7988f51 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 22 Jul 2015 11:21:01 -0400
-Subject: [PATCH 060/177] Mark po/exclude.pot as binary so git won't try to
+Subject: [PATCH 075/192] Mark po/exclude.pot as binary so git won't try to
  diff nonprintables.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -18,5 +18,5 @@ index 000000000..33ffaa404
 @@ -0,0 +1 @@
 +po/exclude.pot binary
 -- 
-2.13.3
+2.13.4
 
diff --git a/0061-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0076-Make-efi-machines-load-an-env-block-from-a-variable.patch
similarity index 92%
rename from 0061-Make-efi-machines-load-an-env-block-from-a-variable.patch
rename to 0076-Make-efi-machines-load-an-env-block-from-a-variable.patch
index b3325d3..82d1fc5 100644
--- a/0061-Make-efi-machines-load-an-env-block-from-a-variable.patch
+++ b/0076-Make-efi-machines-load-an-env-block-from-a-variable.patch
@@ -1,7 +1,7 @@
-From 3166b161eb1b6ea023558067cf58c1872f52ec0c Mon Sep 17 00:00:00 2001
+From 506b52759b2b2ad46e7b389979fcbaa78d68dab9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 7 Dec 2015 14:20:49 -0500
-Subject: [PATCH 061/177] Make efi machines load an env block from a variable
+Subject: [PATCH 076/192] Make efi machines load an env block from a variable
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 1d86bd22e..5df543d79 100644
+index a65c27f7f..1eb86bed3 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -191,6 +191,7 @@ kernel = {
@@ -80,5 +80,5 @@ index 2c31847bf..f7782b6e1 100644
  			     char **path);
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0062-DHCP-client-ID-and-UUID-options-added.patch b/0077-DHCP-client-ID-and-UUID-options-added.patch
similarity index 96%
rename from 0062-DHCP-client-ID-and-UUID-options-added.patch
rename to 0077-DHCP-client-ID-and-UUID-options-added.patch
index ce31b51..9d64246 100644
--- a/0062-DHCP-client-ID-and-UUID-options-added.patch
+++ b/0077-DHCP-client-ID-and-UUID-options-added.patch
@@ -1,7 +1,7 @@
-From 653191c5d89a6b3e0b70c339fb6dca0f0b682030 Mon Sep 17 00:00:00 2001
+From 8a0b654a520e407da69e0cf64f3dd6bb7cf86240 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 17:18:53 -0200
-Subject: [PATCH 062/177] DHCP client ID and UUID options added.
+Subject: [PATCH 077/192] DHCP client ID and UUID options added.
 
 ---
  grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
@@ -141,5 +141,5 @@ index 1096b2432..e266bae23 100644
    };
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0063-trim-arp-packets-with-abnormal-size.patch b/0078-trim-arp-packets-with-abnormal-size.patch
similarity index 88%
rename from 0063-trim-arp-packets-with-abnormal-size.patch
rename to 0078-trim-arp-packets-with-abnormal-size.patch
index 076ce87..8f28829 100644
--- a/0063-trim-arp-packets-with-abnormal-size.patch
+++ b/0078-trim-arp-packets-with-abnormal-size.patch
@@ -1,7 +1,7 @@
-From 27f7b88ae111b6b0e32fc97b1e4584ba110497c3 Mon Sep 17 00:00:00 2001
+From adbdeea1eaf60e01f7aa5df34ea1050878476ed3 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 5 Feb 2014 09:42:42 -0200
-Subject: [PATCH 063/177] trim arp packets with abnormal size
+Subject: [PATCH 078/192] trim arp packets with abnormal size
 
 GRUB uses arp request to create the arp response. If the incoming packet
 is foobared, GRUB needs to trim the arp response packet before sending it.
@@ -27,5 +27,5 @@ index 54306e3b1..d1c69ed2b 100644
  	struct grub_net_buff nb_reply;
  	struct arppkt *arp_reply;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0064-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
similarity index 89%
rename from 0064-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
rename to 0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
index 35c9d02..1b42b14 100644
--- a/0064-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
+++ b/0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
@@ -1,7 +1,7 @@
-From b1e1f3bfdf2c7fa0b44cf0294e21b8c1730434f2 Mon Sep 17 00:00:00 2001
+From 0703a4c9e31d04907a5b8ecfa8f98dbbd583ae17 Mon Sep 17 00:00:00 2001
 From: Prarit Bhargava <prarit@redhat.com>
 Date: Wed, 12 Mar 2014 10:58:16 -0400
-Subject: [PATCH 064/177] Fix bad test on GRUB_DISABLE_SUBMENU.
+Subject: [PATCH 079/192] Fix bad test on GRUB_DISABLE_SUBMENU.
 
 The file /etc/grub.d/10_linux does
 
@@ -37,5 +37,5 @@ index de9044c7f..cf6331f2a 100644
      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0065-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch
similarity index 90%
rename from 0065-Add-support-for-UEFI-operating-systems-returned-by-o.patch
rename to 0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch
index d9411f8..cf783a2 100644
--- a/0065-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+++ b/0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch
@@ -1,7 +1,7 @@
-From be89ae5b3140ecad260c3c4374db7dc0a714d92d Mon Sep 17 00:00:00 2001
+From 7da79a8ccf620ec3ce840b52888652fb4cae6d2f Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Wed, 12 Jun 2013 11:51:49 -0400
-Subject: [PATCH 065/177] Add support for UEFI operating systems returned by
+Subject: [PATCH 080/192] Add support for UEFI operating systems returned by
  os-prober
 
 os-prober returns UEFI operating systems in the form:
@@ -46,5 +46,5 @@ index 515a68c7a..9b8f5968e 100644
    esac
  done
 -- 
-2.13.3
+2.13.4
 
diff --git a/0066-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch
similarity index 96%
rename from 0066-Migrate-PPC-from-Yaboot-to-Grub2.patch
rename to 0081-Migrate-PPC-from-Yaboot-to-Grub2.patch
index 585a62a..7ca2a00 100644
--- a/0066-Migrate-PPC-from-Yaboot-to-Grub2.patch
+++ b/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch
@@ -1,7 +1,7 @@
-From 305051dcc08e238d1c06b46009206154521ab60f Mon Sep 17 00:00:00 2001
+From c61d269591b80943a643daa0576817d1472c6e75 Mon Sep 17 00:00:00 2001
 From: Mark Hamzy <hamzy@us.ibm.com>
 Date: Wed, 28 Mar 2012 14:46:41 -0500
-Subject: [PATCH 066/177] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 081/192] Migrate PPC from Yaboot to Grub2
 
 Add configuration support for serial terminal consoles.  This will set the
 maximum screen size so that text is not overwritten.
@@ -150,5 +150,5 @@ index 000000000..10d665868
 +  terminfo -g ${X}x${Y} ${TERMINAL}
 +EOF
 -- 
-2.13.3
+2.13.4
 
diff --git a/0067-Add-fw_path-variable-revised.patch b/0082-Add-fw_path-variable-revised.patch
similarity index 94%
rename from 0067-Add-fw_path-variable-revised.patch
rename to 0082-Add-fw_path-variable-revised.patch
index 26aa3c9..a10aed5 100644
--- a/0067-Add-fw_path-variable-revised.patch
+++ b/0082-Add-fw_path-variable-revised.patch
@@ -1,7 +1,7 @@
-From 6064284af113b8ed940d1a44680f8b7f7d5db884 Mon Sep 17 00:00:00 2001
+From 3fd7e5fa14a3edd982f62685dbc2f3a3901dc932 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 19 Sep 2012 21:22:55 -0300
-Subject: [PATCH 067/177] Add fw_path variable (revised)
+Subject: [PATCH 082/192] Add fw_path variable (revised)
 
 This patch makes grub look for its config file on efi where the app was
 found. It was originally written by Matthew Garrett, and adapted to fix the
@@ -77,5 +77,5 @@ index 249e19bc7..759c475c4 100644
        prefix = grub_env_get ("prefix");
        if (prefix)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0068-Add-support-for-linuxefi.patch b/0083-Add-support-for-linuxefi.patch
similarity index 96%
rename from 0068-Add-support-for-linuxefi.patch
rename to 0083-Add-support-for-linuxefi.patch
index eec1db7..4b594c4 100644
--- a/0068-Add-support-for-linuxefi.patch
+++ b/0083-Add-support-for-linuxefi.patch
@@ -1,7 +1,7 @@
-From f43b4a38c130038880b86566a82c38434e6bb55d Mon Sep 17 00:00:00 2001
+From 6df27b02eb4815f535b5f7e6b4987c67f1506545 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Tue, 10 Jul 2012 11:58:52 -0400
-Subject: [PATCH 068/177] Add support for linuxefi
+Subject: [PATCH 083/192] Add support for linuxefi
 
 ---
  grub-core/Makefile.core.def       |   8 +
@@ -13,7 +13,7 @@ Subject: [PATCH 068/177] Add support for linuxefi
  create mode 100644 grub-core/loader/i386/efi/linux.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 5df543d79..cca824256 100644
+index 1eb86bed3..c653c71c5 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -1765,6 +1765,14 @@ module = {
@@ -32,7 +32,7 @@ index 5df543d79..cca824256 100644
    efi = loader/efi/chainloader.c;
    i386_pc = loader/i386/pc/chainloader.c;
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 20a47aaf5..efb15cc1b 100644
+index ac2a4c556..f5440cb1d 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
 @@ -49,6 +49,38 @@ static grub_efi_uintn_t finish_desc_size;
@@ -73,7 +73,7 @@ index 20a47aaf5..efb15cc1b 100644
 +
  /* Allocate pages. Return the pointer to the first of allocated pages.  */
  void *
- grub_efi_allocate_pages (grub_efi_physical_address_t address,
+ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
 new file mode 100644
 index 000000000..b79e6320b
@@ -452,13 +452,13 @@ index 000000000..b79e6320b
 +  grub_unregister_command (cmd_initrd);
 +}
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index e9c601f34..764cd11f5 100644
+index 3fa082816..91e29ce66 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -40,6 +40,9 @@ void EXPORT_FUNC(grub_efi_stall) (grub_efi_uintn_t microseconds);
- void *
- EXPORT_FUNC(grub_efi_allocate_pages) (grub_efi_physical_address_t address,
+@@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
  				      grub_efi_uintn_t pages);
+ void *
+ EXPORT_FUNC(grub_efi_allocate_any_pages) (grub_efi_uintn_t pages);
 +void *
 +EXPORT_FUNC(grub_efi_allocate_pages_max) (grub_efi_physical_address_t max,
 +					  grub_efi_uintn_t pages);
@@ -478,5 +478,5 @@ index da0ca3b83..fc36bdaf3 100644
  
  /* Boot parameters for Linux based on 2.6.12. This is used by the setup
 -- 
-2.13.3
+2.13.4
 
diff --git a/0069-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch
similarity index 91%
rename from 0069-Use-linuxefi-and-initrdefi-where-appropriate.patch
rename to 0084-Use-linuxefi-and-initrdefi-where-appropriate.patch
index 56b780a..0db3d7a 100644
--- a/0069-Use-linuxefi-and-initrdefi-where-appropriate.patch
+++ b/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch
@@ -1,7 +1,7 @@
-From 7759ceeceef6a2c1c90e6e5d51e9efd56aacd508 Mon Sep 17 00:00:00 2001
+From 6a8677e6fc4a5809519e3b31941728e7c74b6098 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 16 Jul 2012 18:57:11 -0400
-Subject: [PATCH 069/177] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 084/192] Use "linuxefi" and "initrdefi" where appropriate.
 
 ---
  util/grub.d/10_linux.in | 18 ++++++++++++++++--
@@ -46,5 +46,5 @@ index cf6331f2a..8ccf012f7 100644
    sed "s/^/$submenu_indentation/" << EOF
  }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0070-Don-t-allow-insmod-when-secure-boot-is-enabled.patch b/0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
similarity index 93%
rename from 0070-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
rename to 0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
index 7ebb89a..635fba0 100644
--- a/0070-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
+++ b/0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
@@ -1,7 +1,7 @@
-From 085e51ec31d08c9b7e027fe8a25a9894765b9547 Mon Sep 17 00:00:00 2001
+From e7f79b18704982a8e589433e49e9d5f0408adf66 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 23 Oct 2012 10:40:49 -0400
-Subject: [PATCH 070/177] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 085/192] Don't allow insmod when secure boot is enabled.
 
 Hi,
 
@@ -108,10 +108,10 @@ index 684ca93f8..2588b481e 100644
  
  /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 764cd11f5..62a3d9726 100644
+index 91e29ce66..bb3ab7dfd 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -76,6 +76,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
+@@ -83,6 +83,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
  				     const grub_efi_guid_t *guid,
  				     void *data,
  				     grub_size_t datasize);
@@ -120,5 +120,5 @@ index 764cd11f5..62a3d9726 100644
  EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
  					     const grub_efi_device_path_t *dp2);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0071-Pass-x-hex-hex-straight-through-unmolested.patch b/0086-Pass-x-hex-hex-straight-through-unmolested.patch
similarity index 97%
rename from 0071-Pass-x-hex-hex-straight-through-unmolested.patch
rename to 0086-Pass-x-hex-hex-straight-through-unmolested.patch
index 1eb1769..9bfee06 100644
--- a/0071-Pass-x-hex-hex-straight-through-unmolested.patch
+++ b/0086-Pass-x-hex-hex-straight-through-unmolested.patch
@@ -1,7 +1,7 @@
-From 11d4cc5648c1de0aa7acdf530829b66c03013f6a Mon Sep 17 00:00:00 2001
+From 41b59196e7114f06b498910640193a817b615db7 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 071/177] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 086/192] Pass "\x[[:hex:]][[:hex:]]" straight through
  unmolested.
 
 ---
@@ -179,5 +179,5 @@ index ab78ca87f..cf6cd6601 100644
        case '$':
  	if (escaped)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0072-Add-X-option-to-printf-functions.patch b/0087-Add-X-option-to-printf-functions.patch
similarity index 91%
rename from 0072-Add-X-option-to-printf-functions.patch
rename to 0087-Add-X-option-to-printf-functions.patch
index f1cb217..94586a8 100644
--- a/0072-Add-X-option-to-printf-functions.patch
+++ b/0087-Add-X-option-to-printf-functions.patch
@@ -1,7 +1,7 @@
-From 18328806280391c8219ccbea80ca513ffcdaab6e Mon Sep 17 00:00:00 2001
+From bedc2b207a941b590155dd66047ac4d831413a4b Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 16:58:39 -0200
-Subject: [PATCH 072/177] Add %X option to printf functions.
+Subject: [PATCH 087/192] Add %X option to printf functions.
 
 ---
  grub-core/kern/misc.c | 7 +++++--
@@ -54,5 +54,5 @@ index 952411d5d..8344526be 100644
  	case 'd':
  	  {
 -- 
-2.13.3
+2.13.4
 
diff --git a/0073-Search-for-specific-config-file-for-netboot.patch b/0088-Search-for-specific-config-file-for-netboot.patch
similarity index 97%
rename from 0073-Search-for-specific-config-file-for-netboot.patch
rename to 0088-Search-for-specific-config-file-for-netboot.patch
index 5462d09..529e533 100644
--- a/0073-Search-for-specific-config-file-for-netboot.patch
+++ b/0088-Search-for-specific-config-file-for-netboot.patch
@@ -1,7 +1,7 @@
-From 61094fbc07ee8cd2eac49ca844fc42fa5f55fb5f Mon Sep 17 00:00:00 2001
+From 23c496b96dfeab1f524b736c525114539c549d27 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 17:22:07 -0200
-Subject: [PATCH 073/177] Search for specific config file for netboot
+Subject: [PATCH 088/192] Search for specific config file for netboot
 
 This patch implements a search for a specific configuration when the config
 file is on a remoteserver. It uses the following order:
@@ -199,5 +199,5 @@ index e266bae23..50d62ab0c 100644
 +
  #endif /* ! GRUB_NET_HEADER */
 -- 
-2.13.3
+2.13.4
 
diff --git a/0074-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
similarity index 97%
rename from 0074-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
rename to 0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
index ec7e479..c253df8 100644
--- a/0074-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+++ b/0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
@@ -1,7 +1,7 @@
-From f5adf9dbcd30817b69b83650ab8417cd7388d65c Mon Sep 17 00:00:00 2001
+From 90d7c3a044d3be318bec517661aa7e7822166a84 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Tue, 22 Jan 2013 06:31:38 +0100
-Subject: [PATCH 074/177] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 089/192] blscfg: add blscfg module to parse Boot Loader
  Specification snippets
 
 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
@@ -21,7 +21,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
  create mode 100644 grub-core/commands/blscfg.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index cca824256..3a05683d2 100644
+index c653c71c5..7f3d5a2bf 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -769,6 +769,14 @@ module = {
@@ -247,5 +247,5 @@ index 000000000..4274aca5a
 +  grub_unregister_extcmd (cmd);
 +}
 -- 
-2.13.3
+2.13.4
 
diff --git a/0075-Don-t-write-messages-to-the-screen.patch b/0090-Don-t-write-messages-to-the-screen.patch
similarity index 97%
rename from 0075-Don-t-write-messages-to-the-screen.patch
rename to 0090-Don-t-write-messages-to-the-screen.patch
index 822c56f..19f6c69 100644
--- a/0075-Don-t-write-messages-to-the-screen.patch
+++ b/0090-Don-t-write-messages-to-the-screen.patch
@@ -1,7 +1,7 @@
-From d55a786428c9cd17779a26597a22b8c1e9dc139f Mon Sep 17 00:00:00 2001
+From 60db753f54d4b11ac2caa4536b685cc252cf5df6 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 075/177] Don't write messages to the screen
+Subject: [PATCH 090/192] 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
@@ -177,5 +177,5 @@ index 8ccf012f7..a3d9711d6 100644
  EOF
      fi
 -- 
-2.13.3
+2.13.4
 
diff --git a/0076-Don-t-print-GNU-GRUB-header.patch b/0091-Don-t-print-GNU-GRUB-header.patch
similarity index 89%
rename from 0076-Don-t-print-GNU-GRUB-header.patch
rename to 0091-Don-t-print-GNU-GRUB-header.patch
index 1c4f724..1e51b0c 100644
--- a/0076-Don-t-print-GNU-GRUB-header.patch
+++ b/0091-Don-t-print-GNU-GRUB-header.patch
@@ -1,7 +1,7 @@
-From b73ce71e5a7d899484963c0eaf8617684d1b95be Mon Sep 17 00:00:00 2001
+From 7801f78495d43599e7255cdfaeed717f9fbe542a 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 076/177] Don't print GNU GRUB header
+Subject: [PATCH 091/192] Don't print GNU GRUB header
 
 No one cares.
 ---
@@ -41,5 +41,5 @@ index b2654ef62..f57b7508a 100644
  
  static void
 -- 
-2.13.3
+2.13.4
 
diff --git a/0077-Don-t-add-to-highlighted-row.patch b/0092-Don-t-add-to-highlighted-row.patch
similarity index 84%
rename from 0077-Don-t-add-to-highlighted-row.patch
rename to 0092-Don-t-add-to-highlighted-row.patch
index 2e437ec..1b9bc5c 100644
--- a/0077-Don-t-add-to-highlighted-row.patch
+++ b/0092-Don-t-add-to-highlighted-row.patch
@@ -1,7 +1,7 @@
-From a52abfacfeaf1c8c26363a2aaefbd2e13c95787e Mon Sep 17 00:00:00 2001
+From e06f4d9d640db5041f5934ba486de84705fee66b 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 077/177] Don't add '*' to highlighted row
+Subject: [PATCH 092/192] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---
@@ -22,5 +22,5 @@ index e22bb91f6..a3d1f23f6 100644
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,
 -- 
-2.13.3
+2.13.4
 
diff --git a/0078-Message-string-cleanups.patch b/0093-Message-string-cleanups.patch
similarity index 96%
rename from 0078-Message-string-cleanups.patch
rename to 0093-Message-string-cleanups.patch
index 720c98c..c24432e 100644
--- a/0078-Message-string-cleanups.patch
+++ b/0093-Message-string-cleanups.patch
@@ -1,7 +1,7 @@
-From b3fa0ec8279efce103cf073073174fd085d0b66e Mon Sep 17 00:00:00 2001
+From 3d60e13903f30f8a0d60ca7ad8bb984d28fb5262 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 078/177] Message string cleanups
+Subject: [PATCH 093/192] Message string cleanups
 
 Make use of terminology consistent. Remove jargon.
 ---
@@ -67,5 +67,5 @@ index a3d1f23f6..64a83862f 100644
      {
        grub_print_error ();
 -- 
-2.13.3
+2.13.4
 
diff --git a/0079-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
similarity index 87%
rename from 0079-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
rename to 0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
index 29f6abe..9a15e1f 100644
--- a/0079-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+++ b/0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
@@ -1,7 +1,7 @@
-From e2528ce11f002c288a83caa473fcd26052c5f054 Mon Sep 17 00:00:00 2001
+From 0346f89bd0d9332f613f84063f2e88eb60b80b5d 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 079/177] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 094/192] Fix border spacing now that we aren't displaying it
 
 ---
  grub-core/normal/menu_text.c | 6 +++---
@@ -28,5 +28,5 @@ index 64a83862f..1062d64ee 100644
    geo->timeout_lines = 2;
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0080-Use-the-correct-indentation-for-the-term-help-text.patch b/0095-Use-the-correct-indentation-for-the-term-help-text.patch
similarity index 87%
rename from 0080-Use-the-correct-indentation-for-the-term-help-text.patch
rename to 0095-Use-the-correct-indentation-for-the-term-help-text.patch
index 10f0eae..7d61b93 100644
--- a/0080-Use-the-correct-indentation-for-the-term-help-text.patch
+++ b/0095-Use-the-correct-indentation-for-the-term-help-text.patch
@@ -1,7 +1,7 @@
-From f2287ba01076360a2fcd8e614ac73212036dd484 Mon Sep 17 00:00:00 2001
+From c9c76c9c90f9c5464efd17d04e839e9c0ff11b3f 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 080/177] Use the correct indentation for the term help text
+Subject: [PATCH 095/192] Use the correct indentation for the term help text
 
 That is consistent with the menu help text
 ---
@@ -24,5 +24,5 @@ index f57b7508a..0ce59fdc3 100644
        grub_print_message_indented (msg_formatted, 0, 0, term);
      grub_putcode ('\n', term);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0081-Indent-menu-entries.patch b/0096-Indent-menu-entries.patch
similarity index 85%
rename from 0081-Indent-menu-entries.patch
rename to 0096-Indent-menu-entries.patch
index 466ee9a..a4fec24 100644
--- a/0081-Indent-menu-entries.patch
+++ b/0096-Indent-menu-entries.patch
@@ -1,7 +1,7 @@
-From fc110aa2245aa53b305c14c789c66dd93c8b489e Mon Sep 17 00:00:00 2001
+From 544becc2362005b59c561eefd1b68360ca1764ca 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 081/177] Indent menu entries
+Subject: [PATCH 096/192] Indent menu entries
 
 ---
  grub-core/normal/menu_text.c | 3 ++-
@@ -22,5 +22,5 @@ index 1062d64ee..ecc60f99f 100644
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,
 -- 
-2.13.3
+2.13.4
 
diff --git a/0082-Fix-margins.patch b/0097-Fix-margins.patch
similarity index 91%
rename from 0082-Fix-margins.patch
rename to 0097-Fix-margins.patch
index 179127a..d62d9bd 100644
--- a/0082-Fix-margins.patch
+++ b/0097-Fix-margins.patch
@@ -1,7 +1,7 @@
-From 861c159caf2f7ef552ff0bab773c5dc7bd061513 Mon Sep 17 00:00:00 2001
+From aaecd5d322bc4050e9d143f2e648349b4c6c9e17 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 082/177] Fix margins
+Subject: [PATCH 097/192] Fix margins
 
 ---
  grub-core/normal/menu_text.c | 8 +++-----
@@ -33,5 +33,5 @@ index ecc60f99f..0e43f2c10 100644
      - geo->timeout_lines /* timeout */
      - 1 /* empty final line  */;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0083-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
similarity index 84%
rename from 0083-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
rename to 0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
index a170388..7884d09 100644
--- a/0083-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+++ b/0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
@@ -1,7 +1,7 @@
-From 726aa93d1ecf9de8b3d4a63d1834c91c14d30676 Mon Sep 17 00:00:00 2001
+From f7c5e91c99f066efef6183e53d4c7c9a73d19389 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 083/177] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 098/192] Use -2 instead of -1 for our right-hand margin, so
  linewrapping works (#976643).
 
 Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
@@ -23,5 +23,5 @@ index 0e43f2c10..537d4bf86 100644
    geo->first_entry_y = 3; /* three empty lines*/
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0084-Use-linux16-when-appropriate-880840.patch b/0099-Use-linux16-when-appropriate-880840.patch
similarity index 90%
rename from 0084-Use-linux16-when-appropriate-880840.patch
rename to 0099-Use-linux16-when-appropriate-880840.patch
index b59b7d5..cebc5c6 100644
--- a/0084-Use-linux16-when-appropriate-880840.patch
+++ b/0099-Use-linux16-when-appropriate-880840.patch
@@ -1,7 +1,7 @@
-From 432d7de1c208de5afe53f2aff43a307867150461 Mon Sep 17 00:00:00 2001
+From 6f560f08b9bf0c0041a7ec2980e270fe9e2aca09 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:05:07 -0400
-Subject: [PATCH 084/177] Use linux16 when appropriate (#880840)
+Subject: [PATCH 099/192] Use linux16 when appropriate (#880840)
 
 The kernel group really would prefer that we use the 16 bit entry point
 on x86 bios machines.
@@ -48,5 +48,5 @@ index a3d9711d6..f3bf6acd8 100644
      fi
    fi
 -- 
-2.13.3
+2.13.4
 
diff --git a/0085-Enable-pager-by-default.-985860.patch b/0100-Enable-pager-by-default.-985860.patch
similarity index 82%
rename from 0085-Enable-pager-by-default.-985860.patch
rename to 0100-Enable-pager-by-default.-985860.patch
index 41772e2..77eab6a 100644
--- a/0085-Enable-pager-by-default.-985860.patch
+++ b/0100-Enable-pager-by-default.-985860.patch
@@ -1,7 +1,7 @@
-From e59ce0d1e5e94a761d7238bad2537dff2a8e89ab Mon Sep 17 00:00:00 2001
+From a7a59ff4c00792170ddba29a5939c5fecb253c1f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 085/177] Enable pager by default. (#985860)
+Subject: [PATCH 100/192] Enable pager by default. (#985860)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -22,5 +22,5 @@ index 93a90233e..858b526c9 100644
    load_env
  fi
 -- 
-2.13.3
+2.13.4
 
diff --git a/0086-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
similarity index 87%
rename from 0086-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
rename to 0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
index 82ad012..edd1ff2 100644
--- a/0086-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+++ b/0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
@@ -1,7 +1,7 @@
-From 929ad582b4546319866cd75f4abfe1096676278a Mon Sep 17 00:00:00 2001
+From a53467b1b78788c8661c50150dcef4ab4bcbd1e4 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH 086/177] F10 doesn't work on serial, so don't tell the user to
+Subject: [PATCH 101/192] F10 doesn't work on serial, so don't tell the user to
  hit it (#987443)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -23,5 +23,5 @@ index 537d4bf86..452d55bf9 100644
  					       STANDARD_MARGIN, STANDARD_MARGIN,
  					       term, dry_run);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0087-Don-t-say-GNU-Linux-in-generated-menus.patch b/0102-Don-t-say-GNU-Linux-in-generated-menus.patch
similarity index 91%
rename from 0087-Don-t-say-GNU-Linux-in-generated-menus.patch
rename to 0102-Don-t-say-GNU-Linux-in-generated-menus.patch
index e5f10c5..b63fe27 100644
--- a/0087-Don-t-say-GNU-Linux-in-generated-menus.patch
+++ b/0102-Don-t-say-GNU-Linux-in-generated-menus.patch
@@ -1,7 +1,7 @@
-From cd6bcdd2a4f67e9e5e5f1ccc6c5311dc6cb1ba14 Mon Sep 17 00:00:00 2001
+From 334fa04e691a47ab435a0cce35cf4b989b43a80c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH 087/177] Don't say "GNU/Linux" in generated menus.
+Subject: [PATCH 102/192] Don't say "GNU/Linux" in generated menus.
 
 ---
  util/grub.d/10_linux.in     | 4 ++--
@@ -41,5 +41,5 @@ index c002fc9f9..54f1ec8a2 100644
  fi
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0088-Don-t-draw-a-border-around-the-menu.patch b/0103-Don-t-draw-a-border-around-the-menu.patch
similarity index 95%
rename from 0088-Don-t-draw-a-border-around-the-menu.patch
rename to 0103-Don-t-draw-a-border-around-the-menu.patch
index b34c5a1..5205c74 100644
--- a/0088-Don-t-draw-a-border-around-the-menu.patch
+++ b/0103-Don-t-draw-a-border-around-the-menu.patch
@@ -1,7 +1,7 @@
-From 48544cac5507f9cfdbedfe3c576f164375436f3d Mon Sep 17 00:00:00 2001
+From 92f753273188441554068e0e653f7ba394d85940 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 088/177] Don't draw a border around the menu
+Subject: [PATCH 103/192] Don't draw a border around the menu
 
 It looks cleaner without it.
 ---
@@ -70,5 +70,5 @@ index 452d55bf9..1ed2bd92c 100644
    grub_term_highlight_color = old_color_highlight;
    geo->timeout_y = geo->first_entry_y + geo->num_entries
 -- 
-2.13.3
+2.13.4
 
diff --git a/0089-Use-the-standard-margin-for-the-timeout-string.patch b/0104-Use-the-standard-margin-for-the-timeout-string.patch
similarity index 91%
rename from 0089-Use-the-standard-margin-for-the-timeout-string.patch
rename to 0104-Use-the-standard-margin-for-the-timeout-string.patch
index e8338b0..747a8c9 100644
--- a/0089-Use-the-standard-margin-for-the-timeout-string.patch
+++ b/0104-Use-the-standard-margin-for-the-timeout-string.patch
@@ -1,7 +1,7 @@
-From 200dbe4bade3d87ddce65ac2063fe0a1ea0304cd Mon Sep 17 00:00:00 2001
+From aecbe8a0a7a384bebe61874c4ef9e5de0cd0642a 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 089/177] Use the standard margin for the timeout string
+Subject: [PATCH 104/192] Use the standard margin for the timeout string
 
 So that it aligns with the other messages
 ---
@@ -39,5 +39,5 @@ index 1ed2bd92c..7681f7d28 100644
      }
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0090-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0105-Add-.eh_frame-to-list-of-relocations-stripped.patch
similarity index 88%
rename from 0090-Add-.eh_frame-to-list-of-relocations-stripped.patch
rename to 0105-Add-.eh_frame-to-list-of-relocations-stripped.patch
index 02bcfdd..b874972 100644
--- a/0090-Add-.eh_frame-to-list-of-relocations-stripped.patch
+++ b/0105-Add-.eh_frame-to-list-of-relocations-stripped.patch
@@ -1,7 +1,7 @@
-From a3e874dfb2e9a671f04bd162291be16ac9a578bd Mon Sep 17 00:00:00 2001
+From e21419427cdb8248c5d99a3fa3776cb8570518aa Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 13 Jan 2014 21:50:59 -0500
-Subject: [PATCH 090/177] Add .eh_frame to list of relocations stripped
+Subject: [PATCH 105/192] Add .eh_frame to list of relocations stripped
 
 ---
  conf/Makefile.common | 2 +-
@@ -21,5 +21,5 @@ index 311da61c6..044ab3abe 100644
  CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
  LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
 -- 
-2.13.3
+2.13.4
 
diff --git a/0091-Make-10_linux-work-with-our-changes-for-linux16-and-.patch b/0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
similarity index 94%
rename from 0091-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
rename to 0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
index 9c8096d..0e4b082 100644
--- a/0091-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
+++ b/0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
@@ -1,7 +1,7 @@
-From 50c4c2eaa5cdc53b8a9e6a7bd06bbb36731fccfe Mon Sep 17 00:00:00 2001
+From 7e736292dcb182f7c012365c3fc02908585f8440 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 13:12:23 -0500
-Subject: [PATCH 091/177] Make 10_linux work with our changes for linux16 and
+Subject: [PATCH 106/192] Make 10_linux work with our changes for linux16 and
  linuxefi on aarch64
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -81,5 +81,5 @@ index ef52cf3db..191aebe80 100644
    for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
      if test -e "${i}" ; then
 -- 
-2.13.3
+2.13.4
 
diff --git a/0092-Don-t-print-during-fdt-loading-method.patch b/0107-Don-t-print-during-fdt-loading-method.patch
similarity index 81%
rename from 0092-Don-t-print-during-fdt-loading-method.patch
rename to 0107-Don-t-print-during-fdt-loading-method.patch
index 132c13f..b56dc33 100644
--- a/0092-Don-t-print-during-fdt-loading-method.patch
+++ b/0107-Don-t-print-during-fdt-loading-method.patch
@@ -1,7 +1,7 @@
-From d483a287db875a4ba8d8d6dd387243dd64f4ba97 Mon Sep 17 00:00:00 2001
+From 9e03e6019e0c1b5f171fd5a0098d95de83c92a11 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 16:15:46 -0500
-Subject: [PATCH 092/177] Don't print during fdt loading method.
+Subject: [PATCH 107/192] Don't print during fdt loading method.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -23,5 +23,5 @@ index 191aebe80..452a9f69d 100644
  EOF
    fi
 -- 
-2.13.3
+2.13.4
 
diff --git a/0093-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch b/0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
similarity index 86%
rename from 0093-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
rename to 0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
index d257fd4..cf8f1ae 100644
--- a/0093-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
+++ b/0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
@@ -1,7 +1,7 @@
-From c2bfcc48a47098e68a8264e54bcf2bdc2e305cd0 Mon Sep 17 00:00:00 2001
+From d67cd23e1ce2a0f0e70b367ecdda2c9ab13985ce Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Mon, 30 Jun 2014 14:16:46 -0400
-Subject: [PATCH 093/177] Don't munge raw spaces when we're doing our cmdline
+Subject: [PATCH 108/192] Don't munge raw spaces when we're doing our cmdline
  escaping (#923374)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -32,5 +32,5 @@ index 0a5b2afb9..970ea868c 100644
  	    {
  	      *buf++ = *c++;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0094-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0109-Don-t-require-a-password-to-boot-entries-generated-b.patch
similarity index 86%
rename from 0094-Don-t-require-a-password-to-boot-entries-generated-b.patch
rename to 0109-Don-t-require-a-password-to-boot-entries-generated-b.patch
index 82432a6..67e6ce6 100644
--- a/0094-Don-t-require-a-password-to-boot-entries-generated-b.patch
+++ b/0109-Don-t-require-a-password-to-boot-entries-generated-b.patch
@@ -1,7 +1,7 @@
-From f4347358e0d42afb3d260b7e20167e1b04150091 Mon Sep 17 00:00:00 2001
+From c21043e2abeb73b1441763509d9c03f30b963be8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 11 Feb 2014 11:14:50 -0500
-Subject: [PATCH 094/177] Don't require a password to boot entries generated by
+Subject: [PATCH 109/192] Don't require a password to boot entries generated by
  grub-mkconfig.
 
 When we set a password, we just want that to mean you can't /edit/ an entry.
@@ -27,5 +27,5 @@ index 452a9f69d..79a747ebd 100644
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    OS="$(sed 's, release .*$,,g' /etc/system-release)"
 -- 
-2.13.3
+2.13.4
 
diff --git a/0095-Don-t-emit-Booting-.-message.patch b/0110-Don-t-emit-Booting-.-message.patch
similarity index 87%
rename from 0095-Don-t-emit-Booting-.-message.patch
rename to 0110-Don-t-emit-Booting-.-message.patch
index 07d3530..725f1f3 100644
--- a/0095-Don-t-emit-Booting-.-message.patch
+++ b/0110-Don-t-emit-Booting-.-message.patch
@@ -1,7 +1,7 @@
-From 8cb813959ad6cd108000e03488f37ba26bdd5062 Mon Sep 17 00:00:00 2001
+From 4796aa1bb00d7f1704337e989d2c4cef5c2cc879 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 09:37:49 -0500
-Subject: [PATCH 095/177] Don't emit "Booting ..." message.
+Subject: [PATCH 110/192] Don't emit "Booting ..." message.
 
 UI team still hates this stuff, so we're disabling it for RHEL 7.
 
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 2e8a7bd89..004711dce 100644
+index d2f64b05e..5e2f5283d 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -34,7 +34,7 @@ index 2e8a7bd89..004711dce 100644
  
  /* Callback invoked when a default menu entry executed because of a timeout
 diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index eeeee5580..83490494e 100644
+index cdf3590a3..5785f67ee 100644
 --- a/grub-core/normal/menu_entry.c
 +++ b/grub-core/normal/menu_entry.c
 @@ -1167,9 +1167,6 @@ run (struct screen *screen)
@@ -48,5 +48,5 @@ index eeeee5580..83490494e 100644
    errs_before = grub_err_printed_errors;
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0096-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
similarity index 99%
rename from 0096-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
rename to 0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
index da47027..b7541b2 100644
--- a/0096-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
+++ b/0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
@@ -1,7 +1,7 @@
-From 360fb73a43a5d42cdca2dbb2d9d83da6ff1fca3d Mon Sep 17 00:00:00 2001
+From ef35b75ee89b4d065f6727b6e01cac72107e95f9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 4 Mar 2014 11:00:23 -0500
-Subject: [PATCH 096/177] Replace a lot of man pages with slightly nicer ones.
+Subject: [PATCH 111/192] Replace a lot of man pages with slightly nicer ones.
 
 Replace a bunch of machine generated ones with ones that look nicer.
 ---
@@ -168,7 +168,7 @@ index 9ae97f026..0cb971a92 100644
  # Optimization flag.  Allow user to override.
  if test "x$TARGET_CFLAGS" = x; then
 diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 93eb39627..ab28f1996 100644
+index e396ba10f..0669729cc 100644
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
 @@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi
@@ -1959,5 +1959,5 @@ index 000000000..37ea2dd5e
 +.SH SEE ALSO
 +.BR "info grub"
 -- 
-2.13.3
+2.13.4
 
diff --git a/0097-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
similarity index 91%
rename from 0097-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
rename to 0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
index 7adbeeb..24b183f 100644
--- a/0097-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+++ b/0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
@@ -1,7 +1,7 @@
-From f6319b18918458b54a9a717af070aade15b27b98 Mon Sep 17 00:00:00 2001
+From 8d2464a69534923e473fcd0058630a38a31dad48 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Wed, 19 Feb 2014 15:58:43 -0500
-Subject: [PATCH 097/177] use fw_path prefix when fallback searching for grub
+Subject: [PATCH 112/192] use fw_path prefix when fallback searching for grub
  config
 
 When PXE booting via UEFI firmware, grub was searching for grub.cfg
@@ -41,5 +41,5 @@ index 0ce59fdc3..a3713efcd 100644
          {
            grub_size_t config_len;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0098-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
similarity index 95%
rename from 0098-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
rename to 0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
index db2a69e..c3bac78 100644
--- a/0098-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+++ b/0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
@@ -1,7 +1,7 @@
-From 8ead76471f0b971efbbeb756d8274b2d0984e611 Mon Sep 17 00:00:00 2001
+From d11f6b6e85d9e33d4d247ae1a1fbee4a38c92978 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 6 Mar 2014 11:51:33 -0500
-Subject: [PATCH 098/177] Try mac/guid/etc before grub.cfg on tftp config
+Subject: [PATCH 113/192] Try mac/guid/etc before grub.cfg on tftp config
  files.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -111,5 +111,5 @@ index a3713efcd..7d9c4f09b 100644
    else
      grub_enter_normal_mode (argv[0]);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0099-Fix-convert-function-to-support-NVMe-devices.patch b/0114-Fix-convert-function-to-support-NVMe-devices.patch
similarity index 91%
rename from 0099-Fix-convert-function-to-support-NVMe-devices.patch
rename to 0114-Fix-convert-function-to-support-NVMe-devices.patch
index 308e1b0..2b3437d 100644
--- a/0099-Fix-convert-function-to-support-NVMe-devices.patch
+++ b/0114-Fix-convert-function-to-support-NVMe-devices.patch
@@ -1,7 +1,7 @@
-From 6ea677bb5656a84ea72d42ad4959b0b188f678b8 Mon Sep 17 00:00:00 2001
+From 42d897675b2952fad5274dd979fb493b6976167c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 11:34:00 -0500
-Subject: [PATCH 099/177] Fix convert function to support NVMe devices
+Subject: [PATCH 114/192] Fix convert function to support NVMe devices
 
 This is adapted from the patch at
 https://bugzilla.redhat.com/show_bug.cgi?id=1019660 , which is against
@@ -55,5 +55,5 @@ index 847406fba..fa3460d6c 100644
      return grub_util_devmapper_part_to_disk (&st, is_part, os_dev);
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0100-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch b/0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
similarity index 84%
rename from 0100-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
rename to 0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
index ab69501..b7b83a4 100644
--- a/0100-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
+++ b/0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
@@ -1,7 +1,7 @@
-From bb37b095c87a7c773ffce409d88e57924b8e8e99 Mon Sep 17 00:00:00 2001
+From 3d6dacedc4482b58109799358c8ed91e697b1717 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 10 Feb 2014 16:13:10 -0500
-Subject: [PATCH 100/177] Switch to use APM Mustang device tree, for hardware
+Subject: [PATCH 115/192] Switch to use APM Mustang device tree, for hardware
  testing.
 
 Signed-off-by: David A. Marlin <d.marlin@redhat.com>
@@ -25,5 +25,5 @@ index 79a747ebd..462b461ff 100644
      fi
    done
 -- 
-2.13.3
+2.13.4
 
diff --git a/0101-Use-the-default-device-tree-from-the-grub-default-fi.patch b/0116-Use-the-default-device-tree-from-the-grub-default-fi.patch
similarity index 90%
rename from 0101-Use-the-default-device-tree-from-the-grub-default-fi.patch
rename to 0116-Use-the-default-device-tree-from-the-grub-default-fi.patch
index 3025656..2228bc4 100644
--- a/0101-Use-the-default-device-tree-from-the-grub-default-fi.patch
+++ b/0116-Use-the-default-device-tree-from-the-grub-default-fi.patch
@@ -1,7 +1,7 @@
-From f158ae5fa54ff3bdaf8720ee2667430037d978c6 Mon Sep 17 00:00:00 2001
+From ffddaa31d23826e2123bdeab567ba1f4e4fd4df2 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Wed, 12 Feb 2014 14:54:04 -0500
-Subject: [PATCH 101/177] Use the default device tree from the grub default
+Subject: [PATCH 116/192] Use the default device tree from the grub default
  file
 
 instead of hardcoding a value.
@@ -42,5 +42,5 @@ index 462b461ff..a9692a0c2 100644
      fi
    done
 -- 
-2.13.3
+2.13.4
 
diff --git a/0102-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
similarity index 90%
rename from 0102-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
rename to 0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
index fdfc82a..12f3945 100644
--- a/0102-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+++ b/0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
@@ -1,7 +1,7 @@
-From 6d9ce9d5bb1d2cf5ae0b81f4dea62a9da1671daf Mon Sep 17 00:00:00 2001
+From dc504f405ad6a968d9f5af120dd6b2a212bb0001 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Sat, 15 Feb 2014 15:10:22 -0500
-Subject: [PATCH 102/177] reopen SNP protocol for exclusive use by grub
+Subject: [PATCH 117/192] reopen SNP protocol for exclusive use by grub
 
 ---
  grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++
@@ -42,5 +42,5 @@ index 5388f952b..ea0e0ca36 100644
    }
  }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0103-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
similarity index 92%
rename from 0103-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
rename to 0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
index a0adb27..f6ec9a1 100644
--- a/0103-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+++ b/0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
@@ -1,7 +1,7 @@
-From 94bd63821b5bb9e3c95de006a5f7527a86bc53a9 Mon Sep 17 00:00:00 2001
+From 6935b93eb6deacf6cd72ec6dad41cc01347f4015 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 4 Mar 2016 15:13:59 -0500
-Subject: [PATCH 103/177] Revert "reopen SNP protocol for exclusive use by
+Subject: [PATCH 118/192] Revert "reopen SNP protocol for exclusive use by
  grub"
 
 This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is
@@ -51,5 +51,5 @@ index ea0e0ca36..5388f952b 100644
    }
  }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0104-Add-grub_util_readlink.patch b/0119-Add-grub_util_readlink.patch
similarity index 99%
rename from 0104-Add-grub_util_readlink.patch
rename to 0119-Add-grub_util_readlink.patch
index 7abe500..640dff9 100644
--- a/0104-Add-grub_util_readlink.patch
+++ b/0119-Add-grub_util_readlink.patch
@@ -1,7 +1,7 @@
-From 576498550cbfb335c6754a04e838818f670cdfe4 Mon Sep 17 00:00:00 2001
+From e6835380a668fbb6b1739ac10e492e766d5416bd Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Sep 2014 10:01:03 -0400
-Subject: [PATCH 104/177] Add grub_util_readlink()
+Subject: [PATCH 119/192] Add grub_util_readlink()
 
 Add grub_util_readlink().  This requires pulling in stat and readlink from
 gnulib, which pulls in stat and related headers, but after that the
@@ -3730,5 +3730,5 @@ index 000000000..9852778f9
 +  REPLACE_LOCALTIME=0;                   AC_SUBST([REPLACE_LOCALTIME])
 +])
 -- 
-2.13.3
+2.13.4
 
diff --git a/0105-Make-editenv-chase-symlinks-including-those-across-d.patch b/0120-Make-editenv-chase-symlinks-including-those-across-d.patch
similarity index 95%
rename from 0105-Make-editenv-chase-symlinks-including-those-across-d.patch
rename to 0120-Make-editenv-chase-symlinks-including-those-across-d.patch
index 6f600f0..134f03a 100644
--- a/0105-Make-editenv-chase-symlinks-including-those-across-d.patch
+++ b/0120-Make-editenv-chase-symlinks-including-those-across-d.patch
@@ -1,7 +1,7 @@
-From 0a62851dcb02d4a059713ae36ea97f13f01000d5 Mon Sep 17 00:00:00 2001
+From 4e4d07017eea4d6540559f7753cd26efa9e0dfdf Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Sep 2014 10:38:00 -0400
-Subject: [PATCH 105/177] Make editenv chase symlinks including those across
+Subject: [PATCH 120/192] Make editenv chase symlinks including those across
  devices.
 
 This lets us make /boot/grub2/grubenv a symlink to
@@ -102,5 +102,5 @@ index c6f8d2298..d8d1dad6a 100644
 +  free (rename_target);
  }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0106-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
similarity index 89%
rename from 0106-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
rename to 0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
index a88a119..143eb66 100644
--- a/0106-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+++ b/0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
@@ -1,7 +1,7 @@
-From db8335f73dea6432fa9f87b5e1a25adf011ae62c Mon Sep 17 00:00:00 2001
+From 3a14f08bd4cf5a18cb4348c362cefa6f2dd298a2 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 14:23:23 -0400
-Subject: [PATCH 106/177] Generate OS and CLASS in 10_linux from
+Subject: [PATCH 121/192] Generate OS and CLASS in 10_linux from
  /etc/os-release
 
 This makes us use pretty names in the titles we generate in
@@ -29,5 +29,5 @@ index a9692a0c2..c6627268c 100644
    OS="${GRUB_DISTRIBUTOR}"
    CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
 -- 
-2.13.3
+2.13.4
 
diff --git a/0107-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
similarity index 88%
rename from 0107-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
rename to 0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
index ee74681..de7510a 100644
--- a/0107-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+++ b/0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
@@ -1,7 +1,7 @@
-From e7b099e5a78ffc103d53ff37b7a9a9175aea8e97 Mon Sep 17 00:00:00 2001
+From d58ebb3d09e1b22ba4a58c9ebc8eecab5ae20f98 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 15:52:08 -0400
-Subject: [PATCH 107/177] Minimize the sort ordering for .debug and -rescue-
+Subject: [PATCH 122/192] Minimize the sort ordering for .debug and -rescue-
  kernels.
 
 Resolves: rhbz#1065360
@@ -30,5 +30,5 @@ index cf35e4174..10fabee5e 100644
    version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
    return "$?"
 -- 
-2.13.3
+2.13.4
 
diff --git a/0108-Load-arm-with-SB-enabled.patch b/0123-Load-arm-with-SB-enabled.patch
similarity index 93%
rename from 0108-Load-arm-with-SB-enabled.patch
rename to 0123-Load-arm-with-SB-enabled.patch
index 761808e..d2faef6 100644
--- a/0108-Load-arm-with-SB-enabled.patch
+++ b/0123-Load-arm-with-SB-enabled.patch
@@ -1,7 +1,7 @@
-From 13b617ad326bf90d713cfde77a668f20939bce1a Mon Sep 17 00:00:00 2001
+From 6e8a67f6e4d0699d47c6fe86343d122252491f09 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 18 Sep 2014 11:26:14 -0400
-Subject: [PATCH 108/177] Load arm with SB enabled.
+Subject: [PATCH 123/192] Load arm with SB enabled.
 
 Make sure we actually try to validate secure boot on this platform (even
 though we're not shipping it enabled by default.)
@@ -11,17 +11,17 @@ kernel command line, because we can't call systab->bs->LoadImage() if SB
 is enabled.
 ---
  grub-core/Makefile.core.def       |   3 +
- grub-core/loader/arm64/linux.c    | 117 ++++++++++++++++++++------------------
+ grub-core/loader/arm64/linux.c    | 116 ++++++++++++++++++++------------------
  grub-core/loader/efi/linux.c      |  65 +++++++++++++++++++++
  grub-core/loader/i386/efi/linux.c |  39 +------------
  include/grub/arm64/linux.h        |   7 +++
  include/grub/efi/linux.h          |  31 ++++++++++
- 6 files changed, 171 insertions(+), 91 deletions(-)
+ 6 files changed, 171 insertions(+), 90 deletions(-)
  create mode 100644 grub-core/loader/efi/linux.c
  create mode 100644 include/grub/efi/linux.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 3a05683d2..f111f95ef 100644
+index 7f3d5a2bf..5ae70204c 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -1709,6 +1709,8 @@ module = {
@@ -42,13 +42,13 @@ index 3a05683d2..f111f95ef 100644
    enable = x86_64_efi;
  };
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 9519d2e4d..4756ef71f 100644
+index 746edd104..450d1a1de 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -28,6 +28,7 @@
  #include <grub/cpu/linux.h>
- #include <grub/cpu/fdtload.h>
  #include <grub/efi/efi.h>
+ #include <grub/efi/fdtload.h>
 +#include <grub/efi/linux.h>
  #include <grub/efi/pe32.h>
  #include <grub/i18n.h>
@@ -61,7 +61,7 @@ index 9519d2e4d..4756ef71f 100644
  
  static char *linux_args;
  static grub_uint32_t cmdline_size;
-@@ -67,7 +69,8 @@ grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh)
+@@ -65,7 +67,8 @@ grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh)
  static grub_err_t
  finalize_params_linux (void)
  {
@@ -71,7 +71,7 @@ index 9519d2e4d..4756ef71f 100644
  
    void *fdt;
  
-@@ -102,6 +105,26 @@ finalize_params_linux (void)
+@@ -100,6 +103,26 @@ finalize_params_linux (void)
    if (grub_fdt_install() != GRUB_ERR_NONE)
      goto failure;
  
@@ -98,7 +98,7 @@ index 9519d2e4d..4756ef71f 100644
    return GRUB_ERR_NONE;
  
  failure:
-@@ -109,73 +132,47 @@ failure:
+@@ -107,72 +130,47 @@ failure:
    return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
  }
  
@@ -159,8 +159,7 @@ index 9519d2e4d..4756ef71f 100644
 -  loaded_image->load_options_size = len =
 -    (grub_strlen (args) + 1) * sizeof (grub_efi_char16_t);
 -  loaded_image->load_options =
--    grub_efi_allocate_pages (0,
--			     GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
+-    grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
 -  if (!loaded_image->load_options)
 +  retval = finalize_params_linux ();
 +  if (retval != GRUB_ERR_NONE)
@@ -176,7 +175,7 @@ index 9519d2e4d..4756ef71f 100644
  
 -  /* When successful, not reached */
 -  b->unload_image (image_handle);
--  grub_efi_free_pages ((grub_efi_physical_address_t) loaded_image->load_options,
+-  grub_efi_free_pages ((grub_addr_t) loaded_image->load_options,
 -		       GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
 +  retval = grub_efi_linux_boot ((char *)kernel_addr, handover_offset,
 +				kernel_addr);
@@ -200,7 +199,7 @@ index 9519d2e4d..4756ef71f 100644
  }
  
  static grub_err_t
-@@ -253,6 +250,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -249,6 +247,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  {
    grub_file_t file = 0;
    struct grub_arm64_linux_kernel_header lh;
@@ -208,7 +207,7 @@ index 9519d2e4d..4756ef71f 100644
  
    grub_dl_ref (my_mod);
  
-@@ -297,6 +295,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -293,6 +292,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
  
@@ -363,7 +362,7 @@ index b79e6320b..e5b778577 100644
  
  static grub_err_t
 diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
-index 1ea23696e..a2ba24e9f 100644
+index a981df5d1..0df384133 100644
 --- a/include/grub/arm64/linux.h
 +++ b/include/grub/arm64/linux.h
 @@ -20,6 +20,7 @@
@@ -374,7 +373,7 @@ index 1ea23696e..a2ba24e9f 100644
  
  #define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */
  
-@@ -44,5 +45,11 @@ grub_err_t grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header
+@@ -42,5 +43,11 @@ grub_err_t grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header
                                          *lh);
  grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size,
                                         char *args);
@@ -424,5 +423,5 @@ index 000000000..d9ede3677
 +
 +#endif /* ! GRUB_EFI_LINUX_HEADER */
 -- 
-2.13.3
+2.13.4
 
diff --git a/0109-Try-prefix-if-fw_path-doesn-t-work.patch b/0124-Try-prefix-if-fw_path-doesn-t-work.patch
similarity index 97%
rename from 0109-Try-prefix-if-fw_path-doesn-t-work.patch
rename to 0124-Try-prefix-if-fw_path-doesn-t-work.patch
index 2825c8e..9f9ad3c 100644
--- a/0109-Try-prefix-if-fw_path-doesn-t-work.patch
+++ b/0124-Try-prefix-if-fw_path-doesn-t-work.patch
@@ -1,7 +1,7 @@
-From 0373b3186da513480a745a17013eceff4f9914c9 Mon Sep 17 00:00:00 2001
+From 55734dd999108c3658a3b866fffc3102737c10a5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 3 Oct 2014 11:08:03 -0400
-Subject: [PATCH 109/177] Try $prefix if $fw_path doesn't work.
+Subject: [PATCH 124/192] Try $prefix if $fw_path doesn't work.
 
 Related: rhbz#1148652
 
@@ -207,5 +207,5 @@ index 7d9c4f09b..b69f9e738 100644
  }
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0110-Update-info-with-grub.cfg-netboot-selection-order-11.patch b/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch
similarity index 93%
rename from 0110-Update-info-with-grub.cfg-netboot-selection-order-11.patch
rename to 0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch
index 0b38b86..a2eff38 100644
--- a/0110-Update-info-with-grub.cfg-netboot-selection-order-11.patch
+++ b/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch
@@ -1,7 +1,7 @@
-From e78f55562f260c474d2a536c28c531a3191bacad Mon Sep 17 00:00:00 2001
+From b3d96d38f0f7ac225efe863eb34aaec71f5c6236 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 16 Mar 2015 16:34:51 -0400
-Subject: [PATCH 110/177] Update info with grub.cfg netboot selection order
+Subject: [PATCH 125/192] Update info with grub.cfg netboot selection order
  (#1148650)
 
 Added documentation to the grub info page that specifies the order
@@ -66,5 +66,5 @@ index 6fdd2a041..15a90b26e 100644
  @samp{(tftp)} device.
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0111-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
similarity index 96%
rename from 0111-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
rename to 0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
index a8e8cdc..20bd0ad 100644
--- a/0111-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
+++ b/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
@@ -1,7 +1,7 @@
-From 63b928b291dd5ddf81ca885d3e23fb566a2bb816 Mon Sep 17 00:00:00 2001
+From 61e77dd153b356351235c0e548ab52f81fe473b9 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 16 Mar 2015 14:14:19 -0400
-Subject: [PATCH 111/177] Use Distribution Package Sort for grub2-mkconfig
+Subject: [PATCH 126/192] Use Distribution Package Sort for grub2-mkconfig
  (#1124074)
 
 Users reported that newly installed kernels on their systems installed
@@ -11,28 +11,29 @@ use the rpm-sort library to sort kernels instead.
 
 Resolves rhbz#1124074
 ---
- .gitignore                |   1 +
+ .gitignore                |   2 +
  Makefile.util.def         |  16 +++
  configure.ac              |  29 +++++
  util/grub-mkconfig_lib.in |   8 +-
  util/grub-rpm-sort.8      |  12 ++
  util/grub-rpm-sort.c      | 281 ++++++++++++++++++++++++++++++++++++++++++++++
- 6 files changed, 346 insertions(+), 1 deletion(-)
+ 6 files changed, 347 insertions(+), 1 deletion(-)
  create mode 100644 util/grub-rpm-sort.8
  create mode 100644 util/grub-rpm-sort.c
 
 diff --git a/.gitignore b/.gitignore
-index e82aa55b1..af431b74f 100644
+index d95fac578..1c8537129 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -233,6 +233,7 @@ po/POTFILES.in
- po/POTFILES-shell.in
- /grub-glue-efi
- /grub-render-label
-+grub-rpm-sort
- /grub-glue-efi.exe
- /grub-render-label.exe
- grub-core/gnulib/locale.h
+@@ -101,6 +101,8 @@ grub-*.tar.*
+ /grub*-reboot.8
+ /grub*-render-label
+ /grub*-render-label.1
++/grub*-rpm-sort
++/grub*-rpm-sort.8
+ /grub*-script-check
+ /grub*-script-check.1
+ /grub*-set-default
 diff --git a/Makefile.util.def b/Makefile.util.def
 index 206110458..d846b81b5 100644
 --- a/Makefile.util.def
@@ -446,5 +447,5 @@ index 000000000..f33bd1ed5
 +  return 0;
 +}
 -- 
-2.13.3
+2.13.4
 
diff --git a/0112-Handle-rssd-storage-devices.patch b/0127-Handle-rssd-storage-devices.patch
similarity index 88%
rename from 0112-Handle-rssd-storage-devices.patch
rename to 0127-Handle-rssd-storage-devices.patch
index 9a14fa2..ec57954 100644
--- a/0112-Handle-rssd-storage-devices.patch
+++ b/0127-Handle-rssd-storage-devices.patch
@@ -1,7 +1,7 @@
-From cf31c945475c070cec65f04cc6fc0629f115afd2 Mon Sep 17 00:00:00 2001
+From 6865b4f0ee030c7575ecf7d1bf31bdef3981d43b Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 30 Jun 2015 15:50:41 -0400
-Subject: [PATCH 112/177] Handle rssd storage devices.
+Subject: [PATCH 127/192] Handle rssd storage devices.
 
 Resolves: rhbz#1087962
 
@@ -35,5 +35,5 @@ index 90d92d3ad..6d9f4e5fa 100644
        if ((strncmp ("loop", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
  	{
 -- 
-2.13.3
+2.13.4
 
diff --git a/0113-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch b/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
similarity index 93%
rename from 0113-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
rename to 0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
index 876e39a..e5347b4 100644
--- a/0113-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
+++ b/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
@@ -1,7 +1,7 @@
-From 31a01c3811c176913ae11fd8d27f8ac3d5e32fde Mon Sep 17 00:00:00 2001
+From 426b12a33d84f11e896c19cc2e1fdc5a695ebdc3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 27 Oct 2014 09:22:55 -0400
-Subject: [PATCH 113/177] Try to emit linux16/initrd16 and linuxefi/initrdefi
+Subject: [PATCH 128/192] Try to emit linux16/initrd16 and linuxefi/initrdefi
  in 30-os_prober.
 
 Resolves: rhbz#1108296
@@ -73,5 +73,5 @@ index 9b8f5968e..dc98eace9 100644
          fi
          cat << EOF
 -- 
-2.13.3
+2.13.4
 
diff --git a/0114-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
similarity index 94%
rename from 0114-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
rename to 0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
index ec56023..c5abc9e 100644
--- a/0114-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+++ b/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
@@ -1,7 +1,7 @@
-From 2071b0575dd4a9b18244b7b5175a41ce39c3f8b9 Mon Sep 17 00:00:00 2001
+From 2672466f667ac62616ccaf274d40a3d10ab9b61b Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 28 Apr 2015 11:15:03 -0400
-Subject: [PATCH 114/177] Make grub2-mkconfig construct titles that look like
+Subject: [PATCH 129/192] Make grub2-mkconfig construct titles that look like
  the ones we want elsewhere.
 
 Resolves: rhbz#1215839
@@ -50,5 +50,5 @@ index c6627268c..121524185 100644
        echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
    else
 -- 
-2.13.3
+2.13.4
 
diff --git a/0115-Add-friendly-grub2-password-config-tool-985962.patch b/0130-Add-friendly-grub2-password-config-tool-985962.patch
similarity index 93%
rename from 0115-Add-friendly-grub2-password-config-tool-985962.patch
rename to 0130-Add-friendly-grub2-password-config-tool-985962.patch
index cc8ab03..9246c8a 100644
--- a/0115-Add-friendly-grub2-password-config-tool-985962.patch
+++ b/0130-Add-friendly-grub2-password-config-tool-985962.patch
@@ -1,7 +1,7 @@
-From 1a93a7ffc010e413c8b43b6554e308c45fda203f Mon Sep 17 00:00:00 2001
+From 6fc3455ae10a9e6c18e37c781cda811b3a73285e Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Thu, 25 Jun 2015 11:13:11 -0400
-Subject: [PATCH 115/177] Add friendly grub2 password config tool (#985962)
+Subject: [PATCH 130/192] Add friendly grub2 password config tool (#985962)
 
 Provided a tool for users to reset the grub2 root user password
 without having to alter the grub.cfg. The hashed password now
@@ -9,30 +9,31 @@ lives in a root-only-readable configuration file.
 
 Resolves: rhbz#985962
 ---
- .gitignore               |   1 +
+ .gitignore               |   2 +
  Makefile.util.def        |  13 +++++
  configure.ac             |   1 +
  util/grub-mkconfig.in    |   2 +
  util/grub-setpassword.8  |  28 +++++++++++
  util/grub-setpassword.in | 123 +++++++++++++++++++++++++++++++++++++++++++++++
  util/grub.d/01_users.in  |  11 +++++
- 7 files changed, 179 insertions(+)
+ 7 files changed, 180 insertions(+)
  create mode 100644 util/grub-setpassword.8
  create mode 100644 util/grub-setpassword.in
  create mode 100644 util/grub.d/01_users.in
 
 diff --git a/.gitignore b/.gitignore
-index af431b74f..302be1e8f 100644
+index 1c8537129..387e3554c 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -126,6 +126,7 @@ grub-reboot
- grub-render-label
- grub-script-check
- grub-set-default
-+grub-setpassword
- grub-shell
- grub-shell-tester
- grub-sparc64-setup
+@@ -107,6 +107,8 @@ grub-*.tar.*
+ /grub*-script-check.1
+ /grub*-set-default
+ /grub*-set-default.8
++/grub*-setsetpassword
++/grub*-setsetpassword.8
+ /grub*-shell
+ /grub*-shell-tester
+ /grub*-sparc64-setup
 diff --git a/Makefile.util.def b/Makefile.util.def
 index d846b81b5..226c46b2d 100644
 --- a/Makefile.util.def
@@ -270,5 +271,5 @@ index 000000000..db2f44bfb
 +fi
 +EOF
 -- 
-2.13.3
+2.13.4
 
diff --git a/0116-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch b/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch
similarity index 95%
rename from 0116-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch
rename to 0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch
index 0fb2253..ad35534 100644
--- a/0116-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch
+++ b/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch
@@ -1,7 +1,7 @@
-From 703ac12cc7b710cf5fd8ed08fdaaa760ffdff501 Mon Sep 17 00:00:00 2001
+From 8d52adac75a53452e6b1e6ed527b90b7cbaac7a6 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 10 Oct 2014 11:11:09 +0200
-Subject: [PATCH 116/177] calibrate_tsc(): use the Stall() EFI boot service on
+Subject: [PATCH 131/192] calibrate_tsc(): use the Stall() EFI boot service on
  GRUB_MACHINE_EFI
 
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1150698
@@ -99,5 +99,5 @@ index 2e85289d8..0787b6f3e 100644
  
  void
 -- 
-2.13.3
+2.13.4
 
diff --git a/0117-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
similarity index 93%
rename from 0117-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
rename to 0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
index b7de6d0..2ee5099 100644
--- a/0117-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+++ b/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
@@ -1,7 +1,7 @@
-From 85de6a1e7740161c10b000964d098d62cee8e19f Mon Sep 17 00:00:00 2001
+From 3c013a85d664c54b2079b3a99ed9b3c35ed35558 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 28 Apr 2015 11:15:03 -0400
-Subject: [PATCH 117/177] Make grub2-mkconfig construct titles that look like
+Subject: [PATCH 132/192] Make grub2-mkconfig construct titles that look like
  the ones we want elsewhere.
 
 Resolves: rhbz#1215839
@@ -64,5 +64,5 @@ index 121524185..584ad1f46 100644
  	  replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
  	  quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
 -- 
-2.13.3
+2.13.4
 
diff --git a/0118-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch b/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
similarity index 92%
rename from 0118-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
rename to 0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
index 337ed64..a74b320 100644
--- a/0118-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
+++ b/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
@@ -1,7 +1,7 @@
-From d49a8ee11c2bec63bcc63f318609ba003f5687f5 Mon Sep 17 00:00:00 2001
+From 941c74e3216ffe8f8fe24e7ba36a50455ed6b497 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 3 Aug 2015 11:46:42 -0400
-Subject: [PATCH 118/177] Try to make sure configure.ac and grub-rpm-sort play
+Subject: [PATCH 133/192] Try to make sure configure.ac and grub-rpm-sort play
  nice.
 
 Apparently the test for whether to use grub-rpm-sort and also the
@@ -57,5 +57,5 @@ index 954844d2d..9c410eae4 100644
  
  version_test_numeric ()
 -- 
-2.13.3
+2.13.4
 
diff --git a/0119-tcp-add-window-scaling-support.patch b/0134-tcp-add-window-scaling-support.patch
similarity index 95%
rename from 0119-tcp-add-window-scaling-support.patch
rename to 0134-tcp-add-window-scaling-support.patch
index 275d291..ac2e1bb 100644
--- a/0119-tcp-add-window-scaling-support.patch
+++ b/0134-tcp-add-window-scaling-support.patch
@@ -1,7 +1,7 @@
-From 75c2a677f927515e68899022941084be830462ac Mon Sep 17 00:00:00 2001
+From 4a2c29f5380f275e6bc45da4aab984b508c33b86 Mon Sep 17 00:00:00 2001
 From: Josef Bacik <jbacik@fb.com>
 Date: Wed, 12 Aug 2015 08:57:55 -0700
-Subject: [PATCH 119/177] tcp: add window scaling support
+Subject: [PATCH 134/192] tcp: add window scaling support
 
 Sometimes we have to provision boxes across regions, such as California to
 Sweden.  The http server has a 10 minute timeout, so if we can't get our 250mb
@@ -86,5 +86,5 @@ index e8ad34b84..7d4b82262 100644
    tcp_socket_register (socket);
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0120-efinet-retransmit-if-our-device-is-busy.patch b/0135-efinet-retransmit-if-our-device-is-busy.patch
similarity index 92%
rename from 0120-efinet-retransmit-if-our-device-is-busy.patch
rename to 0135-efinet-retransmit-if-our-device-is-busy.patch
index b305311..5c920cc 100644
--- a/0120-efinet-retransmit-if-our-device-is-busy.patch
+++ b/0135-efinet-retransmit-if-our-device-is-busy.patch
@@ -1,7 +1,7 @@
-From 1c8d555408d928794b1cf356775ebc0a94c62e6f Mon Sep 17 00:00:00 2001
+From c0eee5273948412c2b9ef225b42e0ced909aeb43 Mon Sep 17 00:00:00 2001
 From: Josef Bacik <jbacik@fb.com>
 Date: Mon, 31 Aug 2015 13:34:35 -0400
-Subject: [PATCH 120/177] efinet: retransmit if our device is busy
+Subject: [PATCH 135/192] efinet: retransmit if our device is busy
 
 When I fixed the txbuf handling I ripped out the retransmission code since it
 was flooding our network when we had the buggy behavior.  Turns out this was too
@@ -44,5 +44,5 @@ index 5388f952b..3f112438a 100644
  	  return grub_error (GRUB_ERR_TIMEOUT,
  			     N_("couldn't send network packet"));
 -- 
-2.13.3
+2.13.4
 
diff --git a/0121-Be-more-aggro-about-actually-using-the-configured-ne.patch b/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch
similarity index 98%
rename from 0121-Be-more-aggro-about-actually-using-the-configured-ne.patch
rename to 0136-Be-more-aggro-about-actually-using-the-configured-ne.patch
index 16e520a..ffb9cfe 100644
--- a/0121-Be-more-aggro-about-actually-using-the-configured-ne.patch
+++ b/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch
@@ -1,7 +1,7 @@
-From 096244a4746dd33e033d7076598d97d9592f1f75 Mon Sep 17 00:00:00 2001
+From 44d119990a08f605076bac1066d0292ab8e74dda Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 11 Sep 2015 17:30:49 -0400
-Subject: [PATCH 121/177] Be more aggro about actually using the *configured*
+Subject: [PATCH 136/192] Be more aggro about actually using the *configured*
  network device.
 
 Right now we use any SNP device with the same mac+IP block, but when
@@ -220,5 +220,5 @@ index c7c9f0e1d..97b9aa7a4 100644
  #define GRUB_EFI_DEVICE_PATH_SUBTYPE(dp)	((dp)->subtype)
  #define GRUB_EFI_DEVICE_PATH_LENGTH(dp)		((dp)->length)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0122-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch b/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
similarity index 94%
rename from 0122-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
rename to 0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
index 31af031..11afaa7 100644
--- a/0122-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
+++ b/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
@@ -1,7 +1,7 @@
-From e9db498504e103587c3bc908b240b5e7baf68436 Mon Sep 17 00:00:00 2001
+From eb23b29a1a70fc61ac2cc68acb756499e7a60cb2 Mon Sep 17 00:00:00 2001
 From: RHEL Ninjas <example@example.com>
 Date: Fri, 25 Sep 2015 16:24:23 +0900
-Subject: [PATCH 122/177] efinet: add filter for the first exclusive reopen of
+Subject: [PATCH 137/192] efinet: add filter for the first exclusive reopen of
  SNP
 
 ---
@@ -59,5 +59,5 @@ index a3ce4c67c..b870d3f19 100644
    }
  }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0123-Fix-security-issue-when-reading-username-and-passwor.patch b/0138-Fix-security-issue-when-reading-username-and-passwor.patch
similarity index 77%
rename from 0123-Fix-security-issue-when-reading-username-and-passwor.patch
rename to 0138-Fix-security-issue-when-reading-username-and-passwor.patch
index adcafad..695ba3a 100644
--- a/0123-Fix-security-issue-when-reading-username-and-passwor.patch
+++ b/0138-Fix-security-issue-when-reading-username-and-passwor.patch
@@ -1,7 +1,7 @@
-From 291aab5a07c51ecdfc386cfd7fdabb009375ce0d Mon Sep 17 00:00:00 2001
+From ba44a4863d38296e61ee7be3e71841fafe655b71 Mon Sep 17 00:00:00 2001
 From: Hector Marco-Gisbert <hecmargi@upv.es>
 Date: Fri, 13 Nov 2015 16:21:09 +0100
-Subject: [PATCH 123/177] Fix security issue when reading username and password
+Subject: [PATCH 138/192] Fix security issue when reading username and password
 
   This patch fixes two integer underflows at:
     * grub-core/lib/crypto.c
@@ -17,7 +17,7 @@ Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
-index 683a8aaa7..c5ab9eb18 100644
+index ca334d5a4..e6c78d16d 100644
 --- a/grub-core/lib/crypto.c
 +++ b/grub-core/lib/crypto.c
 @@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size)
@@ -30,18 +30,18 @@ index 683a8aaa7..c5ab9eb18 100644
  	  if (cur_len)
  	    cur_len--;
 diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
-index 7338f8245..6d6dc7ded 100644
+index 6be678c0d..c35ce9724 100644
 --- a/grub-core/normal/auth.c
 +++ b/grub-core/normal/auth.c
 @@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)
  	  break;
  	}
  
--      if (key == '\b')
-+      if (key == '\b' && cur_len)
+-      if (key == GRUB_TERM_BACKSPACE)
++      if (key == GRUB_TERM_BACKSPACE && cur_len)
  	{
  	  if (cur_len)
  	    {
 -- 
-2.13.3
+2.13.4
 
diff --git a/0124-Warn-if-grub-password-will-not-be-read-1290803.patch b/0139-Warn-if-grub-password-will-not-be-read-1290803.patch
similarity index 88%
rename from 0124-Warn-if-grub-password-will-not-be-read-1290803.patch
rename to 0139-Warn-if-grub-password-will-not-be-read-1290803.patch
index f595a18..213b951 100644
--- a/0124-Warn-if-grub-password-will-not-be-read-1290803.patch
+++ b/0139-Warn-if-grub-password-will-not-be-read-1290803.patch
@@ -1,7 +1,7 @@
-From 5cee642bc2d950c453cdf97d0bcac566063c6c7b Mon Sep 17 00:00:00 2001
+From ae7883c825d891acf86441d36736d04bbf50521c Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 22 Feb 2016 15:30:05 -0500
-Subject: [PATCH 124/177] Warn if grub password will not be read (#1290803)
+Subject: [PATCH 139/192] Warn if grub password will not be read (#1290803)
 
 It is possible for a system to have never run grub-mkconfig and add the
 section that reads the user.cfg file which contains a user set GRUB
@@ -27,5 +27,5 @@ index dd76f00fc..fb9d3a3b6 100644
 +    echo "Update your configuration with @grub_mkconfig@ to support this feature."
 +fi
 -- 
-2.13.3
+2.13.4
 
diff --git a/0125-Clean-up-grub-setpassword-documentation-1290799.patch b/0140-Clean-up-grub-setpassword-documentation-1290799.patch
similarity index 93%
rename from 0125-Clean-up-grub-setpassword-documentation-1290799.patch
rename to 0140-Clean-up-grub-setpassword-documentation-1290799.patch
index 29da8b2..09c660e 100644
--- a/0125-Clean-up-grub-setpassword-documentation-1290799.patch
+++ b/0140-Clean-up-grub-setpassword-documentation-1290799.patch
@@ -1,7 +1,7 @@
-From d170636244244428bf5a257682be98fc2b46c7d4 Mon Sep 17 00:00:00 2001
+From 97810f430350c3844e233f66dd5ed8823448a546 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Tue, 26 Jan 2016 10:28:35 -0500
-Subject: [PATCH 125/177] Clean up grub-setpassword documentation (#1290799)
+Subject: [PATCH 140/192] Clean up grub-setpassword documentation (#1290799)
 
 The output for --help had some errors. Corrected those and polished the
 text to be a little easier to follow. Carried verbage over to man page
@@ -54,5 +54,5 @@ index fb9d3a3b6..c8c0fa419 100644
  Report bugs at https://bugzilla.redhat.com.
  EOF
 -- 
-2.13.3
+2.13.4
 
diff --git a/0126-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch
similarity index 86%
rename from 0126-Fix-locale-issue-in-grub-setpassword-1294243.patch
rename to 0141-Fix-locale-issue-in-grub-setpassword-1294243.patch
index 993c585..13017d9 100644
--- a/0126-Fix-locale-issue-in-grub-setpassword-1294243.patch
+++ b/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch
@@ -1,7 +1,7 @@
-From 04d7ca10eb39d3c09dd2a8c701ff2764a3c6093d Mon Sep 17 00:00:00 2001
+From f577bb7128c8985b656ad8c70f44a4ee866da21e Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Fri, 29 Jan 2016 16:56:11 -0500
-Subject: [PATCH 126/177] Fix locale issue in grub-setpassword (#1294243)
+Subject: [PATCH 141/192] Fix locale issue in grub-setpassword (#1294243)
 
 A shell substitution was expecting non-translated output to grab the
 hashed password and put it in the user.cfg file. Modified code to force
@@ -26,5 +26,5 @@ index c8c0fa419..d7924af51 100644
          sed -e "s/PBKDF2 hash of your password is //"
  }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0127-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch b/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
similarity index 86%
rename from 0127-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
rename to 0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
index 86bf3c1..692f77f 100644
--- a/0127-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
+++ b/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
@@ -1,7 +1,7 @@
-From ce78e6dd0ab8326b48919d98662a7319ce34dd8f Mon Sep 17 00:00:00 2001
+From f9fd25d475d0cae011fa18d709a1fe071d8124e1 Mon Sep 17 00:00:00 2001
 From: Robert Elliott <elliott@hpe.com>
 Date: Fri, 22 Jan 2016 13:32:30 +0100
-Subject: [PATCH 127/177] efiemu: Handle persistent RAM and unknown possible
+Subject: [PATCH 142/192] efiemu: Handle persistent RAM and unknown possible
  future additions.
 
 (cherry picked from commit ae3b83a4d4df75a01198a2fed7542391e7c449e0)
@@ -27,5 +27,5 @@ index 52a032f7b..92e7df7e5 100644
  					GRUB_EFI_PERSISTENT_MEMORY);
        default:
 -- 
-2.13.3
+2.13.4
 
diff --git a/0128-efiemu-Fix-compilation-failure.patch b/0143-efiemu-Fix-compilation-failure.patch
similarity index 86%
rename from 0128-efiemu-Fix-compilation-failure.patch
rename to 0143-efiemu-Fix-compilation-failure.patch
index ba3e22f..a228d14 100644
--- a/0128-efiemu-Fix-compilation-failure.patch
+++ b/0143-efiemu-Fix-compilation-failure.patch
@@ -1,7 +1,7 @@
-From eee547e70fb44915cc4787548753bd68a350f4d9 Mon Sep 17 00:00:00 2001
+From d1dcefa3407afe1d4bc7e6de773386509290e8e2 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 22 Jan 2016 14:10:30 +0100
-Subject: [PATCH 128/177] efiemu: Fix compilation failure
+Subject: [PATCH 143/192] efiemu: Fix compilation failure
 
 (cherry picked from commit b6a03dfd327489d53ee07c6d7d593b99c7b7cb62)
 
@@ -26,5 +26,5 @@ index 92e7df7e5..52a032f7b 100644
  					GRUB_EFI_PERSISTENT_MEMORY);
        default:
 -- 
-2.13.3
+2.13.4
 
diff --git a/0129-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
similarity index 94%
rename from 0129-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
rename to 0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
index 64b96be..0b61f14 100644
--- a/0129-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+++ b/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
@@ -1,7 +1,7 @@
-From 91a2c66635f7a1b9fb94736e098f76dfc01a9df8 Mon Sep 17 00:00:00 2001
+From b415a4bfdd6f48944a92d0b3c0a0eb6dd8042dde Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 7 Apr 2016 10:58:06 -0400
-Subject: [PATCH 129/177] Revert "reopen SNP protocol for exclusive use by
+Subject: [PATCH 144/192] Revert "reopen SNP protocol for exclusive use by
  grub"
 
 I *think* this should have been replaced by upstream's
@@ -65,5 +65,5 @@ index b870d3f19..a3ce4c67c 100644
    }
  }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0130-Add-a-url-parser.patch b/0145-Add-a-url-parser.patch
similarity index 99%
rename from 0130-Add-a-url-parser.patch
rename to 0145-Add-a-url-parser.patch
index 78a7d3f..d2da510 100644
--- a/0130-Add-a-url-parser.patch
+++ b/0145-Add-a-url-parser.patch
@@ -1,7 +1,7 @@
-From 1e213423df01e2daeddadd9dfa6b68dcf036abbd Mon Sep 17 00:00:00 2001
+From c6222c1a74d13ffe7b70aad9f2bc12dc2dc79c9a Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jun 2016 16:18:44 -0400
-Subject: [PATCH 130/177] Add a url parser.
+Subject: [PATCH 145/192] Add a url parser.
 
 This patch adds a url parser that can parse http, https, tftp, and tftps
 urls, and is easily extensible to handle more types.
@@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  create mode 100644 include/grub/net/url.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index f111f95ef..630db675c 100644
+index 5ae70204c..4857a1e5f 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -2199,6 +2199,7 @@ module = {
@@ -1020,5 +1020,5 @@ index 000000000..a215fa27d
 +
 +#endif /* GRUB_URL_HEADER */
 -- 
-2.13.3
+2.13.4
 
diff --git a/0131-efinet-and-bootp-add-support-for-dhcpv6.patch b/0146-efinet-and-bootp-add-support-for-dhcpv6.patch
similarity index 99%
rename from 0131-efinet-and-bootp-add-support-for-dhcpv6.patch
rename to 0146-efinet-and-bootp-add-support-for-dhcpv6.patch
index 8e66bcf..9312268 100644
--- a/0131-efinet-and-bootp-add-support-for-dhcpv6.patch
+++ b/0146-efinet-and-bootp-add-support-for-dhcpv6.patch
@@ -1,7 +1,7 @@
-From 42223d1e900e73d8ec48f3188f26f3429e421f59 Mon Sep 17 00:00:00 2001
+From 4a9dea49f6ef9b81b8b78af3f893a5030219bd25 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 8 Jun 2016 21:03:37 -0400
-Subject: [PATCH 131/177] efinet and bootp: add support for dhcpv6
+Subject: [PATCH 146/192] efinet and bootp: add support for dhcpv6
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -663,5 +663,5 @@ index 50d62ab0c..f8f3ec13a 100644
  grub_net_add_ipv4_local (struct grub_net_network_level_interface *inf,
  			 int mask);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0132-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
similarity index 95%
rename from 0132-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
rename to 0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
index ef19d08..4c6c81f 100644
--- a/0132-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+++ b/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
@@ -1,7 +1,7 @@
-From e16fb5db722d3282fdeef18be7d3e507684aa815 Mon Sep 17 00:00:00 2001
+From 96527f198250d25e29c23d6905481c96233bb032 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 23 Jun 2016 11:01:39 -0400
-Subject: [PATCH 132/177] Add grub-get-kernel-settings and use it in 10_linux
+Subject: [PATCH 147/192] Add grub-get-kernel-settings and use it in 10_linux
 
 This patch adds grub-get-kernel-settings, which reads the system kernel
 installation configuration from /etc/sysconfig/kernel, and outputs
@@ -11,7 +11,7 @@ debug stanzas.
 
 Resolves: rhbz#1226325
 ---
- .gitignore                                     |  1 +
+ .gitignore                                     |  2 +
  Makefile.util.def                              |  7 +++
  configure.ac                                   |  2 +
  util/bash-completion.d/grub-completion.bash.in | 22 ++++++++
@@ -19,22 +19,23 @@ Resolves: rhbz#1226325
  util/grub-get-kernel-settings.in               | 78 ++++++++++++++++++++++++++
  util/grub-mkconfig.in                          |  3 +
  util/grub.d/10_linux.in                        | 23 ++++++--
- 8 files changed, 151 insertions(+), 5 deletions(-)
+ 8 files changed, 152 insertions(+), 5 deletions(-)
  create mode 100644 util/grub-get-kernel-settings.3
  create mode 100644 util/grub-get-kernel-settings.in
 
 diff --git a/.gitignore b/.gitignore
-index 302be1e8f..fb595db15 100644
+index 387e3554c..9f258735a 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -112,6 +112,7 @@ grub-emu-lite
- grub-file
- grub-fs-tester
- grub-fstest
-+grub-get-kernel-settings
- grub-glue-efi
- grub-install
- grub-kbdcomp
+@@ -64,6 +64,8 @@ grub-*.tar.*
+ /grub*-fs-tester
+ /grub*-fstest
+ /grub*-fstest.1
++/grub*-get-kernel-settings
++/grub*-get-kernel-settings.3
+ /grub*-glue-efi
+ /grub*-glue-efi.1
+ /grub*-install
 diff --git a/Makefile.util.def b/Makefile.util.def
 index 226c46b2d..ed27351eb 100644
 --- a/Makefile.util.def
@@ -298,5 +299,5 @@ index 584ad1f46..c9bf223f2 100644
    fi
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0133-Normalize-slashes-in-tftp-paths.patch b/0148-Normalize-slashes-in-tftp-paths.patch
similarity index 92%
rename from 0133-Normalize-slashes-in-tftp-paths.patch
rename to 0148-Normalize-slashes-in-tftp-paths.patch
index fb56180..e96eb28 100644
--- a/0133-Normalize-slashes-in-tftp-paths.patch
+++ b/0148-Normalize-slashes-in-tftp-paths.patch
@@ -1,7 +1,7 @@
-From 50b36d55b9d86a12021e0548762d2c5a3298f2a7 Mon Sep 17 00:00:00 2001
+From dad8660131c924b29b3020dafb59b36be3093efa Mon Sep 17 00:00:00 2001
 From: Lenny Szubowicz <lszubowi@redhat.com>
 Date: Mon, 29 Aug 2016 11:04:48 -0400
-Subject: [PATCH 133/177] Normalize slashes in tftp paths.
+Subject: [PATCH 148/192] Normalize slashes in tftp paths.
 
 Some tftp servers do not handle multiple consecutive slashes correctly;
 this patch avoids sending tftp requests with non-normalized paths.
@@ -54,5 +54,5 @@ index 1157524fc..5ca0a96a6 100644
    rrq += grub_strlen (filename) + 1;
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0134-Fix-malformed-tftp-packets.patch b/0149-Fix-malformed-tftp-packets.patch
similarity index 90%
rename from 0134-Fix-malformed-tftp-packets.patch
rename to 0149-Fix-malformed-tftp-packets.patch
index cc677f6..5011f28 100644
--- a/0134-Fix-malformed-tftp-packets.patch
+++ b/0149-Fix-malformed-tftp-packets.patch
@@ -1,7 +1,7 @@
-From 4582fb474ebcb23b23deb078b4276b526f6ac063 Mon Sep 17 00:00:00 2001
+From 02884031aa1677f6c6af8a6a58c33f701a8984d3 Mon Sep 17 00:00:00 2001
 From: Mark Salter <msalter@redhat.com>
 Date: Tue, 7 Mar 2017 18:26:17 -0500
-Subject: [PATCH 134/177] Fix malformed tftp packets
+Subject: [PATCH 149/192] Fix malformed tftp packets
 
 0088-Normalize-slashes-in-tftp-paths.patch collapses multiple contiguous
 slashes in a filename into one slash in the tftp packet filename field.
@@ -31,5 +31,5 @@ index 5ca0a96a6..dcd824943 100644
    grub_strcpy (rrq, "octet");
    rrqlen += grub_strlen ("octet") + 1;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0135-Fix-race-in-EFI-validation.patch b/0150-Fix-race-in-EFI-validation.patch
similarity index 95%
rename from 0135-Fix-race-in-EFI-validation.patch
rename to 0150-Fix-race-in-EFI-validation.patch
index 5d4e88d..9040138 100644
--- a/0135-Fix-race-in-EFI-validation.patch
+++ b/0150-Fix-race-in-EFI-validation.patch
@@ -1,7 +1,7 @@
-From 7d279caab2d0f87177af9b1cd244b83ac7c18eef Mon Sep 17 00:00:00 2001
+From 4c081b1042610b4726a2463dd364c9ee21769d20 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 14 Jul 2015 16:58:51 -0700
-Subject: [PATCH 135/177] Fix race in EFI validation
+Subject: [PATCH 150/192] Fix race in EFI validation
 
 ---
  grub-core/loader/i386/efi/linux.c | 44 ++++++++++-----------------------------
@@ -93,5 +93,5 @@ index e5b778577..7ccf32d9d 100644
      {
        grub_dl_unref (my_mod);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0136-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch
similarity index 94%
rename from 0136-bz1374141-fix-incorrect-mask-for-ppc64.patch
rename to 0151-bz1374141-fix-incorrect-mask-for-ppc64.patch
index e8454f4..853f5e3 100644
--- a/0136-bz1374141-fix-incorrect-mask-for-ppc64.patch
+++ b/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch
@@ -1,7 +1,7 @@
-From f6903f70bd39493a29b79dd0efd3864daa8e88c2 Mon Sep 17 00:00:00 2001
+From 4acdb98d4b6e1204a70f1a4dd435fd8176dad8cf Mon Sep 17 00:00:00 2001
 From: Masahiro Matsuya <mmatsuya@redhat.com>
 Date: Sat, 29 Oct 2016 08:35:26 +0900
-Subject: [PATCH 136/177] bz1374141 fix incorrect mask for ppc64
+Subject: [PATCH 151/192] bz1374141 fix incorrect mask for ppc64
 
 The netmask configured in firmware is not respected on ppc64 (big endian).
 When 255.255.252.0 is set as netmask in firmware, the following is the value of bootpath string in grub_ieee1275_parse_bootpath().
@@ -44,5 +44,5 @@ index 002446be1..3df75357a 100644
  
    if (gateway_addr.ipv4 != 0)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0137-Use-device-part-of-chainloader-target-if-present.patch b/0152-Use-device-part-of-chainloader-target-if-present.patch
similarity index 88%
rename from 0137-Use-device-part-of-chainloader-target-if-present.patch
rename to 0152-Use-device-part-of-chainloader-target-if-present.patch
index e04947c..c9d83d4 100644
--- a/0137-Use-device-part-of-chainloader-target-if-present.patch
+++ b/0152-Use-device-part-of-chainloader-target-if-present.patch
@@ -1,7 +1,7 @@
-From 4a0596f200dcec9d534fc79a48b5721bbf1b907f Mon Sep 17 00:00:00 2001
+From 01e86878090c2b7d9c0e63024da5d86130da8d4d Mon Sep 17 00:00:00 2001
 From: Raymund Will <rw@suse.com>
 Date: Fri, 10 Apr 2015 01:45:02 -0400
-Subject: [PATCH 137/177] Use device part of chainloader target, if present.
+Subject: [PATCH 152/192] Use device part of chainloader target, if present.
 
 Otherwise chainloading is restricted to '$root', which might not even
 be readable by EFI!
@@ -33,5 +33,5 @@ index adc856366..14ce6ddd7 100644
      goto fail;
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0138-Add-secureboot-support-on-efi-chainloader.patch b/0153-Add-secureboot-support-on-efi-chainloader.patch
similarity index 98%
rename from 0138-Add-secureboot-support-on-efi-chainloader.patch
rename to 0153-Add-secureboot-support-on-efi-chainloader.patch
index 53a86db..0c2f991 100644
--- a/0138-Add-secureboot-support-on-efi-chainloader.patch
+++ b/0153-Add-secureboot-support-on-efi-chainloader.patch
@@ -1,7 +1,7 @@
-From 0be916874913790bf1db111c0479800392859e16 Mon Sep 17 00:00:00 2001
+From 4d7c46d507e90d67c1c3c8e773940f41d3c647e9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 13:04:37 -0400
-Subject: [PATCH 138/177] Add secureboot support on efi chainloader
+Subject: [PATCH 153/192] Add secureboot support on efi chainloader
 
 Expand the chainloader to be able to verify the image by means of shim
 lock protocol. The PE/COFF image is loaded and relocated by the
@@ -758,10 +758,10 @@ index 14ce6ddd7..87a91e16f 100644
  
    return grub_errno;
 diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
-index f79c36c02..f79782e1b 100644
+index 7d44732d2..6e24dae2c 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
-@@ -212,7 +212,11 @@ struct grub_pe64_optional_header
+@@ -214,7 +214,11 @@ struct grub_pe64_optional_header
  struct grub_pe32_section_table
  {
    char name[8];
@@ -774,7 +774,7 @@ index f79c36c02..f79782e1b 100644
    grub_uint32_t virtual_address;
    grub_uint32_t raw_data_size;
    grub_uint32_t raw_data_offset;
-@@ -263,6 +267,20 @@ struct grub_pe32_header
+@@ -265,6 +269,20 @@ struct grub_pe32_header
  #endif
  };
  
@@ -796,5 +796,5 @@ index f79c36c02..f79782e1b 100644
  {
    grub_uint32_t page_rva;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0139-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
similarity index 98%
rename from 0139-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
rename to 0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
index 3a541e3..9bde617 100644
--- a/0139-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+++ b/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
@@ -1,7 +1,7 @@
-From b3a4f6bb0b647c92f01b33653368cee8c21f5ab6 Mon Sep 17 00:00:00 2001
+From 23965f6becb9ab6e8e83495d70dbdf650811b630 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 16:09:25 -0400
-Subject: [PATCH 139/177] Make any of the loaders that link in efi mode honor
+Subject: [PATCH 154/192] Make any of the loaders that link in efi mode honor
  secure boot.
 
 And in this case "honor" means "even if somebody does link this in, they
@@ -49,7 +49,7 @@ index 104513847..f7b4d29b0 100644
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 630db675c..096aee187 100644
+index 4857a1e5f..75a7ab344 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -196,6 +196,7 @@ kernel = {
@@ -431,10 +431,10 @@ index c9885b1bc..df8dfdb4b 100644
    grub_unregister_command (cmd_resume);
  #endif
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 62a3d9726..764cd11f5 100644
+index bb3ab7dfd..91e29ce66 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -76,7 +76,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
+@@ -83,7 +83,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
  				     const grub_efi_guid_t *guid,
  				     void *data,
  				     grub_size_t datasize);
@@ -490,5 +490,5 @@ diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
 new file mode 100644
 index 000000000..e69de29bb
 -- 
-2.13.3
+2.13.4
 
diff --git a/0140-Make-grub_fatal-also-backtrace.patch b/0155-Make-grub_fatal-also-backtrace.patch
similarity index 96%
rename from 0140-Make-grub_fatal-also-backtrace.patch
rename to 0155-Make-grub_fatal-also-backtrace.patch
index 2cd97c6..a6e57b1 100644
--- a/0140-Make-grub_fatal-also-backtrace.patch
+++ b/0155-Make-grub_fatal-also-backtrace.patch
@@ -1,7 +1,7 @@
-From f0600b3846ef7c710833bfa248fc6b6ac362df78 Mon Sep 17 00:00:00 2001
+From 2bc3a40466e0175bd24343420c4ae3f3eb497abf Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 27 Jan 2016 09:22:42 -0500
-Subject: [PATCH 140/177] Make grub_fatal() also backtrace.
+Subject: [PATCH 155/192] Make grub_fatal() also backtrace.
 
 ---
  grub-core/Makefile.core.def     |  3 ++
@@ -13,7 +13,7 @@ Subject: [PATCH 140/177] Make grub_fatal() also backtrace.
  create mode 100644 grub-core/lib/arm64/backtrace.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 096aee187..94655d684 100644
+index 75a7ab344..3a5d450f3 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -175,6 +175,9 @@ kernel = {
@@ -171,5 +171,5 @@ index c3e03c727..c67273db3 100644
  #include <grub/term.h>
  #include <grub/backtrace.h>
 -- 
-2.13.3
+2.13.4
 
diff --git a/0141-Rework-linux-command.patch b/0156-Rework-linux-command.patch
similarity index 96%
rename from 0141-Rework-linux-command.patch
rename to 0156-Rework-linux-command.patch
index 83dccdf..36ac1e8 100644
--- a/0141-Rework-linux-command.patch
+++ b/0156-Rework-linux-command.patch
@@ -1,7 +1,7 @@
-From 9f0d557a54ff3763de10f7f8ac93d99f4493b3a6 Mon Sep 17 00:00:00 2001
+From c75fd7cc69873a8347a536aa760c019990b3c7a1 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:12:39 -0700
-Subject: [PATCH 141/177] Rework linux command
+Subject: [PATCH 156/192] Rework linux command
 
 We want a single buffer that contains the entire kernel image in order to
 perform a TPM measurement. Allocate one and copy the entire kernel into it
@@ -103,5 +103,5 @@ index b2438547d..e4b8342f5 100644
      grub_file_close (file);
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0142-Rework-linux16-command.patch b/0157-Rework-linux16-command.patch
similarity index 96%
rename from 0142-Rework-linux16-command.patch
rename to 0157-Rework-linux16-command.patch
index 7d4d570..e506967 100644
--- a/0142-Rework-linux16-command.patch
+++ b/0157-Rework-linux16-command.patch
@@ -1,7 +1,7 @@
-From c3fb8b9f0553476cd98c493f15569ebaa069188f Mon Sep 17 00:00:00 2001
+From de0c8783e1177f81fe2ac90edbfdc282ae986803 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:20:58 -0700
-Subject: [PATCH 142/177] Rework linux16 command
+Subject: [PATCH 157/192] Rework linux16 command
 
 We want a single buffer that contains the entire kernel image in order to
 perform a TPM measurement. Allocate one and copy the entire kernel int it
@@ -97,5 +97,5 @@ index 91283157e..b864e5403 100644
      grub_file_close (file);
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0143-Make-grub-editenv-build-again.patch b/0158-Make-grub-editenv-build-again.patch
similarity index 87%
rename from 0143-Make-grub-editenv-build-again.patch
rename to 0158-Make-grub-editenv-build-again.patch
index ec22019..f8eab56 100644
--- a/0143-Make-grub-editenv-build-again.patch
+++ b/0158-Make-grub-editenv-build-again.patch
@@ -1,7 +1,7 @@
-From 5104251f96e3dc2827934d79f23f2371f12184e1 Mon Sep 17 00:00:00 2001
+From 4d8aa8cf3ae80f86fa99dbc69f4d44697b5f7ea3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 4 Mar 2016 16:29:13 -0500
-Subject: [PATCH 143/177] Make grub-editenv build again.
+Subject: [PATCH 158/192] Make grub-editenv build again.
 
 36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage
 utility functions are defined, and they wind up being linked into
@@ -26,5 +26,5 @@ index ed27351eb..38cdf4ccc 100644
    common = util/config.c;
    common = util/resolve.c;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0144-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch
similarity index 96%
rename from 0144-Fix-up-some-man-pages-rpmdiff-noticed.patch
rename to 0159-Fix-up-some-man-pages-rpmdiff-noticed.patch
index 6f987ef..62f49bf 100644
--- a/0144-Fix-up-some-man-pages-rpmdiff-noticed.patch
+++ b/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch
@@ -1,7 +1,7 @@
-From 0695a021dc35b22594f7c6383d04c8dab2f1df84 Mon Sep 17 00:00:00 2001
+From c50df5e0ea3ab065d373c91b408eb7bb48d824a6 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 23 Sep 2014 09:58:49 -0400
-Subject: [PATCH 144/177] Fix up some man pages rpmdiff noticed.
+Subject: [PATCH 159/192] Fix up some man pages rpmdiff noticed.
 
 ---
  configure.ac             |  2 ++
@@ -149,5 +149,5 @@ index 000000000..853094827
 +.SH SEE ALSO
 +.BR "info grub"
 -- 
-2.13.3
+2.13.4
 
diff --git a/0145-Re-work-some-intricacies-of-PE-loading.patch b/0160-Re-work-some-intricacies-of-PE-loading.patch
similarity index 97%
rename from 0145-Re-work-some-intricacies-of-PE-loading.patch
rename to 0160-Re-work-some-intricacies-of-PE-loading.patch
index 9980f1d..e3efa64 100644
--- a/0145-Re-work-some-intricacies-of-PE-loading.patch
+++ b/0160-Re-work-some-intricacies-of-PE-loading.patch
@@ -1,7 +1,7 @@
-From 5e60d131579d787af81a6a32278c41abb84c50f5 Mon Sep 17 00:00:00 2001
+From d0bac1cacf14200def2c4d00268b8f655fec7f16 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 9 Jun 2016 12:22:29 -0400
-Subject: [PATCH 145/177] Re-work some intricacies of PE loading.
+Subject: [PATCH 160/192] Re-work some intricacies of PE loading.
 
 The PE spec is not a well written document, and awesomely every place
 where there's an ambiguous way to read something, Windows' bootmgfw.efi
@@ -293,10 +293,10 @@ index aee8e6bec..4b77a7d5a 100644
        efi_call_1 (b->free_pool, buffer);
  
 diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
-index f79782e1b..8396bde49 100644
+index 6e24dae2c..c03cc599f 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
-@@ -227,12 +227,18 @@ struct grub_pe32_section_table
+@@ -229,12 +229,18 @@ struct grub_pe32_section_table
    grub_uint32_t characteristics;
  };
  
@@ -319,7 +319,7 @@ index f79782e1b..8396bde49 100644
  
  #define GRUB_PE32_SCN_ALIGN_1BYTES		0x00100000
  #define GRUB_PE32_SCN_ALIGN_2BYTES		0x00200000
-@@ -241,10 +247,28 @@ struct grub_pe32_section_table
+@@ -243,10 +249,28 @@ struct grub_pe32_section_table
  #define GRUB_PE32_SCN_ALIGN_16BYTES		0x00500000
  #define GRUB_PE32_SCN_ALIGN_32BYTES		0x00600000
  #define GRUB_PE32_SCN_ALIGN_64BYTES		0x00700000
@@ -349,5 +349,5 @@ index f79782e1b..8396bde49 100644
  
  struct grub_pe32_header
 -- 
-2.13.3
+2.13.4
 
diff --git a/0146-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch b/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch
similarity index 97%
rename from 0146-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch
rename to 0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch
index 34e42ff..168c65d 100644
--- a/0146-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch
+++ b/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch
@@ -1,7 +1,7 @@
-From 0e71764ff576913a3f210c2a07ea65eebbc4c6bb Mon Sep 17 00:00:00 2001
+From 341c267c6e2613b3fc5341578ee9ec3524fb7098 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 10 Jun 2016 14:06:15 -0400
-Subject: [PATCH 146/177] Rework even more of efi chainload so non-sb cases
+Subject: [PATCH 161/192] Rework even more of efi chainload so non-sb cases
  work right.
 
 This ensures that if shim protocol is not loaded, or is loaded but shim
@@ -80,10 +80,10 @@ index a41b6c5b8..d74778b0c 100644
    if (*secure_boot && !*setup_mode)
      ret = 1;
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 4756ef71f..f83820e61 100644
+index 450d1a1de..854971ae6 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
-@@ -251,6 +251,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -248,6 +248,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_file_t file = 0;
    struct grub_arm64_linux_kernel_header lh;
    struct grub_arm64_linux_pe_header *pe;
@@ -91,7 +91,7 @@ index 4756ef71f..f83820e61 100644
  
    grub_dl_ref (my_mod);
  
-@@ -295,7 +296,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -292,7 +293,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
  
@@ -409,5 +409,5 @@ index d9ede3677..0033d9305 100644
  grub_err_t
  EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
 -- 
-2.13.3
+2.13.4
 
diff --git a/0147-linuxefi-fix-double-free-on-verification-failure.patch b/0162-linuxefi-fix-double-free-on-verification-failure.patch
similarity index 82%
rename from 0147-linuxefi-fix-double-free-on-verification-failure.patch
rename to 0162-linuxefi-fix-double-free-on-verification-failure.patch
index 0e80676..27c33f1 100644
--- a/0147-linuxefi-fix-double-free-on-verification-failure.patch
+++ b/0162-linuxefi-fix-double-free-on-verification-failure.patch
@@ -1,7 +1,7 @@
-From c21e7bf4849c24803d84ee1b59c5fba001381ac9 Mon Sep 17 00:00:00 2001
+From 18e355bbefe3dd75526da4b6b99046ea609d4c1b Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jun 2016 09:50:25 -0400
-Subject: [PATCH 147/177] linuxefi: fix double free on verification failure.
+Subject: [PATCH 162/192] linuxefi: fix double free on verification failure.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -21,5 +21,5 @@ index 82f75b7f3..010bf982d 100644
      }
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0148-fix-machine-type-test-in-30_os-prober.in.patch b/0163-fix-machine-type-test-in-30_os-prober.in.patch
similarity index 80%
rename from 0148-fix-machine-type-test-in-30_os-prober.in.patch
rename to 0163-fix-machine-type-test-in-30_os-prober.in.patch
index b919bf1..16dab96 100644
--- a/0148-fix-machine-type-test-in-30_os-prober.in.patch
+++ b/0163-fix-machine-type-test-in-30_os-prober.in.patch
@@ -1,7 +1,7 @@
-From c75c918940b77108007e86e47e16b9a0fbcfdf5d Mon Sep 17 00:00:00 2001
+From e091c46338bf077d93e3b99d6e326e78afcf902f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 11 Jul 2016 13:36:45 -0400
-Subject: [PATCH 148/177] fix machine type test in 30_os-prober.in
+Subject: [PATCH 163/192] fix machine type test in 30_os-prober.in
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -21,5 +21,5 @@ index dc98eace9..e40274fc0 100644
      i?86|x86_64)
        sixteenbit="16"
 -- 
-2.13.3
+2.13.4
 
diff --git a/0149-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch b/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
similarity index 90%
rename from 0149-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
rename to 0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
index 9351817..e316523 100644
--- a/0149-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
+++ b/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
@@ -1,7 +1,7 @@
-From 79688d11f84464be361d3621de2af0ffd243f155 Mon Sep 17 00:00:00 2001
+From 51618e3f04dbb8b9ea8d7c151bb09d527dcbd1c5 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Mon, 21 Nov 2016 15:34:00 +0100
-Subject: [PATCH 149/177] efi/chainloader: fix wrong sanity check in
+Subject: [PATCH 164/192] efi/chainloader: fix wrong sanity check in
  relocate_coff()
 
 In relocate_coff(), the relocation entries are parsed from the original
@@ -35,5 +35,5 @@ index b977c7b55..d5ab21d09 100644
            grub_error (GRUB_ERR_BAD_ARGUMENT, "Reloc entry %d overflows binary",
  		      n);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0150-efi-chainloader-truncate-overlong-relocation-section.patch b/0165-efi-chainloader-truncate-overlong-relocation-section.patch
similarity index 96%
rename from 0150-efi-chainloader-truncate-overlong-relocation-section.patch
rename to 0165-efi-chainloader-truncate-overlong-relocation-section.patch
index e3ab38e..c9b1fef 100644
--- a/0150-efi-chainloader-truncate-overlong-relocation-section.patch
+++ b/0165-efi-chainloader-truncate-overlong-relocation-section.patch
@@ -1,7 +1,7 @@
-From d5e6b94ac802afdbccb9736dc9f0797498ed23e0 Mon Sep 17 00:00:00 2001
+From 48ee84721c03de835647bba063436d73238c5cf9 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Wed, 23 Nov 2016 06:27:09 +0100
-Subject: [PATCH 150/177] efi/chainloader: truncate overlong relocation section
+Subject: [PATCH 165/192] efi/chainloader: truncate overlong relocation section
 
 The UEFI Windows 7 boot loader ("EFI/Microsoft/Boot/bootmgfw.efi", SHA1
 31b410e029bba87d2068c65a80b88882f9f8ea25) has inconsistent headers.
@@ -109,5 +109,5 @@ index d5ab21d09..7826e794a 100644
  	      grub_dprintf ("chain", " section is not reloc section?\n");
  	      grub_dprintf ("chain", " rds: 0x%08x, vs: %08x\n",
 -- 
-2.13.3
+2.13.4
 
diff --git a/0151-linuxefi-minor-cleanups.patch b/0166-linuxefi-minor-cleanups.patch
similarity index 96%
rename from 0151-linuxefi-minor-cleanups.patch
rename to 0166-linuxefi-minor-cleanups.patch
index 0381e4c..64bb0f3 100644
--- a/0151-linuxefi-minor-cleanups.patch
+++ b/0166-linuxefi-minor-cleanups.patch
@@ -1,7 +1,7 @@
-From dd103ed061623c80e3e096a436ddaa394bad0f7d Mon Sep 17 00:00:00 2001
+From 5eea84e1d48dcda4721ddc079f7edae55db544cb Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Feb 2017 16:31:52 -0500
-Subject: [PATCH 151/177] linuxefi: minor cleanups
+Subject: [PATCH 166/192] linuxefi: minor cleanups
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -85,5 +85,5 @@ index 010bf982d..8b5a817b9 100644
    return grub_errno;
  }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0152-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
similarity index 97%
rename from 0152-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
rename to 0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
index 1f08141..099c55e 100644
--- a/0152-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
+++ b/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
@@ -1,7 +1,7 @@
-From ef26601128cbad8ab1be459a1d6c94c87fab6663 Mon Sep 17 00:00:00 2001
+From de23e4dbf4ff4472b76f1ff2094bf62a1a99acbb Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Feb 2017 16:18:54 -0500
-Subject: [PATCH 152/177] Handle multi-arch (64-on-32) boot in linuxefi loader.
+Subject: [PATCH 167/192] Handle multi-arch (64-on-32) boot in linuxefi loader.
 
 Allow booting 64-bit kernels on 32-bit EFI on x86.
 
@@ -37,7 +37,7 @@ index 8890bdf05..2a7024134 100644
  
    return GRUB_ERR_BUG;
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 8b5a817b9..ed8cc40a0 100644
+index 8b5a817b9..bed5919ca 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -44,14 +44,10 @@ static char *linux_cmdline;
@@ -205,8 +205,8 @@ index 8b5a817b9..ed8cc40a0 100644
  
 -  kernel_mem = grub_efi_allocate_pages(lh.pref_address,
 -				       BYTES_TO_PAGES(lh.init_size));
-+  kernel_mem = grub_efi_allocate_pages(lh->pref_address,
-+				       BYTES_TO_PAGES(lh->init_size));
++  kernel_mem = grub_efi_allocate_pages_max(lh->pref_address,
++					   BYTES_TO_PAGES(lh->init_size));
  
    if (!kernel_mem)
      kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,
@@ -274,5 +274,5 @@ index fc36bdaf3..110ecf806 100644
    grub_uint32_t hardware_subarch;
    grub_uint64_t hardware_subarch_data;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0153-Fix-up-linux-params-usage.patch b/0168-Fix-up-linux-params-usage.patch
similarity index 91%
rename from 0153-Fix-up-linux-params-usage.patch
rename to 0168-Fix-up-linux-params-usage.patch
index 2de3868..930671e 100644
--- a/0153-Fix-up-linux-params-usage.patch
+++ b/0168-Fix-up-linux-params-usage.patch
@@ -1,7 +1,7 @@
-From 7b93d18488f665386de3c61678664952bd0ca017 Mon Sep 17 00:00:00 2001
+From 6ae54e020cecce28305756cc6b7e7e3729c48f17 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 30 May 2017 14:16:07 -0400
-Subject: [PATCH 153/177] Fix up linux params usage...
+Subject: [PATCH 168/192] Fix up linux params usage...
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -39,5 +39,5 @@ index e4b8342f5..c9e89310b 100644
  
    linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0154-Make-exit-take-a-return-code.patch b/0169-Make-exit-take-a-return-code.patch
similarity index 90%
rename from 0154-Make-exit-take-a-return-code.patch
rename to 0169-Make-exit-take-a-return-code.patch
index 92921e3..7a74277 100644
--- a/0154-Make-exit-take-a-return-code.patch
+++ b/0169-Make-exit-take-a-return-code.patch
@@ -1,7 +1,7 @@
-From b20b77a7aa8e538f501ac082eca2ea73c6a5407f Mon Sep 17 00:00:00 2001
+From 056fa8b0acc08d135f5b93c79ed917fb039c2401 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 26 Feb 2014 21:49:12 -0500
-Subject: [PATCH 154/177] Make "exit" take a return code.
+Subject: [PATCH 169/192] Make "exit" take a return code.
 
 This adds "exit" with a return code.  With this patch, any "exit"
 command /may/ include a return code, and on platforms that support
@@ -52,5 +52,5 @@ index 5ce89a40c..04371ac49 100644
  grub_fatal (const char *fmt, ...)
  {
 -- 
-2.13.3
+2.13.4
 
diff --git a/0155-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
similarity index 84%
rename from 0155-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
rename to 0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
index 552199a..ffd19bc 100644
--- a/0155-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
+++ b/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
@@ -1,7 +1,7 @@
-From 46835789f3f7458f976d8ee61f49e391a0380c4b Mon Sep 17 00:00:00 2001
+From 9365f56c0ff31b62a4334f583c04da8ddd5a3274 Mon Sep 17 00:00:00 2001
 From: Mark Salter <msalter@redhat.com>
 Date: Mon, 17 Apr 2017 08:44:29 -0400
-Subject: [PATCH 155/177] arm64: make sure fdt has #address-cells and
+Subject: [PATCH 170/192] arm64: make sure fdt has #address-cells and
  #size-cells properties
 
 Recent upstream changes to kexec-tools relies on #address-cells
@@ -14,10 +14,10 @@ make sure they exist.
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index f83820e61..f32151f3b 100644
+index 854971ae6..83f5a6de2 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
-@@ -81,7 +81,21 @@ finalize_params_linux (void)
+@@ -79,7 +79,21 @@ finalize_params_linux (void)
  
    node = grub_fdt_find_subnode (fdt, 0, "chosen");
    if (node < 0)
@@ -41,5 +41,5 @@ index f83820e61..f32151f3b 100644
    if (node < 1)
      goto failure;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0156-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch b/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch
similarity index 90%
rename from 0156-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch
rename to 0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch
index 7d31237..724266f 100644
--- a/0156-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch
+++ b/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch
@@ -1,7 +1,7 @@
-From cce1963c761c3b6ca4e40a0001eaf9d596cf8ed2 Mon Sep 17 00:00:00 2001
+From bb19df579a0b6eae01f440c295756258b027abfd Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 9 May 2016 14:15:17 -0400
-Subject: [PATCH 156/177] Add some grub_dprintf() in the secure boot verify
+Subject: [PATCH 171/192] Add some grub_dprintf() in the secure boot verify
  code.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -40,5 +40,5 @@ index 2a7024134..7fe7201a3 100644
    return -1;
  }
 -- 
-2.13.3
+2.13.4
 
diff --git a/0157-Make-our-info-pages-say-grub2-where-appropriate.patch b/0172-Make-our-info-pages-say-grub2-where-appropriate.patch
similarity index 99%
rename from 0157-Make-our-info-pages-say-grub2-where-appropriate.patch
rename to 0172-Make-our-info-pages-say-grub2-where-appropriate.patch
index c9081ae..d5a76ea 100644
--- a/0157-Make-our-info-pages-say-grub2-where-appropriate.patch
+++ b/0172-Make-our-info-pages-say-grub2-where-appropriate.patch
@@ -1,7 +1,7 @@
-From 7b3e61770e309e80a84f69db6deba700dcde6c46 Mon Sep 17 00:00:00 2001
+From 0d5dd185e24f202e6d647c4db3ea59a67b799909 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 6 May 2016 18:43:08 -0400
-Subject: [PATCH 157/177] Make our info pages say "grub2" where appropriate.
+Subject: [PATCH 172/192] Make our info pages say "grub2" where appropriate.
 
 This needs to be hooked up to --program-transform=, but I haven't had
 time.
@@ -1012,5 +1012,5 @@ index 15a90b26e..f28c4cd52 100644
  @table @option
  @item --help
 -- 
-2.13.3
+2.13.4
 
diff --git a/0158-print-more-debug-info-in-our-module-loader.patch b/0173-print-more-debug-info-in-our-module-loader.patch
similarity index 89%
rename from 0158-print-more-debug-info-in-our-module-loader.patch
rename to 0173-print-more-debug-info-in-our-module-loader.patch
index a28352a..439d9eb 100644
--- a/0158-print-more-debug-info-in-our-module-loader.patch
+++ b/0173-print-more-debug-info-in-our-module-loader.patch
@@ -1,7 +1,7 @@
-From 76cdf466430b1ee462f72f7e6e9cb8d717d11b7b Mon Sep 17 00:00:00 2001
+From 15e52b061ea65d3baee2279b8e4e9fe85a252b4e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 May 2017 11:19:40 -0400
-Subject: [PATCH 158/177] print more debug info in our module loader.
+Subject: [PATCH 173/192] print more debug info in our module loader.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -40,5 +40,5 @@ index 684ca93f8..1f3ac5e1d 100644
  }
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0159-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch
similarity index 97%
rename from 0159-macos-just-build-chainloader-entries-don-t-try-any-x.patch
rename to 0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch
index 7d8658e..872c956 100644
--- a/0159-macos-just-build-chainloader-entries-don-t-try-any-x.patch
+++ b/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch
@@ -1,7 +1,7 @@
-From d4b4a2dfd552c7018699752fcb9a0d07008b73df Mon Sep 17 00:00:00 2001
+From af947a9dfab90eff972d000a6a7506ce052d11ea Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 24 May 2017 12:42:32 -0400
-Subject: [PATCH 159/177] macos: just build chainloader entries, don't try any
+Subject: [PATCH 174/192] macos: just build chainloader entries, don't try any
  xnu xnu.
 
 Since our bugs tell us that the xnu boot entries really just don't work
@@ -124,5 +124,5 @@ index e40274fc0..d979de198 100644
      hurd)
        onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
 -- 
-2.13.3
+2.13.4
 
diff --git a/0160-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
similarity index 99%
rename from 0160-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
rename to 0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
index 56a6c34..f51c2fb 100644
--- a/0160-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
+++ b/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
@@ -1,7 +1,7 @@
-From 99ec1217cff2d73237eb36512e36a37dfee1175b Mon Sep 17 00:00:00 2001
+From 2820f28d209a67dda25b74527150be87bceb1efd Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@suse.com>
 Date: Wed, 18 Dec 2013 09:57:04 +0000
-Subject: [PATCH 160/177] grub2/btrfs: Add ability to boot from subvolumes
+Subject: [PATCH 175/192] grub2/btrfs: Add ability to boot from subvolumes
 
 This patch adds the ability to specify a different root on a btrfs
 filesystem too boot from other than the default one.
@@ -697,5 +697,5 @@ index 9d93fb6c1..234ad9767 100644
    };
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0161-export-btrfs_subvol-and-btrfs_subvolid.patch b/0176-export-btrfs_subvol-and-btrfs_subvolid.patch
similarity index 85%
rename from 0161-export-btrfs_subvol-and-btrfs_subvolid.patch
rename to 0176-export-btrfs_subvol-and-btrfs_subvolid.patch
index 18f51af..62e7105 100644
--- a/0161-export-btrfs_subvol-and-btrfs_subvolid.patch
+++ b/0176-export-btrfs_subvol-and-btrfs_subvolid.patch
@@ -1,7 +1,7 @@
-From 18aa92cc523624676f9dd1bb39e03a3ee22d3346 Mon Sep 17 00:00:00 2001
+From 405a7c2f16f6ab331a853fed4bf26fa3ad561c4c Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Wed, 18 Dec 2013 09:57:04 +0000
-Subject: [PATCH 161/177] export btrfs_subvol and btrfs_subvolid
+Subject: [PATCH 176/192] export btrfs_subvol and btrfs_subvolid
 
 We should export btrfs_subvol and btrfs_subvolid to have both visible
 to subsidiary configuration files loaded using configfile.
@@ -25,5 +25,5 @@ index 38facf3cb..396296166 100644
  
  GRUB_MOD_FINI (btrfs)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0162-grub2-btrfs-03-follow_default.patch b/0177-grub2-btrfs-03-follow_default.patch
similarity index 97%
rename from 0162-grub2-btrfs-03-follow_default.patch
rename to 0177-grub2-btrfs-03-follow_default.patch
index 96bd277..1f4e922 100644
--- a/0162-grub2-btrfs-03-follow_default.patch
+++ b/0177-grub2-btrfs-03-follow_default.patch
@@ -1,7 +1,7 @@
-From a36f0f02df3d30d544e4d28df0891f03bc00539c Mon Sep 17 00:00:00 2001
+From ab593d129dd76437dc05e328852106e917d6fc7e Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
-Subject: [PATCH 162/177] grub2-btrfs-03-follow_default
+Subject: [PATCH 177/192] grub2-btrfs-03-follow_default
 
 ---
  grub-core/fs/btrfs.c | 107 ++++++++++++++++++++++++++++++++++++---------------
@@ -195,5 +195,5 @@ index 396296166..2c462584e 100644
  
  GRUB_MOD_FINI (btrfs)
 -- 
-2.13.3
+2.13.4
 
diff --git a/0163-grub2-btrfs-04-grub2-install.patch b/0178-grub2-btrfs-04-grub2-install.patch
similarity index 97%
rename from 0163-grub2-btrfs-04-grub2-install.patch
rename to 0178-grub2-btrfs-04-grub2-install.patch
index b741ad7..70fe751 100644
--- a/0163-grub2-btrfs-04-grub2-install.patch
+++ b/0178-grub2-btrfs-04-grub2-install.patch
@@ -1,7 +1,7 @@
-From 0011479f3d6187b0fa658e9f992292fe4970422b Mon Sep 17 00:00:00 2001
+From 48c1105e0755c455c70b39eeb03e7d138a9205a6 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
-Subject: [PATCH 163/177] grub2-btrfs-04-grub2-install
+Subject: [PATCH 178/192] grub2-btrfs-04-grub2-install
 
 ---
  grub-core/osdep/linux/getroot.c |  7 +++++++
@@ -173,5 +173,5 @@ index 47a241a39..5db7a9a7d 100644
        if (state->arg_num == 0)
  	arguments->pathname = xstrdup (arg);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0164-grub2-btrfs-05-grub2-mkconfig.patch b/0179-grub2-btrfs-05-grub2-mkconfig.patch
similarity index 96%
rename from 0164-grub2-btrfs-05-grub2-mkconfig.patch
rename to 0179-grub2-btrfs-05-grub2-mkconfig.patch
index 4037af0..fd0b44f 100644
--- a/0164-grub2-btrfs-05-grub2-mkconfig.patch
+++ b/0179-grub2-btrfs-05-grub2-mkconfig.patch
@@ -1,7 +1,7 @@
-From 84f394eb9a21b71bb86f0eeaad28b449e3462af0 Mon Sep 17 00:00:00 2001
+From 0d943cd642131e4f6d6ca9edde9d9373294ec1db Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
-Subject: [PATCH 164/177] grub2-btrfs-05-grub2-mkconfig
+Subject: [PATCH 179/192] grub2-btrfs-05-grub2-mkconfig
 
 ---
  util/grub-mkconfig.in       |  3 ++-
@@ -126,5 +126,5 @@ index 54f1ec8a2..462f8e1f8 100644
      xzfs)
  	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
 -- 
-2.13.3
+2.13.4
 
diff --git a/0165-grub2-btrfs-06-subvol-mount.patch b/0180-grub2-btrfs-06-subvol-mount.patch
similarity index 99%
rename from 0165-grub2-btrfs-06-subvol-mount.patch
rename to 0180-grub2-btrfs-06-subvol-mount.patch
index 30eec9d..9386081 100644
--- a/0165-grub2-btrfs-06-subvol-mount.patch
+++ b/0180-grub2-btrfs-06-subvol-mount.patch
@@ -1,7 +1,7 @@
-From 007556ce6695dfd416f20c31aa1d93d46086e2ce Mon Sep 17 00:00:00 2001
+From 8011b1d2b6e3f239bdee7ba22f9d08b613d24113 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Fri, 22 May 2015 11:45:25 +0000
-Subject: [PATCH 165/177] grub2-btrfs-06-subvol-mount
+Subject: [PATCH 180/192] grub2-btrfs-06-subvol-mount
 
 ---
  grub-core/fs/btrfs.c            | 195 +++++++++++++++++++++++++++++++++++++++-
@@ -536,5 +536,5 @@ index 036fe1822..cd84a72b9 100644
    const char *core_name = NULL;
  
 -- 
-2.13.3
+2.13.4
 
diff --git a/0166-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch b/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
similarity index 86%
rename from 0166-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
rename to 0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
index dec7378..f073586 100644
--- a/0166-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
+++ b/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
@@ -1,7 +1,7 @@
-From 8be1cec541699a554a7048f879fbe2b9bf67bac4 Mon Sep 17 00:00:00 2001
+From 9e5e9e44d13de2f297c60ddb956d838054c92578 Mon Sep 17 00:00:00 2001
 From: Dusty Mabe <dusty@dustymabe.com>
 Date: Sat, 18 Jul 2015 15:38:08 +0000
-Subject: [PATCH 166/177] No more "Bootable Snapshot" submenu in grub.cfg.
+Subject: [PATCH 181/192] No more "Bootable Snapshot" submenu in grub.cfg.
 
 This breaks grubby (run on kernel upgrades) because grubby just
 does a search for "menuentry".
@@ -30,5 +30,5 @@ index e2a533001..8a16fea34 100644
 -EOF
 -fi
 -- 
-2.13.3
+2.13.4
 
diff --git a/0167-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
similarity index 92%
rename from 0167-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
rename to 0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
index 91c6201..33b9a5c 100644
--- a/0167-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
+++ b/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
@@ -1,7 +1,7 @@
-From 8b9651ba5b2d60e7c3b67e2ecfae9550c4509889 Mon Sep 17 00:00:00 2001
+From 88db0c4fb663e700115f88303b6aacd9a29a6ff1 Mon Sep 17 00:00:00 2001
 From: Andrei Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jun 2016 16:44:17 +0000
-Subject: [PATCH 167/177] Fallback to old subvol name scheme to support old
+Subject: [PATCH 182/192] Fallback to old subvol name scheme to support old
  snapshot config
 
 Ref: bsc#953538
@@ -56,5 +56,5 @@ index d111147e8..a5c000805 100644
    if (btrfs_default_subvolid)
      return lookup_root_by_id(data, btrfs_default_subvolid);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0168-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
similarity index 98%
rename from 0168-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
rename to 0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
index 00132fe..a71713e 100644
--- a/0168-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+++ b/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
@@ -1,7 +1,7 @@
-From d34f81cb2da610d22b1c794864b39e24f70ba291 Mon Sep 17 00:00:00 2001
+From f125fb3b2523e0d15d243f52c008503065c1d825 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 11 May 2017 08:56:57 +0000
-Subject: [PATCH 168/177] Grub not working correctly with btrfs snapshots
+Subject: [PATCH 183/192] Grub not working correctly with btrfs snapshots
  (bsc#1026511)
 
 ---
@@ -272,5 +272,5 @@ index a5c000805..3cd947219 100644
                                 subvol_set_env);
    grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env,
 -- 
-2.13.3
+2.13.4
 
diff --git a/0169-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
similarity index 88%
rename from 0169-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
rename to 0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
index 8f897e1..8ed4507 100644
--- a/0169-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
+++ b/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
@@ -1,7 +1,7 @@
-From bc2e5ed91a4aff3612378675e67c8cde0e2ef2e7 Mon Sep 17 00:00:00 2001
+From dd0f61076714c4b63da8e780a3e4823e4af17833 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 1 Jun 2017 09:59:56 -0400
-Subject: [PATCH 169/177] Add grub_efi_allocate_pool() and grub_efi_free_pool()
+Subject: [PATCH 184/192] Add grub_efi_allocate_pool() and grub_efi_free_pool()
  wrappers.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 32 insertions(+), 4 deletions(-)
 
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 764cd11f5..89938bcaa 100644
+index 91e29ce66..68326d96f 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
 @@ -24,6 +24,10 @@
@@ -24,7 +24,7 @@ index 764cd11f5..89938bcaa 100644
  /* Functions.  */
  void *EXPORT_FUNC(grub_efi_locate_protocol) (grub_efi_guid_t *protocol,
  					     void *registration);
-@@ -51,6 +55,33 @@ EXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t *memory_map_size,
+@@ -58,6 +62,33 @@ EXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t *memory_map_size,
  				      grub_efi_uintn_t *map_key,
  				      grub_efi_uintn_t *descriptor_size,
  				      grub_efi_uint32_t *descriptor_version);
@@ -58,7 +58,7 @@ index 764cd11f5..89938bcaa 100644
  grub_efi_loaded_image_t *EXPORT_FUNC(grub_efi_get_loaded_image) (grub_efi_handle_t image_handle);
  void EXPORT_FUNC(grub_efi_print_device_path) (grub_efi_device_path_t *dp);
  char *EXPORT_FUNC(grub_efi_get_filename) (grub_efi_device_path_t *dp);
-@@ -96,10 +127,7 @@ void grub_efi_init (void);
+@@ -103,10 +134,7 @@ void grub_efi_init (void);
  void grub_efi_fini (void);
  void grub_efi_set_prefix (void);
  
@@ -71,5 +71,5 @@ index 764cd11f5..89938bcaa 100644
  
  struct grub_net_card;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0170-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch
similarity index 96%
rename from 0170-Use-grub_efi_.-memory-helpers-where-reasonable.patch
rename to 0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch
index 60d347d..7520acb 100644
--- a/0170-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+++ b/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch
@@ -1,7 +1,7 @@
-From 07f843af1c6880c8cbf39dc17de16616ce2e3ba4 Mon Sep 17 00:00:00 2001
+From fdcd3314bf7570e459007efc2553991da0d35619 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 1 Jun 2017 10:06:38 -0400
-Subject: [PATCH 170/177] Use grub_efi_...() memory helpers where reasonable.
+Subject: [PATCH 185/192] Use grub_efi_...() memory helpers where reasonable.
 
 This uses grub_efi_allocate_pool(), grub_efi_free_pool(), and
 grub_efi_free_pages() instead of open-coded efi_call_N() calls, so we
@@ -105,5 +105,5 @@ index 7826e794a..d2557b38d 100644
    if (cmdline)
      grub_free (cmdline);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0171-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
similarity index 92%
rename from 0171-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
rename to 0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
index 7af7a5e..8e1d62d 100644
--- a/0171-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+++ b/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
@@ -1,7 +1,7 @@
-From 4751dd389b5de3f7431742d87e233e9a3af23357 Mon Sep 17 00:00:00 2001
+From 56174d5d4a91cc0df9421ef82613ec332011e826 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 1 Jun 2017 10:07:50 -0400
-Subject: [PATCH 171/177] Add PRIxGRUB_EFI_STATUS and use it.
+Subject: [PATCH 186/192] Add PRIxGRUB_EFI_STATUS and use it.
 
 This avoids syntax checkers getting confused about if it's llx or lx.
 
@@ -45,5 +45,5 @@ index 02488ec35..ddc5ecfb0 100644
  #define GRUB_EFI_ERROR_CODE(value)	\
    ((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (value))
 -- 
-2.13.3
+2.13.4
 
diff --git a/0172-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
similarity index 90%
rename from 0172-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
rename to 0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
index 2040648..f6dc832 100644
--- a/0172-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
+++ b/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
@@ -1,7 +1,7 @@
-From 1f89a67ef084f8248c3b0727b09c247f8ccbdaa0 Mon Sep 17 00:00:00 2001
+From ea0790c19fc06366031390e39f70191499054a0a Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 26 Jun 2017 12:42:57 -0400
-Subject: [PATCH 172/177] Don't use dynamic sized arrays since we don't build
+Subject: [PATCH 187/192] Don't use dynamic sized arrays since we don't build
  with -std=c99
 
 ---
@@ -42,5 +42,5 @@ index 4be228d95..fa3e29126 100644
          {
            grub_strcpy (suffix, client_uuid);
 -- 
-2.13.3
+2.13.4
 
diff --git a/0173-don-t-ignore-const.patch b/0188-don-t-ignore-const.patch
similarity index 82%
rename from 0173-don-t-ignore-const.patch
rename to 0188-don-t-ignore-const.patch
index 8a19134..fcd7969 100644
--- a/0173-don-t-ignore-const.patch
+++ b/0188-don-t-ignore-const.patch
@@ -1,7 +1,7 @@
-From 371541bc350dd5ec10146b33daa001dfa095da21 Mon Sep 17 00:00:00 2001
+From da09d4c837884ccfbd51452f6af37044501de7d6 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 26 Jun 2017 12:43:22 -0400
-Subject: [PATCH 173/177] don't ignore const
+Subject: [PATCH 188/192] don't ignore const
 
 ---
  grub-core/net/tftp.c | 2 +-
@@ -21,5 +21,5 @@ index dcd824943..f90071353 100644
    while (*src != '\0')
      {
 -- 
-2.13.3
+2.13.4
 
diff --git a/0174-don-t-use-int-for-efi-status.patch b/0189-don-t-use-int-for-efi-status.patch
similarity index 82%
rename from 0174-don-t-use-int-for-efi-status.patch
rename to 0189-don-t-use-int-for-efi-status.patch
index 9668e72..27ad516 100644
--- a/0174-don-t-use-int-for-efi-status.patch
+++ b/0189-don-t-use-int-for-efi-status.patch
@@ -1,7 +1,7 @@
-From 172306859da85eff8f30703ccdc37682b42b0651 Mon Sep 17 00:00:00 2001
+From b80f9447368083bc90d2a2642e790fb0b8ae1010 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 26 Jun 2017 12:44:59 -0400
-Subject: [PATCH 174/177] don't use int for efi status
+Subject: [PATCH 189/192] don't use int for efi status
 
 ---
  grub-core/kern/efi/efi.c | 2 +-
@@ -21,5 +21,5 @@ index 1f3ac5e1d..2b60a6e27 100644
    if (retval == 0)
      rc = GRUB_EFI_SUCCESS;
 -- 
-2.13.3
+2.13.4
 
diff --git a/0175-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
similarity index 86%
rename from 0175-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
rename to 0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
index c4f9484..a346814 100644
--- a/0175-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
+++ b/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
@@ -1,7 +1,7 @@
-From 52df08715426a2c59829e6248fec2d729b869417 Mon Sep 17 00:00:00 2001
+From fb2c03f93456f934e090730589cf37495d613427 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 26 Jun 2017 12:46:23 -0400
-Subject: [PATCH 175/177] make GRUB_MOD_INIT() declare its function prototypes.
+Subject: [PATCH 190/192] make GRUB_MOD_INIT() declare its function prototypes.
 
 ---
  include/grub/dl.h | 2 ++
@@ -28,5 +28,5 @@ index 2bca56ce0..b1ed3c333 100644
  grub_##name##_fini (void) { grub_mod_fini (); } \
  static void \
 -- 
-2.13.3
+2.13.4
 
diff --git a/0176-Clean-up-some-errors-in-the-linuxefi-loader.patch b/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch
similarity index 89%
rename from 0176-Clean-up-some-errors-in-the-linuxefi-loader.patch
rename to 0191-Clean-up-some-errors-in-the-linuxefi-loader.patch
index 35c932b..9594a2d 100644
--- a/0176-Clean-up-some-errors-in-the-linuxefi-loader.patch
+++ b/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch
@@ -1,7 +1,7 @@
-From 1c44d6203c0e783b3b50c33e24b78445ff8dabb3 Mon Sep 17 00:00:00 2001
+From 3baddd2a95ca1026951e2d8bb0b39b9e22471eb1 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 24 May 2017 15:58:18 -0400
-Subject: [PATCH 176/177] Clean up some errors in the linuxefi loader
+Subject: [PATCH 191/192] Clean up some errors in the linuxefi loader
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index ed8cc40a0..19950d2f2 100644
+index bed5919ca..6db5d0bf3 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -161,8 +161,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -53,8 +53,8 @@ index ed8cc40a0..19950d2f2 100644
    start = (lh->setup_sects + 1) * 512;
 -  len = grub_file_size(file) - start;
  
-   kernel_mem = grub_efi_allocate_pages(lh->pref_address,
- 				       BYTES_TO_PAGES(lh->init_size));
+   kernel_mem = grub_efi_allocate_pages_max(lh->pref_address,
+ 					   BYTES_TO_PAGES(lh->init_size));
 @@ -343,7 +343,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        loaded = 0;
      }
@@ -65,5 +65,5 @@ index ed8cc40a0..19950d2f2 100644
  			 linux_cmdline,
  			 BYTES_TO_PAGES(lh->cmdline_size + 1));
 -- 
-2.13.3
+2.13.4
 
diff --git a/0192-editenv-handle-relative-symlinks.patch b/0192-editenv-handle-relative-symlinks.patch
new file mode 100644
index 0000000..b46732f
--- /dev/null
+++ b/0192-editenv-handle-relative-symlinks.patch
@@ -0,0 +1,53 @@
+From 9e2c8268c74edd473ecf684a2f0f0f050f112578 Mon Sep 17 00:00:00 2001
+From: Jonathan Lebon <jlebon@redhat.com>
+Date: Mon, 14 Aug 2017 14:37:20 -0400
+Subject: [PATCH 192/192] editenv: handle relative symlinks
+
+Handle symlinks with targets relative to the containing dir. This
+ensures that the rename operation does not depend on the cwd.
+
+Resolves: rhbz#1479960
+
+Signed-off-by: Jonathan Lebon <jlebon@redhat.com>
+---
+ util/editenv.c | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/util/editenv.c b/util/editenv.c
+index d8d1dad6a..41bc7cb1c 100644
+--- a/util/editenv.c
++++ b/util/editenv.c
+@@ -28,6 +28,7 @@
+ 
+ #include <errno.h>
+ #include <string.h>
++#include <libgen.h>
+ 
+ #define DEFAULT_ENVBLK_SIZE	1024
+ 
+@@ -87,9 +88,20 @@ grub_util_create_envblk_file (const char *name)
+ 	  continue;
+ 	}
+ 
+-      free (rename_target);
+       linkbuf[retsize] = '\0';
+-      rename_target = linkbuf;
++      if (linkbuf[0] == '/')
++        {
++          free (rename_target);
++          rename_target = linkbuf;
++        }
++      else
++        {
++          char *dbuf = xstrdup (rename_target);
++          const char *dir = dirname (dbuf);
++          free (rename_target);
++          rename_target = xasprintf("%s/%s", dir, linkbuf);
++          free (dbuf);
++        }
+     }
+ 
+   int rc = grub_util_rename (namenew, rename_target);
+-- 
+2.13.4
+
diff --git a/grub.patches b/grub.patches
index 37d322f..f3ee6e1 100644
--- a/grub.patches
+++ b/grub.patches
@@ -47,131 +47,146 @@ Patch0046: 0046-ehci-Fix-compilation-on-i386.patch
 Patch0047: 0047-crypto-Fix-use-after-free.patch
 Patch0048: 0048-arm-efi-Fix-compilation.patch
 Patch0049: 0049-fdt-silence-clang-warning.patch
-Patch0050: 0050-Fix-bzr-s-ignore-artificats-in-.gitignore.patch
-Patch0051: 0051-IBM-client-architecture-CAS-reboot-support.patch
-Patch0052: 0052-for-ppc-reset-console-display-attr-when-clear-screen.patch
-Patch0053: 0053-Disable-GRUB-video-support-for-IBM-power-machines.patch
-Patch0054: 0054-Honor-a-symlink-when-generating-configuration-by-gru.patch
-Patch0055: 0055-Move-bash-completion-script-922997.patch
-Patch0056: 0056-Update-to-minilzo-2.08.patch
-Patch0057: 0057-Allow-fallback-to-include-entries-by-title-not-just-.patch
-Patch0058: 0058-Add-GRUB_DISABLE_UUID.patch
-Patch0059: 0059-Make-exit-take-a-return-code.patch
-Patch0060: 0060-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
-Patch0061: 0061-Make-efi-machines-load-an-env-block-from-a-variable.patch
-Patch0062: 0062-DHCP-client-ID-and-UUID-options-added.patch
-Patch0063: 0063-trim-arp-packets-with-abnormal-size.patch
-Patch0064: 0064-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
-Patch0065: 0065-Add-support-for-UEFI-operating-systems-returned-by-o.patch
-Patch0066: 0066-Migrate-PPC-from-Yaboot-to-Grub2.patch
-Patch0067: 0067-Add-fw_path-variable-revised.patch
-Patch0068: 0068-Add-support-for-linuxefi.patch
-Patch0069: 0069-Use-linuxefi-and-initrdefi-where-appropriate.patch
-Patch0070: 0070-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
-Patch0071: 0071-Pass-x-hex-hex-straight-through-unmolested.patch
-Patch0072: 0072-Add-X-option-to-printf-functions.patch
-Patch0073: 0073-Search-for-specific-config-file-for-netboot.patch
-Patch0074: 0074-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
-Patch0075: 0075-Don-t-write-messages-to-the-screen.patch
-Patch0076: 0076-Don-t-print-GNU-GRUB-header.patch
-Patch0077: 0077-Don-t-add-to-highlighted-row.patch
-Patch0078: 0078-Message-string-cleanups.patch
-Patch0079: 0079-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
-Patch0080: 0080-Use-the-correct-indentation-for-the-term-help-text.patch
-Patch0081: 0081-Indent-menu-entries.patch
-Patch0082: 0082-Fix-margins.patch
-Patch0083: 0083-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
-Patch0084: 0084-Use-linux16-when-appropriate-880840.patch
-Patch0085: 0085-Enable-pager-by-default.-985860.patch
-Patch0086: 0086-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
-Patch0087: 0087-Don-t-say-GNU-Linux-in-generated-menus.patch
-Patch0088: 0088-Don-t-draw-a-border-around-the-menu.patch
-Patch0089: 0089-Use-the-standard-margin-for-the-timeout-string.patch
-Patch0090: 0090-Add-.eh_frame-to-list-of-relocations-stripped.patch
-Patch0091: 0091-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
-Patch0092: 0092-Don-t-print-during-fdt-loading-method.patch
-Patch0093: 0093-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
-Patch0094: 0094-Don-t-require-a-password-to-boot-entries-generated-b.patch
-Patch0095: 0095-Don-t-emit-Booting-.-message.patch
-Patch0096: 0096-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
-Patch0097: 0097-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
-Patch0098: 0098-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
-Patch0099: 0099-Fix-convert-function-to-support-NVMe-devices.patch
-Patch0100: 0100-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
-Patch0101: 0101-Use-the-default-device-tree-from-the-grub-default-fi.patch
-Patch0102: 0102-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
-Patch0103: 0103-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
-Patch0104: 0104-Add-grub_util_readlink.patch
-Patch0105: 0105-Make-editenv-chase-symlinks-including-those-across-d.patch
-Patch0106: 0106-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
-Patch0107: 0107-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
-Patch0108: 0108-Load-arm-with-SB-enabled.patch
-Patch0109: 0109-Try-prefix-if-fw_path-doesn-t-work.patch
-Patch0110: 0110-Update-info-with-grub.cfg-netboot-selection-order-11.patch
-Patch0111: 0111-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
-Patch0112: 0112-Handle-rssd-storage-devices.patch
-Patch0113: 0113-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
-Patch0114: 0114-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
-Patch0115: 0115-Add-friendly-grub2-password-config-tool-985962.patch
-Patch0116: 0116-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch
-Patch0117: 0117-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
-Patch0118: 0118-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
-Patch0119: 0119-tcp-add-window-scaling-support.patch
-Patch0120: 0120-efinet-retransmit-if-our-device-is-busy.patch
-Patch0121: 0121-Be-more-aggro-about-actually-using-the-configured-ne.patch
-Patch0122: 0122-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
-Patch0123: 0123-Fix-security-issue-when-reading-username-and-passwor.patch
-Patch0124: 0124-Warn-if-grub-password-will-not-be-read-1290803.patch
-Patch0125: 0125-Clean-up-grub-setpassword-documentation-1290799.patch
-Patch0126: 0126-Fix-locale-issue-in-grub-setpassword-1294243.patch
-Patch0127: 0127-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
-Patch0128: 0128-efiemu-Fix-compilation-failure.patch
-Patch0129: 0129-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
-Patch0130: 0130-Add-a-url-parser.patch
-Patch0131: 0131-efinet-and-bootp-add-support-for-dhcpv6.patch
-Patch0132: 0132-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
-Patch0133: 0133-Normalize-slashes-in-tftp-paths.patch
-Patch0134: 0134-Fix-malformed-tftp-packets.patch
-Patch0135: 0135-Fix-race-in-EFI-validation.patch
-Patch0136: 0136-bz1374141-fix-incorrect-mask-for-ppc64.patch
-Patch0137: 0137-Use-device-part-of-chainloader-target-if-present.patch
-Patch0138: 0138-Add-secureboot-support-on-efi-chainloader.patch
-Patch0139: 0139-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
-Patch0140: 0140-Make-grub_fatal-also-backtrace.patch
-Patch0141: 0141-Rework-linux-command.patch
-Patch0142: 0142-Rework-linux16-command.patch
-Patch0143: 0143-Make-grub-editenv-build-again.patch
-Patch0144: 0144-Fix-up-some-man-pages-rpmdiff-noticed.patch
-Patch0145: 0145-Re-work-some-intricacies-of-PE-loading.patch
-Patch0146: 0146-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch
-Patch0147: 0147-linuxefi-fix-double-free-on-verification-failure.patch
-Patch0148: 0148-fix-machine-type-test-in-30_os-prober.in.patch
-Patch0149: 0149-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
-Patch0150: 0150-efi-chainloader-truncate-overlong-relocation-section.patch
-Patch0151: 0151-linuxefi-minor-cleanups.patch
-Patch0152: 0152-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
-Patch0153: 0153-Fix-up-linux-params-usage.patch
-Patch0154: 0154-Make-exit-take-a-return-code.patch
-Patch0155: 0155-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
-Patch0156: 0156-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch
-Patch0157: 0157-Make-our-info-pages-say-grub2-where-appropriate.patch
-Patch0158: 0158-print-more-debug-info-in-our-module-loader.patch
-Patch0159: 0159-macos-just-build-chainloader-entries-don-t-try-any-x.patch
-Patch0160: 0160-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
-Patch0161: 0161-export-btrfs_subvol-and-btrfs_subvolid.patch
-Patch0162: 0162-grub2-btrfs-03-follow_default.patch
-Patch0163: 0163-grub2-btrfs-04-grub2-install.patch
-Patch0164: 0164-grub2-btrfs-05-grub2-mkconfig.patch
-Patch0165: 0165-grub2-btrfs-06-subvol-mount.patch
-Patch0166: 0166-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
-Patch0167: 0167-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
-Patch0168: 0168-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
-Patch0169: 0169-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
-Patch0170: 0170-Use-grub_efi_.-memory-helpers-where-reasonable.patch
-Patch0171: 0171-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
-Patch0172: 0172-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
-Patch0173: 0173-don-t-ignore-const.patch
-Patch0174: 0174-don-t-use-int-for-efi-status.patch
-Patch0175: 0175-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
-Patch0176: 0176-Clean-up-some-errors-in-the-linuxefi-loader.patch
-Patch0177: 0177-Fix-a-segfault-in-lsefi.patch
+Patch0050: 0050-Fix-a-segfault-in-lsefi.patch
+Patch0051: 0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch
+Patch0052: 0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch
+Patch0053: 0053-grub-core-fs-udf.c-Add-support-for-UUID.patch
+Patch0054: 0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch
+Patch0055: 0055-Fail-if-xorriso-failed.patch
+Patch0056: 0056-efi-refactor-grub_efi_allocate_pages.patch
+Patch0057: 0057-Remove-grub_efi_allocate_pages.patch
+Patch0058: 0058-efi-move-fdt-helper-library.patch
+Patch0059: 0059-efi-Add-GRUB_PE32_MAGIC-definition.patch
+Patch0060: 0060-arm64-linux-loader-improve-type-portability.patch
+Patch0061: 0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch
+Patch0062: 0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch
+Patch0063: 0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch
+Patch0064: 0064-info-in-builddir.patch
+Patch0065: 0065-re-write-.gitignore.patch
+Patch0066: 0066-IBM-client-architecture-CAS-reboot-support.patch
+Patch0067: 0067-for-ppc-reset-console-display-attr-when-clear-screen.patch
+Patch0068: 0068-Disable-GRUB-video-support-for-IBM-power-machines.patch
+Patch0069: 0069-Honor-a-symlink-when-generating-configuration-by-gru.patch
+Patch0070: 0070-Move-bash-completion-script-922997.patch
+Patch0071: 0071-Update-to-minilzo-2.08.patch
+Patch0072: 0072-Allow-fallback-to-include-entries-by-title-not-just-.patch
+Patch0073: 0073-Add-GRUB_DISABLE_UUID.patch
+Patch0074: 0074-Make-exit-take-a-return-code.patch
+Patch0075: 0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
+Patch0076: 0076-Make-efi-machines-load-an-env-block-from-a-variable.patch
+Patch0077: 0077-DHCP-client-ID-and-UUID-options-added.patch
+Patch0078: 0078-trim-arp-packets-with-abnormal-size.patch
+Patch0079: 0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
+Patch0080: 0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+Patch0081: 0081-Migrate-PPC-from-Yaboot-to-Grub2.patch
+Patch0082: 0082-Add-fw_path-variable-revised.patch
+Patch0083: 0083-Add-support-for-linuxefi.patch
+Patch0084: 0084-Use-linuxefi-and-initrdefi-where-appropriate.patch
+Patch0085: 0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
+Patch0086: 0086-Pass-x-hex-hex-straight-through-unmolested.patch
+Patch0087: 0087-Add-X-option-to-printf-functions.patch
+Patch0088: 0088-Search-for-specific-config-file-for-netboot.patch
+Patch0089: 0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+Patch0090: 0090-Don-t-write-messages-to-the-screen.patch
+Patch0091: 0091-Don-t-print-GNU-GRUB-header.patch
+Patch0092: 0092-Don-t-add-to-highlighted-row.patch
+Patch0093: 0093-Message-string-cleanups.patch
+Patch0094: 0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+Patch0095: 0095-Use-the-correct-indentation-for-the-term-help-text.patch
+Patch0096: 0096-Indent-menu-entries.patch
+Patch0097: 0097-Fix-margins.patch
+Patch0098: 0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+Patch0099: 0099-Use-linux16-when-appropriate-880840.patch
+Patch0100: 0100-Enable-pager-by-default.-985860.patch
+Patch0101: 0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+Patch0102: 0102-Don-t-say-GNU-Linux-in-generated-menus.patch
+Patch0103: 0103-Don-t-draw-a-border-around-the-menu.patch
+Patch0104: 0104-Use-the-standard-margin-for-the-timeout-string.patch
+Patch0105: 0105-Add-.eh_frame-to-list-of-relocations-stripped.patch
+Patch0106: 0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
+Patch0107: 0107-Don-t-print-during-fdt-loading-method.patch
+Patch0108: 0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
+Patch0109: 0109-Don-t-require-a-password-to-boot-entries-generated-b.patch
+Patch0110: 0110-Don-t-emit-Booting-.-message.patch
+Patch0111: 0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
+Patch0112: 0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+Patch0113: 0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+Patch0114: 0114-Fix-convert-function-to-support-NVMe-devices.patch
+Patch0115: 0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
+Patch0116: 0116-Use-the-default-device-tree-from-the-grub-default-fi.patch
+Patch0117: 0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+Patch0118: 0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+Patch0119: 0119-Add-grub_util_readlink.patch
+Patch0120: 0120-Make-editenv-chase-symlinks-including-those-across-d.patch
+Patch0121: 0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+Patch0122: 0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+Patch0123: 0123-Load-arm-with-SB-enabled.patch
+Patch0124: 0124-Try-prefix-if-fw_path-doesn-t-work.patch
+Patch0125: 0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch
+Patch0126: 0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
+Patch0127: 0127-Handle-rssd-storage-devices.patch
+Patch0128: 0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
+Patch0129: 0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+Patch0130: 0130-Add-friendly-grub2-password-config-tool-985962.patch
+Patch0131: 0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch
+Patch0132: 0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+Patch0133: 0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
+Patch0134: 0134-tcp-add-window-scaling-support.patch
+Patch0135: 0135-efinet-retransmit-if-our-device-is-busy.patch
+Patch0136: 0136-Be-more-aggro-about-actually-using-the-configured-ne.patch
+Patch0137: 0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
+Patch0138: 0138-Fix-security-issue-when-reading-username-and-passwor.patch
+Patch0139: 0139-Warn-if-grub-password-will-not-be-read-1290803.patch
+Patch0140: 0140-Clean-up-grub-setpassword-documentation-1290799.patch
+Patch0141: 0141-Fix-locale-issue-in-grub-setpassword-1294243.patch
+Patch0142: 0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
+Patch0143: 0143-efiemu-Fix-compilation-failure.patch
+Patch0144: 0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+Patch0145: 0145-Add-a-url-parser.patch
+Patch0146: 0146-efinet-and-bootp-add-support-for-dhcpv6.patch
+Patch0147: 0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+Patch0148: 0148-Normalize-slashes-in-tftp-paths.patch
+Patch0149: 0149-Fix-malformed-tftp-packets.patch
+Patch0150: 0150-Fix-race-in-EFI-validation.patch
+Patch0151: 0151-bz1374141-fix-incorrect-mask-for-ppc64.patch
+Patch0152: 0152-Use-device-part-of-chainloader-target-if-present.patch
+Patch0153: 0153-Add-secureboot-support-on-efi-chainloader.patch
+Patch0154: 0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+Patch0155: 0155-Make-grub_fatal-also-backtrace.patch
+Patch0156: 0156-Rework-linux-command.patch
+Patch0157: 0157-Rework-linux16-command.patch
+Patch0158: 0158-Make-grub-editenv-build-again.patch
+Patch0159: 0159-Fix-up-some-man-pages-rpmdiff-noticed.patch
+Patch0160: 0160-Re-work-some-intricacies-of-PE-loading.patch
+Patch0161: 0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch
+Patch0162: 0162-linuxefi-fix-double-free-on-verification-failure.patch
+Patch0163: 0163-fix-machine-type-test-in-30_os-prober.in.patch
+Patch0164: 0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
+Patch0165: 0165-efi-chainloader-truncate-overlong-relocation-section.patch
+Patch0166: 0166-linuxefi-minor-cleanups.patch
+Patch0167: 0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
+Patch0168: 0168-Fix-up-linux-params-usage.patch
+Patch0169: 0169-Make-exit-take-a-return-code.patch
+Patch0170: 0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
+Patch0171: 0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch
+Patch0172: 0172-Make-our-info-pages-say-grub2-where-appropriate.patch
+Patch0173: 0173-print-more-debug-info-in-our-module-loader.patch
+Patch0174: 0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch
+Patch0175: 0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
+Patch0176: 0176-export-btrfs_subvol-and-btrfs_subvolid.patch
+Patch0177: 0177-grub2-btrfs-03-follow_default.patch
+Patch0178: 0178-grub2-btrfs-04-grub2-install.patch
+Patch0179: 0179-grub2-btrfs-05-grub2-mkconfig.patch
+Patch0180: 0180-grub2-btrfs-06-subvol-mount.patch
+Patch0181: 0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
+Patch0182: 0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
+Patch0183: 0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+Patch0184: 0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
+Patch0185: 0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+Patch0186: 0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+Patch0187: 0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
+Patch0188: 0188-don-t-ignore-const.patch
+Patch0189: 0189-don-t-use-int-for-efi-status.patch
+Patch0190: 0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
+Patch0191: 0191-Clean-up-some-errors-in-the-linuxefi-loader.patch
+Patch0192: 0192-editenv-handle-relative-symlinks.patch
diff --git a/grub2.spec b/grub2.spec
index a00f21e..4b1ab47 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -45,7 +45,7 @@
 Name:           grub2
 Epoch:          1
 Version:        2.02
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -558,6 +558,9 @@ fi
 %{_datarootdir}/grub/themes/starfield
 
 %changelog
+* Wed Aug 16 2017 pjones <pjones@redhat.com> - 1:2.02-8
+- Rebased to newer upstream for fedora-27
+
 * Tue Aug 15 2017 Peter Jones <pjones@redhat.com> - 2.02-7
 - Rebuild again with new fixed rpm. (bug #1480407)