Two more fixes for BLS support

- Use version field to sort BLS entries if id field isn't defined - Add version field to BLS fragments generated by 20-grub.install Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-05-10 17:48:20 +02:00 · 2018-05-10 17:48:20 +02:00 · 67f30b6a74
commit 67f30b6a74
parent 5034b2b164
241 changed files with 561 additions and 475 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/236] Bump version to 2.03
+Subject: [PATCH 001/238] Bump version to 2.03

 ---
 configure.ac                |   2 +-
@ -226,5 +226,5 @@ index 68d8ce7c775..921e57ff48d 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.15.0
+2.17.0

--- 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/236] Remove bashisms from tests.
+Subject: [PATCH 002/238] Remove bashisms from tests.

 Those tests don't actually need bash. Just use common shebang.
 ---
@ -129,5 +129,5 @@ index d5ef7f9ea62..80ebdc59fd5 100644
 # create a randome file
 file="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
 -- 
-2.15.0
+2.17.0

--- 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/236] fs-tester: make sh-compatible
+Subject: [PATCH 003/238] fs-tester: make sh-compatible

 ---
 tests/util/grub-fs-tester.in | 306 ++++++++++++++++++++++++-------------------
@ -742,5 +742,5 @@ index 2337771a1b9..4515d165e6e 100644
 	    if [ x"$fs" = x"zfs" ]; then
 		rmdir "$MNTPOINTRW"/"grub fs"  || true
 -- 
-2.15.0
+2.17.0

--- 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/236] support busybox date.
+Subject: [PATCH 004/238] support busybox date.

 Busybox date doesn't understand weekdays in -d input,
 so strip them beforehand.
@ -39,5 +39,5 @@ index 05b8f6b73fa..ac51d42098e 100644
 # Ignore QEMU bug
 if [ "${grub_modinfo_target_cpu}" = arm ] && [ $((dt2 - dt1)) -ge 15 ] && [ $((dt2 - dt1)) -le 17 ]; then
 -- 
-2.15.0
+2.17.0

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

 ---
 tests/util/grub-fs-tester.in | 48 ++++++++++++++++++++++----------------------
@ -68,5 +68,5 @@ index 4515d165e6e..bf47305f3e8 100644
 
 	    if [ x$NOHARDLINK != xy ]; then
 -- 
-2.15.0
+2.17.0

--- 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/236] Support lseek64.
+Subject: [PATCH 006/238] Support lseek64.

 Android doesn't have 64-bit off_t, so use off64_t instead.
 ---
@ -50,5 +50,5 @@ index 2a8c5882e3d..5450cf4166e 100644
 }
 
 -- 
-2.15.0
+2.17.0

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

 /bin/sh doesn't exist under termux.
 ---
@ -22,5 +22,5 @@ index 04e9395fd94..809a8aa26bf 100644
 CLEANFILES += symlist.c
 BUILT_SOURCES += symlist.c
 -- 
-2.15.0
+2.17.0

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

 /bin/sh might not exist.
 ---
@ -22,5 +22,5 @@ index 3619458e85f..e68e9da843d 100644
 
 srcdir = @srcdir@
 -- 
-2.15.0
+2.17.0

--- 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/236] Add termux path to dict.
+Subject: [PATCH 009/238] Add termux path to dict.

 ---
 tests/util/grub-fs-tester.in | 2 +-
@ -21,5 +21,5 @@ index bf47305f3e8..468d9e7856d 100644
 		    CFILESRC="$cand"
 		    break
 -- 
-2.15.0
+2.17.0

--- 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/236] Fix shebang for termux.
+Subject: [PATCH 010/238] 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 047120e47a0..eee62c10d70 100644
 set -e
 
 -- 
-2.15.0
+2.17.0

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

 ---
 grub-core/Makefile.core.def | 5 +++++
@ -24,5 +24,5 @@ index 2dfa22a9271..8dcd0e5a998 100644
   name = setjmp_test;
   common = tests/setjmp_test.c;
 -- 
-2.15.0
+2.17.0

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

 Reported by: Aaron Miller <aaronmiller@fb.com>
 ---
@ -64,5 +64,5 @@ index d4822a12456..96781fb39b5 100644
       ok = ok && !grub_test_run (test);
       grub_errno = 0;
 -- 
-2.15.0
+2.17.0

--- 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/236] Add Virtual LAN support.
+Subject: [PATCH 013/238] 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 dcceaa56894..ab9d68f9825 100644
 grub_err_t
 grub_net_send_ip_packet (struct grub_net_network_level_interface *inf,
 -- 
-2.15.0
+2.17.0

--- 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/236] mkimage: Pass layout to mkimage_generate_elfXX rather
+Subject: [PATCH 014/238] 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 1a18708a89c..b3a5ca132bc 100644
 struct grub_install_image_target_desc
 {
 -- 
-2.15.0
+2.17.0

--- 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/236] Refactor arm-uboot code to make it genereic.
+Subject: [PATCH 015/238] 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.
@ -401,5 +401,5 @@ index 00000000000..d128775f19e
 +
 +	END
 -- 
-2.15.0
+2.17.0

--- 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/236] coreboot: Split parts that are platform-independent.
+Subject: [PATCH 016/238] 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 809a8aa26bf..781d0ffbf75 100644
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
 -- 
-2.15.0
+2.17.0

--- 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/236] Rename uboot/halt.c to dummy/halt.c.
+Subject: [PATCH 017/238] 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.15.0
+2.17.0

--- 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/236] Rename uboot/datetime to dummy/datetime.
+Subject: [PATCH 018/238] Rename uboot/datetime to dummy/datetime.

 It's just a stub and is not UBoot-specific.
 ---
@ -54,5 +54,5 @@ index 4be716928a5..cf693fc6b62 100644
 +		     "can\'t set datetime on this machine");
 }
 -- 
-2.15.0
+2.17.0

--- 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/236] arm-coreboot: Start new port.
+Subject: [PATCH 019/238] arm-coreboot: Start new port.

 ---
 configure.ac                           |   2 +
@ -823,5 +823,5 @@ index 781d0ffbf75..bec0585549a 100644
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/efi/loader.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
 -- 
-2.15.0
+2.17.0

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

 ---
 grub-core/Makefile.core.def        |   2 +
@ -852,5 +852,5 @@ index bec0585549a..fc6ca305147 100644
 	(for pp in $^; do \
 	  b=`basename $$pp .marker`; \
 -- 
-2.15.0
+2.17.0

--- 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/236] arm-coreboot: Support for vexpress timer.
+Subject: [PATCH 021/238] arm-coreboot: Support for vexpress timer.

 ---
 grub-core/kern/arm/coreboot/timer.c | 36 ++++++++++++++++++++++++++++++++++++
@ -69,5 +69,5 @@ index ebefb99d58f..d97b844f848 100644
     try_generic_timer ();
   if (!have_timer)
 -- 
-2.15.0
+2.17.0

--- 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/236] arm-coreboot: Export FDT routines.
+Subject: [PATCH 022/238] arm-coreboot: Export FDT routines.

 We need to use them from modules as well.
 ---
@ -23,5 +23,5 @@ index fc6ca305147..147e6959c97 100644
 
 if COND_arm_efi
 -- 
-2.15.0
+2.17.0

--- 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/236] at_keyboard: Split protocol from controller code.
+Subject: [PATCH 023/238] at_keyboard: Split protocol from controller code.

 On vexpress controller is different but protocol is the same, so reuse the
 code.
@ -1024,5 +1024,5 @@ index 00000000000..4f2e527e497
 +
 +#endif
 -- 
-2.15.0
+2.17.0

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

 ---
 grub-core/Makefile.core.def        |   3 +
@ -245,5 +245,5 @@ index 147e6959c97..a2aaf9f54b0 100644
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
 -- 
-2.15.0
+2.17.0

--- 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/236] arm_coreboot: Support grub-mkstandalone.
+Subject: [PATCH 025/238] arm_coreboot: Support grub-mkstandalone.

 ---
 util/grub-install-common.c  | 12 ++++++++++--
@ -154,5 +154,5 @@ index 6abd288c313..5910b0c09bc 100644
 
 extern char *grub_install_source_directory;
 -- 
-2.15.0
+2.17.0

--- 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/236] arm_coreboot: Support loading linux images.
+Subject: [PATCH 026/238] arm_coreboot: Support loading linux images.

 ---
 grub-core/loader/arm/linux.c | 132 ++++++++++++++++++++++---------------------
@ -298,5 +298,5 @@ index a66caad13db..f217f8281ad 100644
 
 #define FDT_ADDITIONAL_ENTRIES_SIZE	0x300
 -- 
-2.15.0
+2.17.0

--- 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/236] arm_coreboot: Support DMA.
+Subject: [PATCH 027/238] arm_coreboot: Support DMA.

 This is needed to support USB and some other busses.
 ---
@ -288,5 +288,5 @@ index a2aaf9f54b0..10451384720 100644
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdtbus.h
 endif
 -- 
-2.15.0
+2.17.0

--- 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/236] ehci: Split core  code from PCI part.
+Subject: [PATCH 028/238] 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 5f4297bb21e..c772e76546e 100644
   grub_usb_controller_dev_register (&usb_controller);
   grub_boot_time ("EHCI driver registered");
 -- 
-2.15.0
+2.17.0

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

 ---
 grub-core/Makefile.core.def  |  2 ++
@ -119,5 +119,5 @@ index ed268178b4d..da67965a41a 100644
 # If gfxterm is main output console integrate it into kernel
 GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot", "arm_coreboot" ]
 -- 
-2.15.0
+2.17.0

--- 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/236] Fix bug on FDT nodes with compatible property
+Subject: [PATCH 030/238] Fix bug on FDT nodes with compatible property

 ---
 grub-core/bus/fdt.c | 2 ++
@ -21,5 +21,5 @@ index 6fb077000a5..34d53545732 100644
   while (compatible < compatible_end)
     {
 -- 
-2.15.0
+2.17.0

--- 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/236] fdtbus: Add ability to send/receive messages on
+Subject: [PATCH 031/238] fdtbus: Add ability to send/receive messages on
 parent busses.

 ---
@ -130,5 +130,5 @@ index 985837e55f6..f519c40ec35 100644
 /* dtb is assumed to be unfreeable and must remain
    valid for lifetime of GRUB.
 -- 
-2.15.0
+2.17.0

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

 ---
 grub-core/Makefile.core.def        |   1 +
@ -161,5 +161,5 @@ index 09cd7fe328c..26950534270 100644
 #endif /* ! ASM_FILE */
 
 -- 
-2.15.0
+2.17.0

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

 ---
 grub-core/term/arm/cros.c    | 125 +++++++++++++++++++++++
@ -415,5 +415,5 @@ index 00000000000..45a372572a5
 +
 +#endif
 -- 
-2.15.0
+2.17.0

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

 ---
 grub-core/Makefile.core.def        | 2 ++
@ -34,5 +34,5 @@ index 0126ff6381a..8d8c5b8291e 100644
 }
 
 -- 
-2.15.0
+2.17.0

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

 ---
@ -94,5 +94,5 @@ index 129248c7f47..cea9b84315b 100644
 }
 
 -- 
-2.15.0
+2.17.0

--- 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/236] at_keyboard: Fix falco chromebook case.
+Subject: [PATCH 036/238] 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 b031523eb7d..bcb4d9ba78f 100644
 #define KEYBOARD_ISMAKE(x)	!((x) & 0x80)
 #define KEYBOARD_ISREADY(x)	((x) & 0x01)
 -- 
-2.15.0
+2.17.0

--- 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/236] sparc64: Close cdboot ihandle
+Subject: [PATCH 037/238] 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 586efb4014e..9ea9b4e0662 100644
 	 mov	512, %o3
 #endif
 -- 
-2.15.0
+2.17.0

--- 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/236] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64
+Subject: [PATCH 038/238] 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 a914eb8e2df..8ae43d7e894 100644
     return grub_error (GRUB_ERR_IO, "failed to update FDT");
 
 -- 
-2.15.0
+2.17.0

--- 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/236] arm64: Add "--nounzip" option support in xen_module
+Subject: [PATCH 039/238] arm64: Add "--nounzip" option support in xen_module
 command

 This patch adds "--nounzip" option support in order to
@ -52,5 +52,5 @@ index 8ae43d7e894..27ede46cac5 100644
   if (!file)
     goto fail;
 -- 
-2.15.0
+2.17.0

--- 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/236] util/grub.d/20_linux_xen.in: Add xen_boot command
+Subject: [PATCH 040/238] 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 c48af948d6e..c002fc9f946 100644
 	linux=`version_find_latest $list`
 	gettext_printf "Found linux image: %s\n" "$linux" >&2
 -- 
-2.15.0
+2.17.0

--- 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/236] arm64: Update the introduction of Xen boot commands
+Subject: [PATCH 041/238] arm64: Update the introduction of Xen boot commands
 in docs/grub.texi

 delete: xen_linux, xen_initrd, xen_xsm
@ -89,5 +89,5 @@ index e935af33ea5..a0c4b9e4e8e 100644
 @section The list of networking commands
 
 -- 
-2.15.0
+2.17.0

--- 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/236] sparc64: Don't use devspec to determine the OBP path
+Subject: [PATCH 042/238] 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 a79682a5e31..dce4e59d081 100644
       if (fd < 0 || fstat (fd, &st) < 0)
 	{
 -- 
-2.15.0
+2.17.0

--- 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/236] Allow GRUB to mount ext2/3/4 filesystems that have
+Subject: [PATCH 043/238] 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 88cbe7365e9..fd7e0f14b68 100644
 		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.$fs" -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;;
 		xxfs)
 -- 
-2.15.0
+2.17.0

--- 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/236] ehci: Fix compilation for amd64
+Subject: [PATCH 044/238] ehci: Fix compilation for amd64

 ---
 grub-core/bus/usb/ehci.c | 8 ++++----
@ -34,5 +34,5 @@ index c772e76546e..7b7061f5335 100644
 		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
 -- 
-2.15.0
+2.17.0

--- 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/236] cache: Fix compilation for ppc, sparc and arm64
+Subject: [PATCH 045/238] cache: Fix compilation for ppc, sparc and arm64

 ---
 include/grub/cache.h | 4 +++-
@ -23,5 +23,5 @@ index 1c98ce270b6..ccfa717e669 100644
 grub_arch_sync_dma_caches (volatile void *address __attribute__ ((unused)),
 			   grub_size_t len __attribute__ ((unused)))
 -- 
-2.15.0
+2.17.0

--- 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/236] ehci: Fix compilation on i386
+Subject: [PATCH 046/238] ehci: Fix compilation on i386

 ---
 grub-core/bus/usb/ehci.c | 4 ++--
@ -30,5 +30,5 @@ index 7b7061f5335..d966fc21002 100644
 		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
 -- 
-2.15.0
+2.17.0

--- 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/236] crypto: Fix use after free.
+Subject: [PATCH 047/238] crypto: Fix use after free.

 Reported by: AppChecker
 Transformed to patch by: Satish Govindarajan
@ -24,5 +24,5 @@ index 2bfd67c8ef3..e6d345f3345 100644
 	}
       cur->next = crypto_specs;
 -- 
-2.15.0
+2.17.0

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

 ---
 grub-core/loader/arm/linux.c | 8 ++++----
@ -37,5 +37,5 @@ index 260cbf06861..e64c79a9577 100644
 }
 
 -- 
-2.15.0
+2.17.0

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

 ---
 grub-core/lib/fdt.c | 3 ++-
@ -22,5 +22,5 @@ index bdc6302448d..2705f2629b9 100644
           return 0;
 	return token;
 -- 
-2.15.0
+2.17.0

--- 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/236] Fix a segfault in lsefi
+Subject: [PATCH 050/238] 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 d901c389263..d1ce99af438 100644
 	{
 	  for (k = 0; k < ARRAY_SIZE (known_protocols); k++)
 -- 
-2.15.0
+2.17.0

--- 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/236] zfs: remove size_t typedef and use grub_size_t
+Subject: [PATCH 051/238] 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 2f73449f0d4..5453822d025 100644
 			const int dec2 = 0;
 #endif
 -- 
-2.15.0
+2.17.0

--- 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/236] udf: Fix reading label, lvd.ident is dstring
+Subject: [PATCH 052/238] 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 839bff88963..2587456336e 100644
     }
   else
 -- 
-2.15.0
+2.17.0

--- 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/236] * grub-core/fs/udf.c: Add support for UUID
+Subject: [PATCH 053/238] * 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 2587456336e..00a16098b47 100644
   .reserved_first_sector = 1,
   .blocklist_install = 1,
 -- 
-2.15.0
+2.17.0

--- 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/236] mkrescue: Check xorriso presence before doing
+Subject: [PATCH 054/238] 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 238d4840e2f..38f1543974e 100644
   grub_hostfs_init ();
   grub_host_init ();
 -- 
-2.15.0
+2.17.0

--- 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/236] Fail if xorriso failed.
+Subject: [PATCH 055/238] Fail if xorriso failed.

 If xorriso failed most likely we didn't generate a meaningful image.
 ---
@ -40,5 +40,5 @@ index 38f1543974e..9545945d8f3 100644
   grub_util_unlink_recursive (iso9660_dir);
 
 -- 
-2.15.0
+2.17.0

--- 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/236] efi: refactor grub_efi_allocate_pages
+Subject: [PATCH 056/238] 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 e9c601f3410..b4cbebf3828 100644
 				      grub_efi_uintn_t pages);
 void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
 -- 
-2.15.0
+2.17.0

--- 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/236] Remove grub_efi_allocate_pages.
+Subject: [PATCH 057/238] Remove grub_efi_allocate_pages.

 grub_efi_allocate_pages Essentially does 2 unrelated things:
 * Allocate at fixed address.
@ -248,5 +248,5 @@ index b4cbebf3828..3fa082816ca 100644
 				       grub_efi_uintn_t pages);
 int
 -- 
-2.15.0
+2.17.0

--- 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/236] efi: move fdt helper library
+Subject: [PATCH 058/238] 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.15.0
+2.17.0

--- 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/236] efi: Add GRUB_PE32_MAGIC definition
+Subject: [PATCH 059/238] 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 f79c36c026e..7d44732d2c3 100644
    But some examples (such as EFI drivers in the Intel
    Sample Implementation) use 32 bytes (0x20) instead, and it seems
 -- 
-2.15.0
+2.17.0

--- 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/236] arm64 linux loader: improve type portability
+Subject: [PATCH 060/238] 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 091e9ddf43d..17212c38d0b 100644
   fdt = NULL;
 }
 -- 
-2.15.0
+2.17.0

--- 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/236] efi: change heap allocation type to
+Subject: [PATCH 061/238] 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 b97b05fe825..ac2a4c556b8 100644
 	grub_fatal ("cannot allocate conventional memory %p with %u pages",
 		    (void *) ((grub_addr_t) start),
 -- 
-2.15.0
+2.17.0

--- 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/236] core: use GRUB_TERM_ definitions when handling term
+Subject: [PATCH 062/238] 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 5ffb38f69aa..8117e2a24da 100644
 #define GRUB_TERM_BACKSPACE	'\b'
 
 -- 
-2.15.0
+2.17.0

--- 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/236] io: add a GRUB_GZ prefix to gzio specific defines
+Subject: [PATCH 063/238] 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 0f2ea6bd845..a8e33033bf8 100644
       /* TRANSLATORS: It's about given file having some strange format, not
 	 complete lack of gzip support.  */
 -- 
-2.15.0
+2.17.0

--- a/0064-re-write-.gitignore.patch
+++ b/0064-re-write-.gitignore.patch
@ -1,7 +1,7 @@
 From 38bfcd3054c28aa40234840c12d900f1d18a217d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 8 Aug 2017 12:48:04 -0400
-Subject: [PATCH 064/236] re-write .gitignore
+Subject: [PATCH 064/238] re-write .gitignore

 ---
 .gitignore                        | 352 ++++++++++++--------------------------
@ -496,5 +496,5 @@ index 00000000000..b7e1eb12428
@@ -0,0 +1 @@
 +grub
 -- 
-2.15.0
+2.17.0

--- a/0065-IBM-client-architecture-CAS-reboot-support.patch
+++ b/0065-IBM-client-architecture-CAS-reboot-support.patch
@ -1,7 +1,7 @@
 From bf1fd830091fff49e26f39027e0db8fd4b688624 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 065/236] IBM client architecture (CAS) reboot support
+Subject: [PATCH 065/238] IBM client architecture (CAS) reboot support

 This is an implementation of IBM client architecture (CAS) reboot for GRUB.

@ -170,5 +170,5 @@ index 8e425130327..9f26c69a2df 100644
 #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));)
 
 -- 
-2.15.0
+2.17.0

--- a/0066-for-ppc-reset-console-display-attr-when-clear-screen.patch
+++ b/0066-for-ppc-reset-console-display-attr-when-clear-screen.patch
@ -1,7 +1,7 @@
 From 8b30fab3c07a9fc8549e404c411b747b960c57b2 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 066/236] for ppc, reset console display attr when clear screen
+Subject: [PATCH 066/238] 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 d317efa368d..29df35e6d20 100644
       data->reverse_video_off = grub_strdup ("\e[m");
       if (grub_strcmp ("ieee1275", str) == 0)
 -- 
-2.15.0
+2.17.0

--- a/0067-Disable-GRUB-video-support-for-IBM-power-machines.patch
+++ b/0067-Disable-GRUB-video-support-for-IBM-power-machines.patch
@ -1,7 +1,7 @@
 From 45322cbc9402639a431fc0f33bd76e387e6f02bf 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 067/236] Disable GRUB video support for IBM power machines
+Subject: [PATCH 067/238] 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 9f26c69a2df..ab4f284c341 100644
 
 extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
 -- 
-2.15.0
+2.17.0

--- a/0068-Honor-a-symlink-when-generating-configuration-by-gru.patch
+++ b/0068-Honor-a-symlink-when-generating-configuration-by-gru.patch
@ -1,7 +1,7 @@
 From c29e260c9f41f4f802fa852b6c46fb2e5d912cb6 Mon Sep 17 00:00:00 2001
 From: Marcel Kolaja <mkolaja@redhat.com>
 Date: Tue, 21 Jan 2014 10:57:08 -0500
-Subject: [PATCH 068/236] Honor a symlink when generating configuration by
+Subject: [PATCH 068/238] 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 f8496d28bdf..3b070fd7632 100644
 fi
 
 -- 
-2.15.0
+2.17.0

--- a/0069-Move-bash-completion-script-922997.patch
+++ b/0069-Move-bash-completion-script-922997.patch
@ -1,7 +1,7 @@
 From 8eaf2f497a6bcffc5554509533940ac2b764b981 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 069/236] Move bash completion script (#922997)
+Subject: [PATCH 069/238] Move bash completion script (#922997)

 Apparently these go in a new place now.
 ---
@ -51,5 +51,5 @@ index 136287cf1bf..61108f05429 100644
 
 $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
 -- 
-2.15.0
+2.17.0

--- a/0070-Update-to-minilzo-2.08.patch
+++ b/0070-Update-to-minilzo-2.08.patch
@ -1,7 +1,7 @@
 From 9a1e99c5628bafa9e3970a5317b721da704bec6a Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Dec 2014 15:36:09 -0500
-Subject: [PATCH 070/236] Update to minilzo-2.08
+Subject: [PATCH 070/238] Update to minilzo-2.08

 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow

@ -8508,5 +8508,5 @@ index 74fefa9fe20..79374546748 100644
 
 
 -- 
-2.15.0
+2.17.0

--- a/0071-Allow-fallback-to-include-entries-by-title-not-just-.patch
+++ b/0071-Allow-fallback-to-include-entries-by-title-not-just-.patch
@ -1,7 +1,7 @@
 From 27845fb323de35e9dcaad8c738eb1a2a2bc316f8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 5 Sep 2014 10:07:04 -0400
-Subject: [PATCH 071/236] Allow "fallback" to include entries by title, not
+Subject: [PATCH 071/238] Allow "fallback" to include entries by title, not
 just number.

 Resolves: rhbz#1026084
@ -140,5 +140,5 @@ index e7a83c2d6e2..d2f64b05e0a 100644
 static int
 get_entry_number (grub_menu_t menu, const char *name)
 -- 
-2.15.0
+2.17.0

--- a/0072-Add-GRUB_DISABLE_UUID.patch
+++ b/0072-Add-GRUB_DISABLE_UUID.patch
@ -1,7 +1,7 @@
 From 7f7429e93fa791ac2c002beaafab9b9d9bd86b89 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 16:49:25 -0400
-Subject: [PATCH 072/236] Add GRUB_DISABLE_UUID.
+Subject: [PATCH 072/238] 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 60b31caddeb..cf35e417470 100644
   else
     echo $device |sed 's, ,_,g'
 -- 
-2.15.0
+2.17.0

--- a/0073-Make-exit-take-a-return-code.patch
+++ b/0073-Make-exit-take-a-return-code.patch
@ -1,7 +1,7 @@
 From 384ccb1b44fc23514a59529f58f984dcc4a75cc9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 26 Feb 2014 21:49:12 -0500
-Subject: [PATCH 073/236] Make "exit" take a return code.
+Subject: [PATCH 073/238] 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 2a9f87cc255..06208143779 100644
 					  grub_uint64_t d,
 					  grub_uint64_t *r);
 -- 
-2.15.0
+2.17.0

--- a/0074-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
+++ b/0074-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
@ -1,7 +1,7 @@
 From 939f3dfcfacde13bd7ebfe411c0dceee9e5ed0ae Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 22 Jul 2015 11:21:01 -0400
-Subject: [PATCH 074/236] Mark po/exclude.pot as binary so git won't try to
+Subject: [PATCH 074/238] 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 00000000000..33ffaa40460
@@ -0,0 +1 @@
 +po/exclude.pot binary
 -- 
-2.15.0
+2.17.0

--- a/0075-Make-efi-machines-load-an-env-block-from-a-variable.patch
+++ b/0075-Make-efi-machines-load-an-env-block-from-a-variable.patch
@ -1,7 +1,7 @@
 From 805220eb48a8cabcc83628d90aa40f3204b21a71 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 7 Dec 2015 14:20:49 -0500
-Subject: [PATCH 075/236] Make efi machines load an env block from a variable
+Subject: [PATCH 075/238] Make efi machines load an env block from a variable

 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@ -80,5 +80,5 @@ index 2c31847bf6d..f7782b6e114 100644
 			     char **path);
 
 -- 
-2.15.0
+2.17.0

--- a/0076-DHCP-client-ID-and-UUID-options-added.patch
+++ b/0076-DHCP-client-ID-and-UUID-options-added.patch
@ -1,7 +1,7 @@
 From cefc164d655fb7709efbc37a317952ff3ec4aeb3 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 076/236] DHCP client ID and UUID options added.
+Subject: [PATCH 076/238] DHCP client ID and UUID options added.

 ---
 grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
@ -141,5 +141,5 @@ index 1096b24322e..e266bae23f4 100644
   };
 
 -- 
-2.15.0
+2.17.0

--- a/0077-trim-arp-packets-with-abnormal-size.patch
+++ b/0077-trim-arp-packets-with-abnormal-size.patch
@ -1,7 +1,7 @@
 From 571a6cce3b0d4c8abf11efc320e2de6ff9188d60 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 077/236] trim arp packets with abnormal size
+Subject: [PATCH 077/238] 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 54306e3b16d..d1c69ed2b55 100644
 	struct grub_net_buff nb_reply;
 	struct arppkt *arp_reply;
 -- 
-2.15.0
+2.17.0

--- a/0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
+++ b/0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
@ -1,7 +1,7 @@
 From 6cd959a64f588e256f0ba17e31bf2720b9cdec88 Mon Sep 17 00:00:00 2001
 From: Prarit Bhargava <prarit@redhat.com>
 Date: Wed, 12 Mar 2014 10:58:16 -0400
-Subject: [PATCH 078/236] Fix bad test on GRUB_DISABLE_SUBMENU.
+Subject: [PATCH 078/238] Fix bad test on GRUB_DISABLE_SUBMENU.

 The file /etc/grub.d/10_linux does

@ -37,5 +37,5 @@ index de9044c7f28..cf6331f2a51 100644
     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
 
 -- 
-2.15.0
+2.17.0

--- a/0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+++ b/0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch
@ -1,7 +1,7 @@
 From 0254265409f80b369c35fb474c7371feb6f9ae1d 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 079/236] Add support for UEFI operating systems returned by
+Subject: [PATCH 079/238] Add support for UEFI operating systems returned by
 os-prober

 os-prober returns UEFI operating systems in the form:
@ -46,5 +46,5 @@ index 515a68c7aa0..9b8f5968e2d 100644
   esac
 done
 -- 
-2.15.0
+2.17.0

--- a/0080-Migrate-PPC-from-Yaboot-to-Grub2.patch
+++ b/0080-Migrate-PPC-from-Yaboot-to-Grub2.patch
@ -1,7 +1,7 @@
 From f2b4c105e3657cc32ed0f7aefa713f161cdf64f1 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 080/236] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 080/238] 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 00000000000..10d66586820
 +  terminfo -g ${X}x${Y} ${TERMINAL}
 +EOF
 -- 
-2.15.0
+2.17.0

--- a/0081-Add-fw_path-variable-revised.patch
+++ b/0081-Add-fw_path-variable-revised.patch
@ -1,7 +1,7 @@
 From 7f021a05a5ed7c97432abbc1762f40e36a4915e3 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 081/236] Add fw_path variable (revised)
+Subject: [PATCH 081/238] 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 249e19bc788..759c475c4d9 100644
       prefix = grub_env_get ("prefix");
       if (prefix)
 -- 
-2.15.0
+2.17.0

--- a/0082-Add-support-for-linuxefi.patch
+++ b/0082-Add-support-for-linuxefi.patch
@ -1,7 +1,7 @@
 From 778385965798ac2711f0d07d5cf521a6e999ca8b Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Tue, 10 Jul 2012 11:58:52 -0400
-Subject: [PATCH 082/236] Add support for linuxefi
+Subject: [PATCH 082/238] Add support for linuxefi

 ---
 grub-core/Makefile.core.def       |   8 +
@ -478,5 +478,5 @@ index da0ca3b83cd..fc36bdaf367 100644
 
 /* Boot parameters for Linux based on 2.6.12. This is used by the setup
 -- 
-2.15.0
+2.17.0

--- a/0083-Use-linuxefi-and-initrdefi-where-appropriate.patch
+++ b/0083-Use-linuxefi-and-initrdefi-where-appropriate.patch
@ -1,7 +1,7 @@
 From 793d4270384ef3373bc0b3c956cab8a8cdb75bcf Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 16 Jul 2012 18:57:11 -0400
-Subject: [PATCH 083/236] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 083/238] Use "linuxefi" and "initrdefi" where appropriate.

 ---
 util/grub.d/10_linux.in | 18 ++++++++++++++++--
@ -46,5 +46,5 @@ index cf6331f2a51..8ccf012f747 100644
   sed "s/^/$submenu_indentation/" << EOF
 }
 -- 
-2.15.0
+2.17.0

--- a/0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
+++ b/0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
@ -1,7 +1,7 @@
 From eb8fd62e887e624f5c6e7c2ee8512981e8b5be97 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 23 Oct 2012 10:40:49 -0400
-Subject: [PATCH 084/236] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 084/238] Don't allow insmod when secure boot is enabled.

 Hi,

@ -120,5 +120,5 @@ index 91e29ce66f1..bb3ab7dfdeb 100644
 EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
 					     const grub_efi_device_path_t *dp2);
 -- 
-2.15.0
+2.17.0

--- a/0085-Pass-x-hex-hex-straight-through-unmolested.patch
+++ b/0085-Pass-x-hex-hex-straight-through-unmolested.patch
@ -1,7 +1,7 @@
 From 0d54ed89090fc1bdcb75de474024b2b81dbf644f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 085/236] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 085/238] Pass "\x[[:hex:]][[:hex:]]" straight through
 unmolested.

 ---
@ -179,5 +179,5 @@ index ab78ca87f90..cf6cd6601d6 100644
       case '$':
 	if (escaped)
 -- 
-2.15.0
+2.17.0

--- a/0086-Add-X-option-to-printf-functions.patch
+++ b/0086-Add-X-option-to-printf-functions.patch
@ -1,7 +1,7 @@
 From 6237b1688124d6a72250b296e758ef2d59fde26f 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 086/236] Add %X option to printf functions.
+Subject: [PATCH 086/238] Add %X option to printf functions.

 ---
 grub-core/kern/misc.c | 7 +++++--
@ -54,5 +54,5 @@ index 952411d5dc6..8344526be7f 100644
 	case 'd':
 	  {
 -- 
-2.15.0
+2.17.0

--- a/0087-Search-for-specific-config-file-for-netboot.patch
+++ b/0087-Search-for-specific-config-file-for-netboot.patch
@ -1,7 +1,7 @@
 From 9491cbfdab951e38f096bd9705a76b382f54c9be 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 087/236] Search for specific config file for netboot
+Subject: [PATCH 087/238] 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 e266bae23f4..50d62ab0c8c 100644
 +
 #endif /* ! GRUB_NET_HEADER */
 -- 
-2.15.0
+2.17.0

--- a/0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+++ b/0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
@ -1,7 +1,7 @@
 From 5fcdebdc36cc84c772754b7f5bdb87aed2b42853 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 088/236] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 088/238] blscfg: add blscfg module to parse Boot Loader
 Specification snippets

 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
@ -247,5 +247,5 @@ index 00000000000..4274aca5a9d
 +  grub_unregister_extcmd (cmd);
 +}
 -- 
-2.15.0
+2.17.0

--- a/0089-Don-t-write-messages-to-the-screen.patch
+++ b/0089-Don-t-write-messages-to-the-screen.patch
@ -1,7 +1,7 @@
 From fc390be631e93744c6a3a2f42849c9edf2614a36 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 089/236] Don't write messages to the screen
+Subject: [PATCH 089/238] 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 8ccf012f747..a3d9711d607 100644
 EOF
     fi
 -- 
-2.15.0
+2.17.0

--- a/0090-Don-t-print-GNU-GRUB-header.patch
+++ b/0090-Don-t-print-GNU-GRUB-header.patch
@ -1,7 +1,7 @@
 From 806c26ae73bc86e305c39c955d86480fad8985df 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 090/236] Don't print GNU GRUB header
+Subject: [PATCH 090/238] Don't print GNU GRUB header

 No one cares.
 ---
@ -41,5 +41,5 @@ index b2654ef62e8..f57b7508a76 100644
 
 static void
 -- 
-2.15.0
+2.17.0

--- a/0091-Don-t-add-to-highlighted-row.patch
+++ b/0091-Don-t-add-to-highlighted-row.patch
@ -1,7 +1,7 @@
 From 5ae2484f263365351a2891be6c056eeb96b3924b 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 091/236] Don't add '*' to highlighted row
+Subject: [PATCH 091/238] Don't add '*' to highlighted row

 It is already highlighted.
 ---
@ -22,5 +22,5 @@ index e22bb91f6e8..a3d1f23f68f 100644
   grub_print_ucs4_menu (unicode_title,
 			unicode_title + len,
 -- 
-2.15.0
+2.17.0

--- a/0092-Message-string-cleanups.patch
+++ b/0092-Message-string-cleanups.patch
@ -1,7 +1,7 @@
 From 622b238ecb927d331dc38083584a7323013b5f21 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 092/236] Message string cleanups
+Subject: [PATCH 092/238] Message string cleanups

 Make use of terminology consistent. Remove jargon.
 ---
@ -67,5 +67,5 @@ index a3d1f23f68f..64a83862f66 100644
     {
       grub_print_error ();
 -- 
-2.15.0
+2.17.0

--- a/0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+++ b/0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
@ -1,7 +1,7 @@
 From c7dac08ab344638afabf579e03bedfac729e1944 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 093/236] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 093/238] Fix border spacing now that we aren't displaying it

 ---
 grub-core/normal/menu_text.c | 6 +++---
@ -28,5 +28,5 @@ index 64a83862f66..1062d64ee29 100644
   geo->timeout_lines = 2;
 
 -- 
-2.15.0
+2.17.0

--- a/0094-Use-the-correct-indentation-for-the-term-help-text.patch
+++ b/0094-Use-the-correct-indentation-for-the-term-help-text.patch
@ -1,7 +1,7 @@
 From 8a59d6c44d946eac70ecbb7a9418c5d6801add8b 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 094/236] Use the correct indentation for the term help text
+Subject: [PATCH 094/238] Use the correct indentation for the term help text

 That is consistent with the menu help text
 ---
@ -24,5 +24,5 @@ index f57b7508a76..0ce59fdc3f0 100644
       grub_print_message_indented (msg_formatted, 0, 0, term);
     grub_putcode ('\n', term);
 -- 
-2.15.0
+2.17.0

--- a/0095-Indent-menu-entries.patch
+++ b/0095-Indent-menu-entries.patch
@ -1,7 +1,7 @@
 From 018439ecfda2bc5049ccbfb0d6ab7fa047411a3b 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 095/236] Indent menu entries
+Subject: [PATCH 095/238] Indent menu entries

 ---
 grub-core/normal/menu_text.c | 3 ++-
@ -22,5 +22,5 @@ index 1062d64ee29..ecc60f99fc3 100644
   grub_print_ucs4_menu (unicode_title,
 			unicode_title + len,
 -- 
-2.15.0
+2.17.0

--- a/0096-Fix-margins.patch
+++ b/0096-Fix-margins.patch
@ -1,7 +1,7 @@
 From 33481aa0e7897465ffd386101d6f3eda6e3bbac0 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 096/236] Fix margins
+Subject: [PATCH 096/238] Fix margins

 ---
 grub-core/normal/menu_text.c | 8 +++-----
@ -33,5 +33,5 @@ index ecc60f99fc3..0e43f2c10cc 100644
     - geo->timeout_lines /* timeout */
     - 1 /* empty final line  */;
 -- 
-2.15.0
+2.17.0

--- a/0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+++ b/0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
@ -1,7 +1,7 @@
 From ea032bd4a6cb66929da61477b1759e136c975189 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 097/236] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 097/238] 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 0e43f2c10cc..537d4bf86ff 100644
   geo->first_entry_y = 3; /* three empty lines*/
 
 -- 
-2.15.0
+2.17.0

--- a/0098-Use-linux16-when-appropriate-880840.patch
+++ b/0098-Use-linux16-when-appropriate-880840.patch
@ -1,7 +1,7 @@
 From 8e1957d59e7e72850cbac7e779ddf22ca23c250d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:05:07 -0400
-Subject: [PATCH 098/236] Use linux16 when appropriate (#880840)
+Subject: [PATCH 098/238] 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 a3d9711d607..f3bf6acd856 100644
     fi
   fi
 -- 
-2.15.0
+2.17.0

--- a/0099-Enable-pager-by-default.-985860.patch
+++ b/0099-Enable-pager-by-default.-985860.patch
@ -1,7 +1,7 @@
 From 7466f51a0012ebdd8be07cfc0e63d50e0e79560d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 099/236] Enable pager by default. (#985860)
+Subject: [PATCH 099/238] Enable pager by default. (#985860)

 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@ -22,5 +22,5 @@ index 93a90233ead..858b526c925 100644
   load_env
 fi
 -- 
-2.15.0
+2.17.0

--- a/0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+++ b/0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
@ -1,7 +1,7 @@
 From 7a97d9621a145cbd04111970fea04c34433f900c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH 100/236] F10 doesn't work on serial, so don't tell the user to
+Subject: [PATCH 100/238] F10 doesn't work on serial, so don't tell the user to
 hit it (#987443)

 Signed-off-by: Peter Jones <pjones@redhat.com>
@ -23,5 +23,5 @@ index 537d4bf86ff..452d55bf9ff 100644
 					       STANDARD_MARGIN, STANDARD_MARGIN,
 					       term, dry_run);
 -- 
-2.15.0
+2.17.0

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