Rebased to newer upstream for fedora-27

Signed-off-by: Peter Jones <pjones@redhat.com>
2017-08-16 11:14:30 -04:00 · 2017-08-16 11:14:30 -04:00 · bbc6a8998a
parent 47f2daf5df
commit bbc6a8998a
195 changed files with 2731 additions and 1074 deletions
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- a/0050-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

--- a/0050-Fix-bzr-s-ignore-artificats-in-.gitignore.patch
+++ b/0050-Fix-bzr-s-ignore-artificats-in-.gitignore.patch
@ -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
-
--- 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
@ -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
+
--- a/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch
+++ 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
+
--- a/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch
+++ 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
+
--- a/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch
+++ 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
+
--- a/0055-Fail-if-xorriso-failed.patch
+++ 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
+
--- a/0056-efi-refactor-grub_efi_allocate_pages.patch
+++ 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
+
--- a/0057-Remove-grub_efi_allocate_pages.patch
+++ 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
+
--- a/0058-efi-move-fdt-helper-library.patch
+++ 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
+
--- a/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch
+++ 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
+
--- a/0060-arm64-linux-loader-improve-type-portability.patch
+++ 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
+
--- 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
@ -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
+
--- a/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch
+++ 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
+
--- 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
@ -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
+
--- a/0064-info-in-builddir.patch
+++ 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
+
--- a/0065-re-write-.gitignore.patch
+++ 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
+
--- a/0066-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

--- a/0067-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

--- a/0068-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

--- a/0069-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

--- a/0070-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

--- a/0071-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

--- a/0072-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

--- a/0073-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

--- a/0074-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

--- a/0075-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

--- a/0076-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

--- a/0077-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

--- a/0078-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

--- a/0079-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

--- a/0080-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

--- a/0081-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

--- a/0082-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

--- a/0083-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

--- a/0084-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

--- a/0085-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

--- a/0086-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

--- a/0087-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

--- a/0088-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

--- a/0089-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

--- a/0090-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

--- a/0091-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

--- a/0092-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

--- a/0093-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

--- a/0094-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

--- a/0095-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

--- a/0096-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

--- a/0097-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

--- a/0098-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

--- a/0099-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

--- a/Show More
+++ b/Show More