Fix arm kernel command line allocation

Resolves: rhbz#1484609 Get rid of the temporary extra efi packages hack. Signed-off-by: Peter Jones <pjones@redhat.com>
2017-08-24 14:10:08 -04:00 · 2017-08-24 14:10:08 -04:00 · 88d855728e
parent 32e67a5dba
commit 88d855728e
195 changed files with 532 additions and 555 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/192] Bump version to 2.03
+Subject: [PATCH 001/194] 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.4
+2.13.5

--- 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/192] Remove bashisms from tests.
+Subject: [PATCH 002/194] 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.4
+2.13.5

--- 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/192] fs-tester: make sh-compatible
+Subject: [PATCH 003/194] 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.4
+2.13.5

--- 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/192] support busybox date.
+Subject: [PATCH 004/194] 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.4
+2.13.5

--- 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/192] Don't retrieve fstime when it's not useful.
+Subject: [PATCH 005/194] 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.4
+2.13.5

--- 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/192] Support lseek64.
+Subject: [PATCH 006/194] 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.4
+2.13.5

--- 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/192] Use $(SHELL) rather than /bin/sh.
+Subject: [PATCH 007/194] 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.4
+2.13.5

--- 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/192] po: Use @SHELL@ rather than /bin/sh.
+Subject: [PATCH 008/194] po: Use @SHELL@ rather than /bin/sh.

 /bin/sh might not exist.
 ---
@ -22,5 +22,5 @@ index 3619458e8..e68e9da84 100644
 
 srcdir = @srcdir@
 -- 
-2.13.4
+2.13.5

--- 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/192] Add termux path to dict.
+Subject: [PATCH 009/194] 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.4
+2.13.5

--- 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/192] Fix shebang for termux.
+Subject: [PATCH 010/194] 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.4
+2.13.5

--- 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/192] Add strtoull test.
+Subject: [PATCH 011/194] Add strtoull test.

 ---
 grub-core/Makefile.core.def | 5 +++++
@ -24,5 +24,5 @@ index 2dfa22a92..8dcd0e5a9 100644
   common = tests/setjmp_test.c;
 };
 -- 
-2.13.4
+2.13.5

--- 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/192] strtoull: Fix behaviour on chars between '9' and 'a'.
+Subject: [PATCH 012/194] 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.4
+2.13.5

--- 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/192] Add Virtual LAN support.
+Subject: [PATCH 013/194] 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.4
+2.13.5

--- 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/192] mkimage: Pass layout to mkimage_generate_elfXX rather
+Subject: [PATCH 014/194] 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.4
+2.13.5

--- 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/192] Refactor arm-uboot code to make it genereic.
+Subject: [PATCH 015/194] 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.4
+2.13.5

--- 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/192] coreboot: Split parts that are platform-independent.
+Subject: [PATCH 016/194] 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.4
+2.13.5

--- 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/192] Rename uboot/halt.c to dummy/halt.c.
+Subject: [PATCH 017/194] 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.4
+2.13.5

--- 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/192] Rename uboot/datetime to dummy/datetime.
+Subject: [PATCH 018/194] 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.4
+2.13.5

--- 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/192] arm-coreboot: Start new port.
+Subject: [PATCH 019/194] 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.4
+2.13.5

--- 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/192] Add support for device-tree-based drivers.
+Subject: [PATCH 020/194] 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.4
+2.13.5

--- 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/192] arm-coreboot: Support for vexpress timer.
+Subject: [PATCH 021/194] 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.4
+2.13.5

--- 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/192] arm-coreboot: Export FDT routines.
+Subject: [PATCH 022/194] 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.4
+2.13.5

--- 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/192] at_keyboard: Split protocol from controller code.
+Subject: [PATCH 023/194] 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.4
+2.13.5

--- 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/192] arm_coreboot: Support keyboard for vexpress.
+Subject: [PATCH 024/194] arm_coreboot: Support keyboard for vexpress.

 ---
 grub-core/Makefile.am              |   1 +
@ -245,5 +245,5 @@ index 000000000..e4cda3056
 +  grub_fdtbus_register (&pl050);
 +}
 -- 
-2.13.4
+2.13.5

--- 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/192] arm_coreboot: Support grub-mkstandalone.
+Subject: [PATCH 025/194] 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.4
+2.13.5

--- 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/192] arm_coreboot: Support loading linux images.
+Subject: [PATCH 026/194] 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.4
+2.13.5

--- 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/192] arm_coreboot: Support DMA.
+Subject: [PATCH 027/194] 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.4
+2.13.5

--- 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/192] ehci: Split core  code from PCI part.
+Subject: [PATCH 028/194] 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.4
+2.13.5

--- 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/192] arm_coreboot: Support EHCI.
+Subject: [PATCH 029/194] arm_coreboot: Support EHCI.

 ---
 gentpl.py                    |  2 +-
@ -119,5 +119,5 @@ index 11d96481f..512ae1dd0 100644
 
 #endif /* GRUB_USB_H */
 -- 
-2.13.4
+2.13.5

--- 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/192] Fix bug on FDT nodes with compatible property
+Subject: [PATCH 030/194] 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.4
+2.13.5

--- 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/192] fdtbus: Add ability to send/receive messages on
+Subject: [PATCH 031/194] 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.4
+2.13.5

--- 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/192] rk3288_spi: Add SPI driver
+Subject: [PATCH 032/194] rk3288_spi: Add SPI driver

 ---
 grub-core/Makefile.core.def        |   1 +
@ -161,5 +161,5 @@ index 09cd7fe32..269505342 100644
 #endif /* ! ASM_FILE */
 
 -- 
-2.13.4
+2.13.5

--- 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/192] arm_coreboot: Add Chromebook keyboard driver.
+Subject: [PATCH 033/194] arm_coreboot: Add Chromebook keyboard driver.

 ---
 grub-core/term/arm/cros.c    | 125 +++++++++++++++++++++++
@ -415,5 +415,5 @@ index 000000000..45a372572
 +
 +#endif
 -- 
-2.13.4
+2.13.5

--- 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/192] Missing parts of previous commit
+Subject: [PATCH 034/194] Missing parts of previous commit

 ---
 grub-core/Makefile.core.def        | 2 ++
@ -34,5 +34,5 @@ index 0126ff638..8d8c5b829 100644
 }
 
 -- 
-2.13.4
+2.13.5

--- 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/192] coreboot: Changed cbmemc to support updated console
+Subject: [PATCH 035/194] coreboot: Changed cbmemc to support updated console
 format from coreboot.

 ---
@ -94,5 +94,5 @@ index 129248c7f..cea9b8431 100644
 }
 
 -- 
-2.13.4
+2.13.5

--- 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/192] at_keyboard: Fix falco chromebook case.
+Subject: [PATCH 036/194] 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.4
+2.13.5

--- 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/192] sparc64: Close cdboot ihandle
+Subject: [PATCH 037/194] 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.4
+2.13.5

--- 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/192] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64
+Subject: [PATCH 038/194] 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.4
+2.13.5

--- 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/192] arm64: Add "--nounzip" option support in xen_module
+Subject: [PATCH 039/194] 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.4
+2.13.5

--- 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/192] util/grub.d/20_linux_xen.in: Add xen_boot command
+Subject: [PATCH 040/194] 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.4
+2.13.5

--- 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/192] arm64: Update the introduction of Xen boot commands
+Subject: [PATCH 041/194] 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.4
+2.13.5

--- 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/192] sparc64: Don't use devspec to determine the OBP path
+Subject: [PATCH 042/194] 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.4
+2.13.5

--- 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/192] Allow GRUB to mount ext2/3/4 filesystems that have
+Subject: [PATCH 043/194] 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.4
+2.13.5

--- 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/192] ehci: Fix compilation for amd64
+Subject: [PATCH 044/194] 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.4
+2.13.5

--- 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/192] cache: Fix compilation for ppc, sparc and arm64
+Subject: [PATCH 045/194] 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.4
+2.13.5

--- 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/192] ehci: Fix compilation on i386
+Subject: [PATCH 046/194] 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.4
+2.13.5

--- 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/192] crypto: Fix use after free.
+Subject: [PATCH 047/194] 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.4
+2.13.5

--- 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/192] arm-efi: Fix compilation
+Subject: [PATCH 048/194] arm-efi: Fix compilation

 ---
 grub-core/loader/arm/linux.c | 8 ++++----
@ -37,5 +37,5 @@ index 260cbf068..e64c79a95 100644
 }
 
 -- 
-2.13.4
+2.13.5

--- 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/192] fdt: silence clang warning.
+Subject: [PATCH 049/194] fdt: silence clang warning.

 ---
 grub-core/lib/fdt.c | 3 ++-
@ -22,5 +22,5 @@ index bdc630244..2705f2629 100644
           return 0;
 	return token;
 -- 
-2.13.4
+2.13.5

--- a/0050-Fix-a-segfault-in-lsefi.patch
+++ b/0050-Fix-a-segfault-in-lsefi.patch
@ -1,7 +1,7 @@
 From e8ab5a1a9e2889eb59d1fa494ba441a53698dcd2 Mon Sep 17 00:00:00 2001
 From: Rob Clark <rclark@redhat.com>
 Date: Wed, 19 Jul 2017 15:47:41 -0400
-Subject: [PATCH 050/192] Fix a segfault in lsefi
+Subject: [PATCH 050/194] 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.
@ -29,5 +29,5 @@ index d901c3892..d1ce99af4 100644
 	{
 	  for (k = 0; k < ARRAY_SIZE (known_protocols); k++)
 -- 
-2.13.4
+2.13.5

--- 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
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 051/194] zfs: remove size_t typedef and use grub_size_t
 instead

 * Prevents some toolchains from issuing a warning on size_t redef.
@ -55,5 +55,5 @@ index 2f73449f0..5453822d0 100644
 			const int dec2 = 0;
 #endif
 -- 
-2.13.4
+2.13.5

--- a/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch
+++ b/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 052/194] 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
@ -50,5 +50,5 @@ index 839bff889..258745633 100644
     }
   else
 -- 
-2.13.4
+2.13.5

--- a/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch
+++ b/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 053/194] * grub-core/fs/udf.c: Add support for UUID

 Use same algorithm as in libblkid from util-linux v2.30.

@ -187,5 +187,5 @@ index 258745633..00a16098b 100644
   .reserved_first_sector = 1,
   .blocklist_install = 1,
 -- 
-2.13.4
+2.13.5

--- a/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch
+++ b/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 054/194] mkrescue: Check xorriso presence before doing
 anything else.

 mkrescue can't do anything useful without xorriso, so abort early if it's
@ -46,5 +46,5 @@ index 238d4840e..38f154397 100644
   grub_hostfs_init ();
   grub_host_init ();
 -- 
-2.13.4
+2.13.5

--- a/0055-Fail-if-xorriso-failed.patch
+++ b/0055-Fail-if-xorriso-failed.patch
@ -1,7 +1,7 @@
 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.
+Subject: [PATCH 055/194] Fail if xorriso failed.

 If xorriso failed most likely we didn't generate a meaningful image.
 ---
@ -40,5 +40,5 @@ index 38f154397..9545945d8 100644
   grub_util_unlink_recursive (iso9660_dir);
 
 -- 
-2.13.4
+2.13.5

--- a/0056-efi-refactor-grub_efi_allocate_pages.patch
+++ b/0056-efi-refactor-grub_efi_allocate_pages.patch
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 056/194] 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
@ -116,5 +116,5 @@ index e9c601f34..b4cbebf38 100644
 				      grub_efi_uintn_t pages);
 void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
 -- 
-2.13.4
+2.13.5

--- a/0057-Remove-grub_efi_allocate_pages.patch
+++ b/0057-Remove-grub_efi_allocate_pages.patch
@ -1,7 +1,7 @@
 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.
+Subject: [PATCH 057/194] Remove grub_efi_allocate_pages.

 grub_efi_allocate_pages Essentially does 2 unrelated things:
 * Allocate at fixed address.
@ -248,5 +248,5 @@ index b4cbebf38..3fa082816 100644
 				       grub_efi_uintn_t pages);
 int
 -- 
-2.13.4
+2.13.5

--- a/0058-efi-move-fdt-helper-library.patch
+++ b/0058-efi-move-fdt-helper-library.patch
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 058/194] 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
@ -89,5 +89,5 @@ similarity index 100%
 rename from include/grub/arm64/fdtload.h
 rename to include/grub/efi/fdtload.h
 -- 
-2.13.4
+2.13.5

--- a/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch
+++ b/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 059/194] 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.
@ -55,5 +55,5 @@ index f79c36c02..7d44732d2 100644
    But some examples (such as EFI drivers in the Intel
    Sample Implementation) use 32 bytes (0x20) instead, and it seems
 -- 
-2.13.4
+2.13.5

--- a/0060-arm64-linux-loader-improve-type-portability.patch
+++ b/0060-arm64-linux-loader-improve-type-portability.patch
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 060/194] 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.
@ -111,5 +111,5 @@ index 091e9ddf4..17212c38d 100644
   fdt = NULL;
 }
 -- 
-2.13.4
+2.13.5

--- 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
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 061/194] efi: change heap allocation type to
 GRUB_EFI_LOADER_CODE

 With upcoming changes to EDK2, allocations of type EFI_LOADER_DATA may
@ -32,5 +32,5 @@ index b97b05fe8..ac2a4c556 100644
 	grub_fatal ("cannot allocate conventional memory %p with %u pages",
 		    (void *) ((grub_addr_t) start),
 -- 
-2.13.4
+2.13.5

--- a/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch
+++ b/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 062/194] 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
@ -261,5 +261,5 @@ index 5ffb38f69..8117e2a24 100644
 #define GRUB_TERM_BACKSPACE	'\b'
 
 -- 
-2.13.4
+2.13.5

--- 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
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 063/194] io: add a GRUB_GZ prefix to gzio specific defines

 * This is done to avoid a conflict with a PACKED define in the EDK2
 ---
@ -81,5 +81,5 @@ index 0f2ea6bd8..a8e33033b 100644
       /* TRANSLATORS: It's about given file having some strange format, not
 	 complete lack of gzip support.  */
 -- 
-2.13.4
+2.13.5

--- a/0064-info-in-builddir.patch
+++ b/0064-info-in-builddir.patch
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 064/194] info-in-builddir

 ---
 docs/Makefile.am | 2 +-
@ -18,5 +18,5 @@ index 93eb39627..e396ba10f 100644
 # AM_MAKEINFOFLAGS = --no-split --no-validate
 info_TEXINFOS = grub.texi grub-dev.texi
 -- 
-2.13.4
+2.13.5

--- a/0065-re-write-.gitignore.patch
+++ b/0065-re-write-.gitignore.patch
@ -1,7 +1,7 @@
 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
+Subject: [PATCH 065/194] re-write .gitignore

 ---
 .gitignore                        | 352 ++++++++++++--------------------------
@ -496,5 +496,5 @@ index 000000000..b7e1eb124
@@ -0,0 +1 @@
 +grub
 -- 
-2.13.4
+2.13.5

--- a/0066-IBM-client-architecture-CAS-reboot-support.patch
+++ b/0066-IBM-client-architecture-CAS-reboot-support.patch
@ -1,7 +1,7 @@
 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 066/192] IBM client architecture (CAS) reboot support
+Subject: [PATCH 066/194] 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.4
+2.13.5

--- 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 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 067/192] for ppc, reset console display attr when clear screen
+Subject: [PATCH 067/194] for ppc, reset console display attr when clear screen

 v2: Also use \x0c instead of a literal ^L to make future patches less
 awkward.
@ -28,5 +28,5 @@ index d317efa36..29df35e6d 100644
       data->reverse_video_off = grub_strdup ("\e[m");
       if (grub_strcmp ("ieee1275", str) == 0)
 -- 
-2.13.4
+2.13.5

--- 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 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 068/192] Disable GRUB video support for IBM power machines
+Subject: [PATCH 068/194] 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.4
+2.13.5

--- 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 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 069/192] Honor a symlink when generating configuration by
+Subject: [PATCH 069/194] 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.4
+2.13.5

--- a/0070-Move-bash-completion-script-922997.patch
+++ b/0070-Move-bash-completion-script-922997.patch
@ -1,7 +1,7 @@
 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 070/192] Move bash completion script (#922997)
+Subject: [PATCH 070/194] 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.4
+2.13.5

--- a/0071-Update-to-minilzo-2.08.patch
+++ b/0071-Update-to-minilzo-2.08.patch
@ -1,7 +1,7 @@
 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 071/192] Update to minilzo-2.08
+Subject: [PATCH 071/194] 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.4
+2.13.5

--- 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 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 072/192] Allow "fallback" to include entries by title, not
+Subject: [PATCH 072/194] Allow "fallback" to include entries by title, not
 just number.

 Resolves: rhbz#1026084
@ -140,5 +140,5 @@ index e7a83c2d6..d2f64b05e 100644
 static int
 get_entry_number (grub_menu_t menu, const char *name)
 -- 
-2.13.4
+2.13.5

--- a/0073-Add-GRUB_DISABLE_UUID.patch
+++ b/0073-Add-GRUB_DISABLE_UUID.patch
@ -1,7 +1,7 @@
 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 073/192] Add GRUB_DISABLE_UUID.
+Subject: [PATCH 073/194] 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.4
+2.13.5

--- a/0074-Make-exit-take-a-return-code.patch
+++ b/0074-Make-exit-take-a-return-code.patch
@ -1,7 +1,7 @@
 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 074/192] Make "exit" take a return code.
+Subject: [PATCH 074/194] 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.4
+2.13.5

--- 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 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 075/192] Mark po/exclude.pot as binary so git won't try to
+Subject: [PATCH 075/194] 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.4
+2.13.5

--- 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 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 076/192] Make efi machines load an env block from a variable
+Subject: [PATCH 076/194] Make efi machines load an env block from a variable

 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@ -80,5 +80,5 @@ index 2c31847bf..f7782b6e1 100644
 			     char **path);
 
 -- 
-2.13.4
+2.13.5

--- 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 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 077/192] DHCP client ID and UUID options added.
+Subject: [PATCH 077/194] DHCP client ID and UUID options added.

 ---
 grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
@ -141,5 +141,5 @@ index 1096b2432..e266bae23 100644
   };
 
 -- 
-2.13.4
+2.13.5

--- a/0078-trim-arp-packets-with-abnormal-size.patch
+++ b/0078-trim-arp-packets-with-abnormal-size.patch
@ -1,7 +1,7 @@
-From adbdeea1eaf60e01f7aa5df34ea1050878476ed3 Mon Sep 17 00:00:00 2001
+From c0fa21c8898437747ce093884e6aba48d45ac329 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 078/192] trim arp packets with abnormal size
+Subject: [PATCH 078/194] 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.
@ -10,7 +10,7 @@ is foobared, GRUB needs to trim the arp response packet before sending it.
 1 file changed, 6 insertions(+)

 diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
-index 54306e3b1..d1c69ed2b 100644
+index 54306e3b1..2083b5a4b 100644
 --- a/grub-core/net/arp.c
 +++ b/grub-core/net/arp.c
@@ -150,6 +150,12 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
@ -19,7 +19,7 @@ index 54306e3b1..d1c69ed2b 100644
       {
 +        if ((nb->tail - nb->data) > 50)
 +          {
-+            grub_dprintf ("net", "arp packet with abnormal size (%ld bytes).\n",
+            grub_dprintf ("net", "arp packet with abnormal size (%d bytes).\n",
 +                         nb->tail - nb->data);
 +            nb->tail = nb->data + 50;
 +          }
@ -27,5 +27,5 @@ index 54306e3b1..d1c69ed2b 100644
 	struct grub_net_buff nb_reply;
 	struct arppkt *arp_reply;
 -- 
-2.13.4
+2.13.5

--- 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 0703a4c9e31d04907a5b8ecfa8f98dbbd583ae17 Mon Sep 17 00:00:00 2001
+From 60262dc77512d017974f38768d7492b4588d54f0 Mon Sep 17 00:00:00 2001
 From: Prarit Bhargava <prarit@redhat.com>
 Date: Wed, 12 Mar 2014 10:58:16 -0400
-Subject: [PATCH 079/192] Fix bad test on GRUB_DISABLE_SUBMENU.
+Subject: [PATCH 079/194] 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.4
+2.13.5

--- 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 7da79a8ccf620ec3ce840b52888652fb4cae6d2f Mon Sep 17 00:00:00 2001
+From 699b7db9cabfe5e2dd48e61fcb079a91df3af4a7 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 080/192] Add support for UEFI operating systems returned by
+Subject: [PATCH 080/194] 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.4
+2.13.5

--- a/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch
+++ b/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch
@ -1,7 +1,7 @@
-From c61d269591b80943a643daa0576817d1472c6e75 Mon Sep 17 00:00:00 2001
+From 91b2efdd5e9c3b0784d0a70282407324f07a30b8 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 081/192] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 081/194] 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.4
+2.13.5

--- a/0082-Add-fw_path-variable-revised.patch
+++ b/0082-Add-fw_path-variable-revised.patch
@ -1,7 +1,7 @@
-From 3fd7e5fa14a3edd982f62685dbc2f3a3901dc932 Mon Sep 17 00:00:00 2001
+From bcb1f1a6a5530ecbc4b674e61acbb406592714c6 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 082/192] Add fw_path variable (revised)
+Subject: [PATCH 082/194] 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.4
+2.13.5

--- a/0083-Add-support-for-linuxefi.patch
+++ b/0083-Add-support-for-linuxefi.patch
@ -1,7 +1,7 @@
-From 6df27b02eb4815f535b5f7e6b4987c67f1506545 Mon Sep 17 00:00:00 2001
+From 28136df7d90f865a8030a0ff6513dacb3096dc10 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Tue, 10 Jul 2012 11:58:52 -0400
-Subject: [PATCH 083/192] Add support for linuxefi
+Subject: [PATCH 083/194] Add support for linuxefi

 ---
 grub-core/Makefile.core.def       |   8 +
@ -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.4
+2.13.5

--- a/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch
+++ b/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch
@ -1,7 +1,7 @@
-From 6a8677e6fc4a5809519e3b31941728e7c74b6098 Mon Sep 17 00:00:00 2001
+From e915644108ed022ad0cc5d2d987f116d2605bcf2 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 16 Jul 2012 18:57:11 -0400
-Subject: [PATCH 084/192] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 084/194] 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.4
+2.13.5

--- 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 e7f79b18704982a8e589433e49e9d5f0408adf66 Mon Sep 17 00:00:00 2001
+From b1eb9a8b9aa961bf6b6f40d6b4d22a5741f29ae4 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 23 Oct 2012 10:40:49 -0400
-Subject: [PATCH 085/192] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 085/194] Don't allow insmod when secure boot is enabled.

 Hi,

@ -120,5 +120,5 @@ index 91e29ce66..bb3ab7dfd 100644
 EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
 					     const grub_efi_device_path_t *dp2);
 -- 
-2.13.4
+2.13.5

--- 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 41b59196e7114f06b498910640193a817b615db7 Mon Sep 17 00:00:00 2001
+From cc8be4cafeb5a0af779afe5d2856da434c165612 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 086/192] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 086/194] Pass "\x[[:hex:]][[:hex:]]" straight through
 unmolested.

 ---
@ -179,5 +179,5 @@ index ab78ca87f..cf6cd6601 100644
       case '$':
 	if (escaped)
 -- 
-2.13.4
+2.13.5

--- a/0087-Add-X-option-to-printf-functions.patch
+++ b/0087-Add-X-option-to-printf-functions.patch
@ -1,7 +1,7 @@
-From bedc2b207a941b590155dd66047ac4d831413a4b Mon Sep 17 00:00:00 2001
+From d3e9800ae2fe7c0ed2d7795eae2be17a66e625ff 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 087/192] Add %X option to printf functions.
+Subject: [PATCH 087/194] Add %X option to printf functions.

 ---
 grub-core/kern/misc.c | 7 +++++--
@ -54,5 +54,5 @@ index 952411d5d..8344526be 100644
 	case 'd':
 	  {
 -- 
-2.13.4
+2.13.5

--- 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 23c496b96dfeab1f524b736c525114539c549d27 Mon Sep 17 00:00:00 2001
+From 30c15e39be47d60f6a4a45628a687911a9f11091 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 088/192] Search for specific config file for netboot
+Subject: [PATCH 088/194] 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.4
+2.13.5

--- 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 90d7c3a044d3be318bec517661aa7e7822166a84 Mon Sep 17 00:00:00 2001
+From 266c7e797971879dc229594556a687a79c92d3b6 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 089/192] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 089/194] blscfg: add blscfg module to parse Boot Loader
 Specification snippets

 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
@ -247,5 +247,5 @@ index 000000000..4274aca5a
 +  grub_unregister_extcmd (cmd);
 +}
 -- 
-2.13.4
+2.13.5

--- 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 60db753f54d4b11ac2caa4536b685cc252cf5df6 Mon Sep 17 00:00:00 2001
+From 6609ba848331d9153c554bb52f2ef0a33531cf55 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 090/192] Don't write messages to the screen
+Subject: [PATCH 090/194] 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.4
+2.13.5

--- a/0091-Don-t-print-GNU-GRUB-header.patch
+++ b/0091-Don-t-print-GNU-GRUB-header.patch
@ -1,7 +1,7 @@
-From 7801f78495d43599e7255cdfaeed717f9fbe542a Mon Sep 17 00:00:00 2001
+From 95aeba5fe67ad11a995eb8e583708a722b8bdeb9 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 091/192] Don't print GNU GRUB header
+Subject: [PATCH 091/194] Don't print GNU GRUB header

 No one cares.
 ---
@ -41,5 +41,5 @@ index b2654ef62..f57b7508a 100644
 
 static void
 -- 
-2.13.4
+2.13.5

--- a/0092-Don-t-add-to-highlighted-row.patch
+++ b/0092-Don-t-add-to-highlighted-row.patch
@ -1,7 +1,7 @@
-From e06f4d9d640db5041f5934ba486de84705fee66b Mon Sep 17 00:00:00 2001
+From aca25c56911ece3e4d82ae9edbde6c705c1eaacc 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 092/192] Don't add '*' to highlighted row
+Subject: [PATCH 092/194] 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.4
+2.13.5

--- a/0093-Message-string-cleanups.patch
+++ b/0093-Message-string-cleanups.patch
@ -1,7 +1,7 @@
-From 3d60e13903f30f8a0d60ca7ad8bb984d28fb5262 Mon Sep 17 00:00:00 2001
+From eef343ff642b42f0e46eb5e8ff5d89fef375f4a2 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 093/192] Message string cleanups
+Subject: [PATCH 093/194] Message string cleanups

 Make use of terminology consistent. Remove jargon.
 ---
@ -67,5 +67,5 @@ index a3d1f23f6..64a83862f 100644
     {
       grub_print_error ();
 -- 
-2.13.4
+2.13.5

--- 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 0346f89bd0d9332f613f84063f2e88eb60b80b5d Mon Sep 17 00:00:00 2001
+From c2e1e09485a5773dc3639d34eadc3a07ebce8fe5 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 094/192] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 094/194] 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.4
+2.13.5

--- 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 c9c76c9c90f9c5464efd17d04e839e9c0ff11b3f Mon Sep 17 00:00:00 2001
+From e29b4dd346fa10dc6a073239ef1ed8fb32a0c838 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 095/192] Use the correct indentation for the term help text
+Subject: [PATCH 095/194] 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.4
+2.13.5

--- a/0096-Indent-menu-entries.patch
+++ b/0096-Indent-menu-entries.patch
@ -1,7 +1,7 @@
-From 544becc2362005b59c561eefd1b68360ca1764ca Mon Sep 17 00:00:00 2001
+From a67be6e17cd318ad3d4a669efb2b8c5f6e76c003 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 096/192] Indent menu entries
+Subject: [PATCH 096/194] 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.4
+2.13.5

--- a/0097-Fix-margins.patch
+++ b/0097-Fix-margins.patch
@ -1,7 +1,7 @@
-From aaecd5d322bc4050e9d143f2e648349b4c6c9e17 Mon Sep 17 00:00:00 2001
+From 8e5a006c6c48002f3debd99f4c377b443f9f8369 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 097/192] Fix margins
+Subject: [PATCH 097/194] 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.4
+2.13.5

--- 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 f7c5e91c99f066efef6183e53d4c7c9a73d19389 Mon Sep 17 00:00:00 2001
+From 01757871cb2a7355a7f67e80f77a57fecba26f54 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 098/192] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 098/194] 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.4
+2.13.5

--- a/0099-Use-linux16-when-appropriate-880840.patch
+++ b/0099-Use-linux16-when-appropriate-880840.patch
@ -1,7 +1,7 @@
-From 6f560f08b9bf0c0041a7ec2980e270fe9e2aca09 Mon Sep 17 00:00:00 2001
+From ac001b7b4cc1819186fbe2bc695cbe58d2077d0f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:05:07 -0400
-Subject: [PATCH 099/192] Use linux16 when appropriate (#880840)
+Subject: [PATCH 099/194] 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.4
+2.13.5

--- a/0100-Enable-pager-by-default.-985860.patch
+++ b/0100-Enable-pager-by-default.-985860.patch
@ -1,7 +1,7 @@
-From a7a59ff4c00792170ddba29a5939c5fecb253c1f Mon Sep 17 00:00:00 2001
+From cc60fb5b7693dabcf100c910d42b3ffe1816597f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 100/192] Enable pager by default. (#985860)
+Subject: [PATCH 100/194] Enable pager by default. (#985860)

 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@ -22,5 +22,5 @@ index 93a90233e..858b526c9 100644
   load_env
 fi
 -- 
-2.13.4
+2.13.5

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