Work around some issues with older automake found in CentOS.

Signed-off-by: Peter Jones <pjones@redhat.com>

0064-info-in-builddir.patch

@@ -1,22 +0,0 @@
-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/229] info-in-builddir
-
----
- docs/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 93eb3962765..e396ba10f46 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -1,4 +1,4 @@
--AUTOMAKE_OPTIONS = subdir-objects
-+AUTOMAKE_OPTIONS = subdir-objects info-in-builddir
- 
- # AM_MAKEINFOFLAGS = --no-split --no-validate
- info_TEXINFOS = grub.texi grub-dev.texi
--- 
-2.15.0
-

0064-re-write-.gitignore.patch

@@ -1,7 +1,7 @@
-From ff9da35fd789354cc1490b75893e765771808352 Mon Sep 17 00:00:00 2001
+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 065/229] re-write .gitignore
+Subject: [PATCH 064/229] re-write .gitignore
 
 ---
  .gitignore                        | 352 ++++++++++++--------------------------

0065-IBM-client-architecture-CAS-reboot-support.patch

@@ -1,7 +1,7 @@
-From 34423216f8f3d7ce6086e2f1ee9869407e6a2221 Mon Sep 17 00:00:00 2001
+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 066/229] IBM client architecture (CAS) reboot support
+Subject: [PATCH 065/229] IBM client architecture (CAS) reboot support
 
 This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 

0066-for-ppc-reset-console-display-attr-when-clear-screen.patch

@@ -1,7 +1,7 @@
-From 070dc282d3cc6602571296e90945df9d4671aecb Mon Sep 17 00:00:00 2001
+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 067/229] for ppc, reset console display attr when clear screen
+Subject: [PATCH 066/229] for ppc, reset console display attr when clear screen
 
 v2: Also use \x0c instead of a literal ^L to make future patches less
 awkward.

0067-Disable-GRUB-video-support-for-IBM-power-machines.patch

@@ -1,7 +1,7 @@
-From 4e31478fdf4cda470305c1bb2acb9b820e790757 Mon Sep 17 00:00:00 2001
+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 068/229] Disable GRUB video support for IBM power machines
+Subject: [PATCH 067/229] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205

0068-Honor-a-symlink-when-generating-configuration-by-gru.patch

@@ -1,7 +1,7 @@
-From 35535549324923af7fecf79cc739baba48246f21 Mon Sep 17 00:00:00 2001
+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 069/229] Honor a symlink when generating configuration by
+Subject: [PATCH 068/229] Honor a symlink when generating configuration by
  grub2-mkconfig
 
 Honor a symlink when generating configuration by grub2-mkconfig, so that

0069-Move-bash-completion-script-922997.patch

@@ -1,7 +1,7 @@
-From 999bbc2002275efce284aed6e1e31b3ca351fa19 Mon Sep 17 00:00:00 2001
+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 070/229] Move bash completion script (#922997)
+Subject: [PATCH 069/229] Move bash completion script (#922997)
 
 Apparently these go in a new place now.
 ---

0070-Update-to-minilzo-2.08.patch

@@ -1,7 +1,7 @@
-From c0977f7fd42e16cc568af7ae667a2aeda85eb583 Mon Sep 17 00:00:00 2001
+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 071/229] Update to minilzo-2.08
+Subject: [PATCH 070/229] Update to minilzo-2.08
 
 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow
 

0071-Allow-fallback-to-include-entries-by-title-not-just-.patch

@@ -1,7 +1,7 @@
-From 15e9ccc8abd5621107788bea6ae6f2bdb27a3ed3 Mon Sep 17 00:00:00 2001
+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 072/229] Allow "fallback" to include entries by title, not
+Subject: [PATCH 071/229] Allow "fallback" to include entries by title, not
  just number.
 
 Resolves: rhbz#1026084

0072-Add-GRUB_DISABLE_UUID.patch

@@ -1,7 +1,7 @@
-From 87602724b509a60628623baabf5a2c7741a68884 Mon Sep 17 00:00:00 2001
+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 073/229] Add GRUB_DISABLE_UUID.
+Subject: [PATCH 072/229] 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

0073-Make-exit-take-a-return-code.patch

@@ -1,7 +1,7 @@
-From 68d514b51b81911d8359d7825618112dae4a44d9 Mon Sep 17 00:00:00 2001
+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 074/229] Make "exit" take a return code.
+Subject: [PATCH 073/229] 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

0074-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 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 075/229] Mark po/exclude.pot as binary so git won't try to
+Subject: [PATCH 074/229] Mark po/exclude.pot as binary so git won't try to
  diff nonprintables.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0075-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 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 076/229] Make efi machines load an env block from a variable
+Subject: [PATCH 075/229] Make efi machines load an env block from a variable
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0076-DHCP-client-ID-and-UUID-options-added.patch

@@ -1,7 +1,7 @@
-From 8a0b654a520e407da69e0cf64f3dd6bb7cf86240 Mon Sep 17 00:00:00 2001
+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 077/229] DHCP client ID and UUID options added.
+Subject: [PATCH 076/229] DHCP client ID and UUID options added.
 
 ---
  grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----

0077-trim-arp-packets-with-abnormal-size.patch

@@ -1,7 +1,7 @@
-From cffad45026af9a05a0509daf593fa87148a3de66 Mon Sep 17 00:00:00 2001
+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 078/229] trim arp packets with abnormal size
+Subject: [PATCH 077/229] 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.

0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch

@@ -1,7 +1,7 @@
-From 97b0254d8f3de9a51aa3df570d862bbb8dbd044b Mon Sep 17 00:00:00 2001
+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 079/229] Fix bad test on GRUB_DISABLE_SUBMENU.
+Subject: [PATCH 078/229] Fix bad test on GRUB_DISABLE_SUBMENU.
 
 The file /etc/grub.d/10_linux does
 

0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch

@@ -1,7 +1,7 @@
-From cf5302cca4a0daf5eb9b058243e6f56e63ab58dc Mon Sep 17 00:00:00 2001
+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 080/229] Add support for UEFI operating systems returned by
+Subject: [PATCH 079/229] Add support for UEFI operating systems returned by
  os-prober
 
 os-prober returns UEFI operating systems in the form:

0080-Migrate-PPC-from-Yaboot-to-Grub2.patch

@@ -1,7 +1,7 @@
-From 4fbdca3b8a359170032882db53646cc4bfd17f6b Mon Sep 17 00:00:00 2001
+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 081/229] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 080/229] 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.

0081-Add-fw_path-variable-revised.patch

@@ -1,7 +1,7 @@
-From ebd364c3aabe4e484243ccf6e276563416b3f244 Mon Sep 17 00:00:00 2001
+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 082/229] Add fw_path variable (revised)
+Subject: [PATCH 081/229] 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

0082-Add-support-for-linuxefi.patch

@@ -1,7 +1,7 @@
-From e1243befd2bc84b3c85100bece1424529dedafb4 Mon Sep 17 00:00:00 2001
+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 083/229] Add support for linuxefi
+Subject: [PATCH 082/229] Add support for linuxefi
 
 ---
  grub-core/Makefile.core.def       |   8 +

0083-Use-linuxefi-and-initrdefi-where-appropriate.patch

@@ -1,7 +1,7 @@
-From 859cdda8e3c026eb132ad15320222a7ef89d8940 Mon Sep 17 00:00:00 2001
+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 084/229] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 083/229] Use "linuxefi" and "initrdefi" where appropriate.
 
 ---
  util/grub.d/10_linux.in | 18 ++++++++++++++++--

0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch

@@ -1,7 +1,7 @@
-From a7dd90b084d0e6d10e8f1892651d8c20c079c99d Mon Sep 17 00:00:00 2001
+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 085/229] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 084/229] Don't allow insmod when secure boot is enabled.
 
 Hi,
 

0085-Pass-x-hex-hex-straight-through-unmolested.patch

@@ -1,7 +1,7 @@
-From 66e04779bda094f385e8bbbe3523501821b830e4 Mon Sep 17 00:00:00 2001
+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 086/229] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 085/229] Pass "\x[[:hex:]][[:hex:]]" straight through
  unmolested.
 
 ---

0086-Add-X-option-to-printf-functions.patch

@@ -1,7 +1,7 @@
-From 85d1de365ee5f0fb5409a3b1d895204262a7a068 Mon Sep 17 00:00:00 2001
+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 087/229] Add %X option to printf functions.
+Subject: [PATCH 086/229] Add %X option to printf functions.
 
 ---
  grub-core/kern/misc.c | 7 +++++--

0087-Search-for-specific-config-file-for-netboot.patch

@@ -1,7 +1,7 @@
-From 4b15dd15153b2e7070ae37736c3094223fa3a01d Mon Sep 17 00:00:00 2001
+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 088/229] Search for specific config file for netboot
+Subject: [PATCH 087/229] 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:

0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch

@@ -1,7 +1,7 @@
-From cb7f166adef2b0acc52fa0b506621295a1408702 Mon Sep 17 00:00:00 2001
+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 089/229] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 088/229] blscfg: add blscfg module to parse Boot Loader
  Specification snippets
 
 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec

0089-Don-t-write-messages-to-the-screen.patch

@@ -1,7 +1,7 @@
-From 472265de61af84149ba89a91072317e15298caa1 Mon Sep 17 00:00:00 2001
+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 090/229] Don't write messages to the screen
+Subject: [PATCH 089/229] 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

0090-Don-t-print-GNU-GRUB-header.patch

@@ -1,7 +1,7 @@
-From 2b9d1073c695f0363202a00586e1994432d23347 Mon Sep 17 00:00:00 2001
+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 091/229] Don't print GNU GRUB header
+Subject: [PATCH 090/229] Don't print GNU GRUB header
 
 No one cares.
 ---

0091-Don-t-add-to-highlighted-row.patch

@@ -1,7 +1,7 @@
-From 7cb577925e3d40869b9748afa5060b178ba88abd Mon Sep 17 00:00:00 2001
+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 092/229] Don't add '*' to highlighted row
+Subject: [PATCH 091/229] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---

0092-Message-string-cleanups.patch

@@ -1,7 +1,7 @@
-From 67803e1ea2884a1ff8ecbb1cc9371fa63c9a7544 Mon Sep 17 00:00:00 2001
+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 093/229] Message string cleanups
+Subject: [PATCH 092/229] Message string cleanups
 
 Make use of terminology consistent. Remove jargon.
 ---

0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch

@@ -1,7 +1,7 @@
-From 7857716e067795304fc788813e427fac3f9624d7 Mon Sep 17 00:00:00 2001
+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 094/229] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 093/229] Fix border spacing now that we aren't displaying it
 
 ---
  grub-core/normal/menu_text.c | 6 +++---

0094-Use-the-correct-indentation-for-the-term-help-text.patch

@@ -1,7 +1,7 @@
-From 9ecf176aa2951d848ca2d0ab23e663b2ddc1b336 Mon Sep 17 00:00:00 2001
+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 095/229] Use the correct indentation for the term help text
+Subject: [PATCH 094/229] Use the correct indentation for the term help text
 
 That is consistent with the menu help text
 ---

0095-Indent-menu-entries.patch

@@ -1,7 +1,7 @@
-From 62af3df5904d4fff7e8c4bab0a90aae6752be432 Mon Sep 17 00:00:00 2001
+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 096/229] Indent menu entries
+Subject: [PATCH 095/229] Indent menu entries
 
 ---
  grub-core/normal/menu_text.c | 3 ++-

0096-Fix-margins.patch

@@ -1,7 +1,7 @@
-From aa23d4d1be22a7255f9faa3bac39a5d29c2de9f2 Mon Sep 17 00:00:00 2001
+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 097/229] Fix margins
+Subject: [PATCH 096/229] Fix margins
 
 ---
  grub-core/normal/menu_text.c | 8 +++-----

0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch

@@ -1,7 +1,7 @@
-From cc0abdf469be06b17879f19b26c73b916f479b28 Mon Sep 17 00:00:00 2001
+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 098/229] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 097/229] Use -2 instead of -1 for our right-hand margin, so
  linewrapping works (#976643).
 
 Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>

0098-Use-linux16-when-appropriate-880840.patch

@@ -1,7 +1,7 @@
-From 9b332449552b4c8afbe2d0e30b795d93c2ac733f Mon Sep 17 00:00:00 2001
+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 099/229] Use linux16 when appropriate (#880840)
+Subject: [PATCH 098/229] Use linux16 when appropriate (#880840)
 
 The kernel group really would prefer that we use the 16 bit entry point
 on x86 bios machines.

0099-Enable-pager-by-default.-985860.patch

@@ -1,7 +1,7 @@
-From 24b186833aad3f456111b7f9d3806065dbb95a2e Mon Sep 17 00:00:00 2001
+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 100/229] Enable pager by default. (#985860)
+Subject: [PATCH 099/229] Enable pager by default. (#985860)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch

@@ -1,7 +1,7 @@
-From 3635e1f8f5925e9c5ba54e9bbe79503d78177ea4 Mon Sep 17 00:00:00 2001
+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 101/229] F10 doesn't work on serial, so don't tell the user to
+Subject: [PATCH 100/229] F10 doesn't work on serial, so don't tell the user to
  hit it (#987443)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0101-Don-t-say-GNU-Linux-in-generated-menus.patch

@@ -1,7 +1,7 @@
-From c3bd10791d0ecc17cd8243de8eea4cd683ae2bdb Mon Sep 17 00:00:00 2001
+From 45877a77f50eecd0b7fd3ba1aec0d4398a3b6a20 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH 102/229] Don't say "GNU/Linux" in generated menus.
+Subject: [PATCH 101/229] Don't say "GNU/Linux" in generated menus.
 
 ---
  util/grub.d/10_linux.in     | 4 ++--

0102-Don-t-draw-a-border-around-the-menu.patch

@@ -1,7 +1,7 @@
-From 79e679458cc2e70d0097cfc702668976fe1fdc5d Mon Sep 17 00:00:00 2001
+From c28a3053e96859000df5ff1d48c9a560d47c0470 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 16:47:33 -0400
-Subject: [PATCH 103/229] Don't draw a border around the menu
+Subject: [PATCH 102/229] Don't draw a border around the menu
 
 It looks cleaner without it.
 ---

0103-Use-the-standard-margin-for-the-timeout-string.patch

@@ -1,7 +1,7 @@
-From a82ffe034724bb20b062bba9606654d0e3919acc Mon Sep 17 00:00:00 2001
+From 93018f5d1727eb58dead129f150a36080c22530a Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 10:52:32 -0400
-Subject: [PATCH 104/229] Use the standard margin for the timeout string
+Subject: [PATCH 103/229] Use the standard margin for the timeout string
 
 So that it aligns with the other messages
 ---

0104-Add-.eh_frame-to-list-of-relocations-stripped.patch

@@ -1,7 +1,7 @@
-From 35cdd6b929d5f63750bb214a53e1c75b31dcae99 Mon Sep 17 00:00:00 2001
+From c626121f38adf6fcd39a5f69249c650b4b52c10d Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 13 Jan 2014 21:50:59 -0500
-Subject: [PATCH 105/229] Add .eh_frame to list of relocations stripped
+Subject: [PATCH 104/229] Add .eh_frame to list of relocations stripped
 
 ---
  conf/Makefile.common | 2 +-

0105-Make-10_linux-work-with-our-changes-for-linux16-and-.patch

@@ -1,7 +1,7 @@
-From 3f5daaa46d0a5eb390a74da40abe54d385d308cf Mon Sep 17 00:00:00 2001
+From 59275c83e7a303c63379d37ba21aa39a3c3b7203 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 13:12:23 -0500
-Subject: [PATCH 106/229] Make 10_linux work with our changes for linux16 and
+Subject: [PATCH 105/229] Make 10_linux work with our changes for linux16 and
  linuxefi on aarch64
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0106-Don-t-print-during-fdt-loading-method.patch

@@ -1,7 +1,7 @@
-From 276027c67b27f2ee557ca9e2492c779a5f76cb9b Mon Sep 17 00:00:00 2001
+From aedf2aceb354ab7bf28bbf70d0a4b505c0adcfdf Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 16:15:46 -0500
-Subject: [PATCH 107/229] Don't print during fdt loading method.
+Subject: [PATCH 106/229] Don't print during fdt loading method.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0107-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch

@@ -1,7 +1,7 @@
-From 25add18bbc13249a2ce32f4e9b0de512ecc1fe4b Mon Sep 17 00:00:00 2001
+From f2790b1f7c8efcd5589c8fcdaca51b548ab9825c Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Mon, 30 Jun 2014 14:16:46 -0400
-Subject: [PATCH 108/229] Don't munge raw spaces when we're doing our cmdline
+Subject: [PATCH 107/229] Don't munge raw spaces when we're doing our cmdline
  escaping (#923374)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0108-Don-t-require-a-password-to-boot-entries-generated-b.patch

@@ -1,7 +1,7 @@
-From 9b109204ee0d1888d64d553849798ee57af1809f Mon Sep 17 00:00:00 2001
+From 205a7844bea4d849dc24f24b5fc96f6040d5e2b9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 11 Feb 2014 11:14:50 -0500
-Subject: [PATCH 109/229] Don't require a password to boot entries generated by
+Subject: [PATCH 108/229] Don't require a password to boot entries generated by
  grub-mkconfig.
 
 When we set a password, we just want that to mean you can't /edit/ an entry.

0109-Don-t-emit-Booting-.-message.patch

@@ -1,7 +1,7 @@
-From 68f1935b5c6f66afbf9d6990615946c44f3d54cb Mon Sep 17 00:00:00 2001
+From c986c38f790881be0b9c5b0acd8d3b106412a5f1 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 09:37:49 -0500
-Subject: [PATCH 110/229] Don't emit "Booting ..." message.
+Subject: [PATCH 109/229] Don't emit "Booting ..." message.
 
 UI team still hates this stuff, so we're disabling it for RHEL 7.
 

0110-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch

@@ -1,7 +1,7 @@
-From 6cdf99aa53970695fbf5c002fa288e1044571ca7 Mon Sep 17 00:00:00 2001
+From dcf3b9c590f00e33f773de68ac4ebd55ca4f6e90 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 4 Mar 2014 11:00:23 -0500
-Subject: [PATCH 111/229] Replace a lot of man pages with slightly nicer ones.
+Subject: [PATCH 110/229] Replace a lot of man pages with slightly nicer ones.
 
 Replace a bunch of machine generated ones with ones that look nicer.
 ---
@@ -168,7 +168,7 @@ index b16bd925320..39eb94bded6 100644
  EXTRA_DIST += docs/grub.cfg
  EXTRA_DIST += docs/osdetect.cfg
 diff --git a/docs/Makefile.am b/docs/Makefile.am
-index e396ba10f46..0669729cc57 100644
+index 93eb3962765..ab28f199694 100644
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
 @@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi

0111-use-fw_path-prefix-when-fallback-searching-for-grub-.patch

@@ -1,7 +1,7 @@
-From f72c593c32ecba7b10ceb4c63ca8ec48f60c3ccf Mon Sep 17 00:00:00 2001
+From 24865a88781aef2a6a54433b5b383219108f54fa Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Wed, 19 Feb 2014 15:58:43 -0500
-Subject: [PATCH 112/229] use fw_path prefix when fallback searching for grub
+Subject: [PATCH 111/229] use fw_path prefix when fallback searching for grub
  config
 
 When PXE booting via UEFI firmware, grub was searching for grub.cfg

0112-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch

@@ -1,7 +1,7 @@
-From 09265872f163e6dfe1aa319ac40e8090f31830f7 Mon Sep 17 00:00:00 2001
+From d4cd9aa8695ab9448da41f756553beb75bffee46 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 6 Mar 2014 11:51:33 -0500
-Subject: [PATCH 113/229] Try mac/guid/etc before grub.cfg on tftp config
+Subject: [PATCH 112/229] Try mac/guid/etc before grub.cfg on tftp config
  files.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0113-Fix-convert-function-to-support-NVMe-devices.patch

@@ -1,7 +1,7 @@
-From 39976a692a9350b1293f209953426830ddde2ad6 Mon Sep 17 00:00:00 2001
+From 397f179c26aeddf3fe452c62aa404459889835fc Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 11:34:00 -0500
-Subject: [PATCH 114/229] Fix convert function to support NVMe devices
+Subject: [PATCH 113/229] Fix convert function to support NVMe devices
 
 This is adapted from the patch at
 https://bugzilla.redhat.com/show_bug.cgi?id=1019660 , which is against

0114-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch

@@ -1,7 +1,7 @@
-From 05d7e199d3f48cf9fd9b2af877cfe37c498f0874 Mon Sep 17 00:00:00 2001
+From 4291f418c3304f0f379467e87ce5892853cc16c7 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 10 Feb 2014 16:13:10 -0500
-Subject: [PATCH 115/229] Switch to use APM Mustang device tree, for hardware
+Subject: [PATCH 114/229] Switch to use APM Mustang device tree, for hardware
  testing.
 
 Signed-off-by: David A. Marlin <d.marlin@redhat.com>

0115-Use-the-default-device-tree-from-the-grub-default-fi.patch

@@ -1,7 +1,7 @@
-From b2ad2a3b4a4bc998003c1275709f0677c39503a9 Mon Sep 17 00:00:00 2001
+From 5111bdda0d0a21ab02f6c9aa441a32cd02c6bc3f Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Wed, 12 Feb 2014 14:54:04 -0500
-Subject: [PATCH 116/229] Use the default device tree from the grub default
+Subject: [PATCH 115/229] Use the default device tree from the grub default
  file
 
 instead of hardcoding a value.

0116-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -1,7 +1,7 @@
-From 5d87e5b1697c28d55348486cb3c704b467c8e798 Mon Sep 17 00:00:00 2001
+From 0ff5bf3deefdb17dbadb51a11acc50b96e2ed797 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Sat, 15 Feb 2014 15:10:22 -0500
-Subject: [PATCH 117/229] reopen SNP protocol for exclusive use by grub
+Subject: [PATCH 116/229] reopen SNP protocol for exclusive use by grub
 
 ---
  grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++

0117-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -1,7 +1,7 @@
-From f00ca4e03561840f116642c7100df6dc6395209d Mon Sep 17 00:00:00 2001
+From 58fba65b7e339d4c7279e4ca88937d9501275169 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 4 Mar 2016 15:13:59 -0500
-Subject: [PATCH 118/229] Revert "reopen SNP protocol for exclusive use by
+Subject: [PATCH 117/229] Revert "reopen SNP protocol for exclusive use by
  grub"
 
 This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is

0118-Add-grub_util_readlink.patch

@@ -1,7 +1,7 @@
-From ffc123b7ab4fe37da16d4c62d87255f8c5c14b9f Mon Sep 17 00:00:00 2001
+From 76baa996f73eea47f7bdc41461efeee204626e2d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Sep 2014 10:01:03 -0400
-Subject: [PATCH 119/229] Add grub_util_readlink()
+Subject: [PATCH 118/229] Add grub_util_readlink()
 
 Add grub_util_readlink().  This requires pulling in stat and readlink from
 gnulib, which pulls in stat and related headers, but after that the

0119-Make-editenv-chase-symlinks-including-those-across-d.patch

@@ -1,7 +1,7 @@
-From fb903fc1587b582e23e44811dc8c4ed359806028 Mon Sep 17 00:00:00 2001
+From fd1a89c8bef603ec33937f122ae25013a724601a Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Sep 2014 10:38:00 -0400
-Subject: [PATCH 120/229] Make editenv chase symlinks including those across
+Subject: [PATCH 119/229] Make editenv chase symlinks including those across
  devices.
 
 This lets us make /boot/grub2/grubenv a symlink to

0120-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch

@@ -1,7 +1,7 @@
-From 5948f763fc01d7f29923e94ef9b1ed923b11ff1a Mon Sep 17 00:00:00 2001
+From c8d93b9e27e9cbf51e91f6cc99abbcb7b68189ce Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 14:23:23 -0400
-Subject: [PATCH 121/229] Generate OS and CLASS in 10_linux from
+Subject: [PATCH 120/229] Generate OS and CLASS in 10_linux from
  /etc/os-release
 
 This makes us use pretty names in the titles we generate in

0121-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch

@@ -1,7 +1,7 @@
-From 547d0c60f28c026801af2ada3e0995d0ecc22c35 Mon Sep 17 00:00:00 2001
+From 974241c42b03f3ccb6a5d0eb453283e370da9848 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 15:52:08 -0400
-Subject: [PATCH 122/229] Minimize the sort ordering for .debug and -rescue-
+Subject: [PATCH 121/229] Minimize the sort ordering for .debug and -rescue-
  kernels.
 
 Resolves: rhbz#1065360

0122-Load-arm-with-SB-enabled.patch

@@ -1,7 +1,7 @@
-From c03bf04fd9e3192bec942a7adee23b5377ea81dc Mon Sep 17 00:00:00 2001
+From edfc2b0952b1eacf95188e53167cc038e5ea0129 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 18 Sep 2014 11:26:14 -0400
-Subject: [PATCH 123/229] Load arm with SB enabled.
+Subject: [PATCH 122/229] Load arm with SB enabled.
 
 Make sure we actually try to validate secure boot on this platform (even
 though we're not shipping it enabled by default.)

0123-Try-prefix-if-fw_path-doesn-t-work.patch

@@ -1,7 +1,7 @@
-From 0c98cb57eb1a34ec29f719e3a798f5b20c6a4082 Mon Sep 17 00:00:00 2001
+From 3846b040f1050f246e1e975ee88f22c687ae04bf Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 3 Oct 2014 11:08:03 -0400
-Subject: [PATCH 124/229] Try $prefix if $fw_path doesn't work.
+Subject: [PATCH 123/229] Try $prefix if $fw_path doesn't work.
 
 Related: rhbz#1148652
 

0124-Update-info-with-grub.cfg-netboot-selection-order-11.patch

@@ -1,7 +1,7 @@
-From d446fed131fadd00d0daab0654c7d9e14442d451 Mon Sep 17 00:00:00 2001
+From d4b4184078610a3639fa1e0e463679c424496c3b Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 16 Mar 2015 16:34:51 -0400
-Subject: [PATCH 125/229] Update info with grub.cfg netboot selection order
+Subject: [PATCH 124/229] Update info with grub.cfg netboot selection order
  (#1148650)
 
 Added documentation to the grub info page that specifies the order

0125-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch

@@ -1,7 +1,7 @@
-From e62ab1057d87e2a1e3c7fcf6b134f86ec24f2eac Mon Sep 17 00:00:00 2001
+From ce125cafc1e94bf70f2a3dbb545960bd8dd23a2f Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 16 Mar 2015 14:14:19 -0400
-Subject: [PATCH 126/229] Use Distribution Package Sort for grub2-mkconfig
+Subject: [PATCH 125/229] Use Distribution Package Sort for grub2-mkconfig
  (#1124074)
 
 Users reported that newly installed kernels on their systems installed

0126-Handle-rssd-storage-devices.patch

@@ -1,7 +1,7 @@
-From 8d3f2f0f389efbb9ed5da0c4f90fc82d104163c1 Mon Sep 17 00:00:00 2001
+From 1956a2192ac0a8421ee83bf77fdf223f2be0bdfb Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 30 Jun 2015 15:50:41 -0400
-Subject: [PATCH 127/229] Handle rssd storage devices.
+Subject: [PATCH 126/229] Handle rssd storage devices.
 
 Resolves: rhbz#1087962
 

0127-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch

@@ -1,7 +1,7 @@
-From e5ed14fb98e18d173f9396103aca65351e4e67e2 Mon Sep 17 00:00:00 2001
+From 5f89c77c7cff17c931f1ea52af0c39df8ab28ac9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 27 Oct 2014 09:22:55 -0400
-Subject: [PATCH 128/229] Try to emit linux16/initrd16 and linuxefi/initrdefi
+Subject: [PATCH 127/229] Try to emit linux16/initrd16 and linuxefi/initrdefi
  in 30-os_prober.
 
 Resolves: rhbz#1108296

0128-Make-grub2-mkconfig-construct-titles-that-look-like-.patch

@@ -1,7 +1,7 @@
-From 75c3d5fedb92fcf107b594216655c29bb20cbebc Mon Sep 17 00:00:00 2001
+From c7ae420d095ccec20481c25b14773ab2fce658b5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 28 Apr 2015 11:15:03 -0400
-Subject: [PATCH 129/229] Make grub2-mkconfig construct titles that look like
+Subject: [PATCH 128/229] Make grub2-mkconfig construct titles that look like
  the ones we want elsewhere.
 
 Resolves: rhbz#1215839

0129-Add-friendly-grub2-password-config-tool-985962.patch

@@ -1,7 +1,7 @@
-From d03d08a8ba14eddda515907cafc640fb1dbe0874 Mon Sep 17 00:00:00 2001
+From 68f21f5ebebc23a6d8512631f2a1d474afcccd43 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Thu, 25 Jun 2015 11:13:11 -0400
-Subject: [PATCH 130/229] Add friendly grub2 password config tool (#985962)
+Subject: [PATCH 129/229] Add friendly grub2 password config tool (#985962)
 
 Provided a tool for users to reset the grub2 root user password
 without having to alter the grub.cfg. The hashed password now

0130-Make-grub2-mkconfig-construct-titles-that-look-like-.patch

@@ -1,7 +1,7 @@
-From 7d9c29023e6c242306ae008a984245037655a23c Mon Sep 17 00:00:00 2001
+From 7a7644507e4d953ea8f8d1d7133622a72a2168f5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 28 Apr 2015 11:15:03 -0400
-Subject: [PATCH 131/229] Make grub2-mkconfig construct titles that look like
+Subject: [PATCH 130/229] Make grub2-mkconfig construct titles that look like
  the ones we want elsewhere.
 
 Resolves: rhbz#1215839

0131-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch

@@ -1,7 +1,7 @@
-From e97b5c4ec2f11ac544c3c1de8fa5b84ac24d9536 Mon Sep 17 00:00:00 2001
+From 6f892038567f1706fdde819f5f226ec4cacbea47 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 3 Aug 2015 11:46:42 -0400
-Subject: [PATCH 132/229] Try to make sure configure.ac and grub-rpm-sort play
+Subject: [PATCH 131/229] Try to make sure configure.ac and grub-rpm-sort play
  nice.
 
 Apparently the test for whether to use grub-rpm-sort and also the

0132-tcp-add-window-scaling-support.patch

@@ -1,7 +1,7 @@
-From df119e7a941f0e1329181d33d63349375b9b56d9 Mon Sep 17 00:00:00 2001
+From 71e31c279c07f9f51f2a482b70b40b7deed69a69 Mon Sep 17 00:00:00 2001
 From: Josef Bacik <jbacik@fb.com>
 Date: Wed, 12 Aug 2015 08:57:55 -0700
-Subject: [PATCH 133/229] tcp: add window scaling support
+Subject: [PATCH 132/229] tcp: add window scaling support
 
 Sometimes we have to provision boxes across regions, such as California to
 Sweden.  The http server has a 10 minute timeout, so if we can't get our 250mb

0133-efinet-retransmit-if-our-device-is-busy.patch

@@ -1,7 +1,7 @@
-From d4f94fc4cd48954f757d6efb82311eb3256389e4 Mon Sep 17 00:00:00 2001
+From d09f32622f6fc247dd88f731c34be10395785d8d Mon Sep 17 00:00:00 2001
 From: Josef Bacik <jbacik@fb.com>
 Date: Mon, 31 Aug 2015 13:34:35 -0400
-Subject: [PATCH 134/229] efinet: retransmit if our device is busy
+Subject: [PATCH 133/229] efinet: retransmit if our device is busy
 
 When I fixed the txbuf handling I ripped out the retransmission code since it
 was flooding our network when we had the buggy behavior.  Turns out this was too

0134-Be-more-aggro-about-actually-using-the-configured-ne.patch

@@ -1,7 +1,7 @@
-From d4eb7984ad8938e50764c541f0e8f4c8d6d012f8 Mon Sep 17 00:00:00 2001
+From 8ece44c2c8f88f531ac9a679f65a263e7b6d2dba Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 11 Sep 2015 17:30:49 -0400
-Subject: [PATCH 135/229] Be more aggro about actually using the *configured*
+Subject: [PATCH 134/229] Be more aggro about actually using the *configured*
  network device.
 
 Right now we use any SNP device with the same mac+IP block, but when

0135-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch

@@ -1,7 +1,7 @@
-From fdbc8b81c9f3bbef64298dbf1f5230eda0cda02f Mon Sep 17 00:00:00 2001
+From 82b9fdcbbc339c36842c625203fc2b1f22a86c9e Mon Sep 17 00:00:00 2001
 From: RHEL Ninjas <example@example.com>
 Date: Fri, 25 Sep 2015 16:24:23 +0900
-Subject: [PATCH 136/229] efinet: add filter for the first exclusive reopen of
+Subject: [PATCH 135/229] efinet: add filter for the first exclusive reopen of
  SNP
 
 ---

0136-Fix-security-issue-when-reading-username-and-passwor.patch

@@ -1,7 +1,7 @@
-From fa4b152860e04053ee1cae6b70237a1975473a81 Mon Sep 17 00:00:00 2001
+From 9961e63642244617b697d93bbc49379e23b6839d Mon Sep 17 00:00:00 2001
 From: Hector Marco-Gisbert <hecmargi@upv.es>
 Date: Fri, 13 Nov 2015 16:21:09 +0100
-Subject: [PATCH 137/229] Fix security issue when reading username and password
+Subject: [PATCH 136/229] Fix security issue when reading username and password
 
   This patch fixes two integer underflows at:
     * grub-core/lib/crypto.c

0137-Warn-if-grub-password-will-not-be-read-1290803.patch

@@ -1,7 +1,7 @@
-From c8ed108d2f3f9b57add84e282fef6e39634aec99 Mon Sep 17 00:00:00 2001
+From 056a956aea898f9d3ee34ecad9660addc3f3108c Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 22 Feb 2016 15:30:05 -0500
-Subject: [PATCH 138/229] Warn if grub password will not be read (#1290803)
+Subject: [PATCH 137/229] Warn if grub password will not be read (#1290803)
 
 It is possible for a system to have never run grub-mkconfig and add the
 section that reads the user.cfg file which contains a user set GRUB

0138-Clean-up-grub-setpassword-documentation-1290799.patch

@@ -1,7 +1,7 @@
-From 884c7f7b14633fc47d5cada7f02df6fb5176b224 Mon Sep 17 00:00:00 2001
+From 92af2b24adb7371d8234c0b32ae716adf0b80d42 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Tue, 26 Jan 2016 10:28:35 -0500
-Subject: [PATCH 139/229] Clean up grub-setpassword documentation (#1290799)
+Subject: [PATCH 138/229] Clean up grub-setpassword documentation (#1290799)
 
 The output for --help had some errors. Corrected those and polished the
 text to be a little easier to follow. Carried verbage over to man page

0139-Fix-locale-issue-in-grub-setpassword-1294243.patch

@@ -1,7 +1,7 @@
-From 5f3812d1820b13137b5c79b135a6b790cb78ae60 Mon Sep 17 00:00:00 2001
+From 373adc50cf9f09015e40ffd1bf79ab9f291f4fc2 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Fri, 29 Jan 2016 16:56:11 -0500
-Subject: [PATCH 140/229] Fix locale issue in grub-setpassword (#1294243)
+Subject: [PATCH 139/229] Fix locale issue in grub-setpassword (#1294243)
 
 A shell substitution was expecting non-translated output to grab the
 hashed password and put it in the user.cfg file. Modified code to force

0140-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch

@@ -1,7 +1,7 @@
-From a7a38221a7f4593a9abb5f422d0dd349866ed029 Mon Sep 17 00:00:00 2001
+From eab0520310030376f6295e0338e874bce10b0d5f Mon Sep 17 00:00:00 2001
 From: Robert Elliott <elliott@hpe.com>
 Date: Fri, 22 Jan 2016 13:32:30 +0100
-Subject: [PATCH 141/229] efiemu: Handle persistent RAM and unknown possible
+Subject: [PATCH 140/229] efiemu: Handle persistent RAM and unknown possible
  future additions.
 
 (cherry picked from commit ae3b83a4d4df75a01198a2fed7542391e7c449e0)

0141-efiemu-Fix-compilation-failure.patch

@@ -1,7 +1,7 @@
-From 1da43f34f211772fbda36ef6fd81e1cbde37eae7 Mon Sep 17 00:00:00 2001
+From 68bdf29eb6e376a3b4a817bbe7481efd12b8f9de Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 22 Jan 2016 14:10:30 +0100
-Subject: [PATCH 142/229] efiemu: Fix compilation failure
+Subject: [PATCH 141/229] efiemu: Fix compilation failure
 
 (cherry picked from commit b6a03dfd327489d53ee07c6d7d593b99c7b7cb62)
 

0142-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -1,7 +1,7 @@
-From 9b93a986a68502c1ab2303efd7469fda0c5709cf Mon Sep 17 00:00:00 2001
+From df19c5ff9c9e716df0383e39992466304053c99d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 7 Apr 2016 10:58:06 -0400
-Subject: [PATCH 143/229] Revert "reopen SNP protocol for exclusive use by
+Subject: [PATCH 142/229] Revert "reopen SNP protocol for exclusive use by
  grub"
 
 I *think* this should have been replaced by upstream's

0143-Add-a-url-parser.patch

@@ -1,7 +1,7 @@
-From 520e6078ff9e3fbf1edf687e51597dac98c07d56 Mon Sep 17 00:00:00 2001
+From 2f84b2e097ad9f6f7f06013f749251743eb32c2e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jun 2016 16:18:44 -0400
-Subject: [PATCH 144/229] Add a url parser.
+Subject: [PATCH 143/229] Add a url parser.
 
 This patch adds a url parser that can parse http, https, tftp, and tftps
 urls, and is easily extensible to handle more types.

0144-efinet-and-bootp-add-support-for-dhcpv6.patch

@@ -1,7 +1,7 @@
-From 0bdcc68529fe2f3cdf92173fadffd2f9a6476b9b Mon Sep 17 00:00:00 2001
+From 48768b0295ad4d908cefd8e8fbee96a4dc2765f5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 8 Jun 2016 21:03:37 -0400
-Subject: [PATCH 145/229] efinet and bootp: add support for dhcpv6
+Subject: [PATCH 144/229] efinet and bootp: add support for dhcpv6
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0145-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch

@@ -1,7 +1,7 @@
-From dcadcc9070f778654eb704fc0907e261996ef76e Mon Sep 17 00:00:00 2001
+From 764506b89942103c3a511d7933edef351fb594b8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 23 Jun 2016 11:01:39 -0400
-Subject: [PATCH 146/229] Add grub-get-kernel-settings and use it in 10_linux
+Subject: [PATCH 145/229] Add grub-get-kernel-settings and use it in 10_linux
 
 This patch adds grub-get-kernel-settings, which reads the system kernel
 installation configuration from /etc/sysconfig/kernel, and outputs

0146-Normalize-slashes-in-tftp-paths.patch

@@ -1,7 +1,7 @@
-From 130783c1e461b64befbf0fa8c9002ef763606105 Mon Sep 17 00:00:00 2001
+From 406402dfaecc62ede346793c9c7a0568dc71c131 Mon Sep 17 00:00:00 2001
 From: Lenny Szubowicz <lszubowi@redhat.com>
 Date: Mon, 29 Aug 2016 11:04:48 -0400
-Subject: [PATCH 147/229] Normalize slashes in tftp paths.
+Subject: [PATCH 146/229] Normalize slashes in tftp paths.
 
 Some tftp servers do not handle multiple consecutive slashes correctly;
 this patch avoids sending tftp requests with non-normalized paths.

0147-Fix-malformed-tftp-packets.patch

@@ -1,7 +1,7 @@
-From af0e4fc8f9cd844c44c969c0991269ec9ab01a62 Mon Sep 17 00:00:00 2001
+From 7d05a8298e6a54bfae0038841462443f21da3535 Mon Sep 17 00:00:00 2001
 From: Mark Salter <msalter@redhat.com>
 Date: Tue, 7 Mar 2017 18:26:17 -0500
-Subject: [PATCH 148/229] Fix malformed tftp packets
+Subject: [PATCH 147/229] Fix malformed tftp packets
 
 0088-Normalize-slashes-in-tftp-paths.patch collapses multiple contiguous
 slashes in a filename into one slash in the tftp packet filename field.

0148-Fix-race-in-EFI-validation.patch

@@ -1,7 +1,7 @@
-From d5339007d0ffdaf6e8a4e9702e7cec447b118804 Mon Sep 17 00:00:00 2001
+From bf59d76ca82eb4eaa20a747f5890d09632ba93d0 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 14 Jul 2015 16:58:51 -0700
-Subject: [PATCH 149/229] Fix race in EFI validation
+Subject: [PATCH 148/229] Fix race in EFI validation
 
 ---
  grub-core/loader/i386/efi/linux.c | 44 ++++++++++-----------------------------

0149-bz1374141-fix-incorrect-mask-for-ppc64.patch

@@ -1,7 +1,7 @@
-From eea2b6113c2f17ed5755b23242457948025bfd33 Mon Sep 17 00:00:00 2001
+From 84a5f535949f590a8976c64c3d1fde08fe0f7464 Mon Sep 17 00:00:00 2001
 From: Masahiro Matsuya <mmatsuya@redhat.com>
 Date: Sat, 29 Oct 2016 08:35:26 +0900
-Subject: [PATCH 150/229] bz1374141 fix incorrect mask for ppc64
+Subject: [PATCH 149/229] bz1374141 fix incorrect mask for ppc64
 
 The netmask configured in firmware is not respected on ppc64 (big endian).
 When 255.255.252.0 is set as netmask in firmware, the following is the value of bootpath string in grub_ieee1275_parse_bootpath().

0150-Use-device-part-of-chainloader-target-if-present.patch

@@ -1,7 +1,7 @@
-From d08c1a531d80b4e14a7bfeb0d762125f4fab1317 Mon Sep 17 00:00:00 2001
+From d426e20f8b41ebf114075dc4ffbcaf438ceb4b95 Mon Sep 17 00:00:00 2001
 From: Raymund Will <rw@suse.com>
 Date: Fri, 10 Apr 2015 01:45:02 -0400
-Subject: [PATCH 151/229] Use device part of chainloader target, if present.
+Subject: [PATCH 150/229] Use device part of chainloader target, if present.
 
 Otherwise chainloading is restricted to '$root', which might not even
 be readable by EFI!

0151-Add-secureboot-support-on-efi-chainloader.patch

@@ -1,7 +1,7 @@
-From 729766b6416f6ca13c694ce220c3b2156ced1691 Mon Sep 17 00:00:00 2001
+From bbf98517303e438cea398bb74306b6553c880ac3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 13:04:37 -0400
-Subject: [PATCH 152/229] Add secureboot support on efi chainloader
+Subject: [PATCH 151/229] Add secureboot support on efi chainloader
 
 Expand the chainloader to be able to verify the image by means of shim
 lock protocol. The PE/COFF image is loaded and relocated by the

0152-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch

@@ -1,7 +1,7 @@
-From fe18b297027c4976d11b87f1b5adc07a7565cdee Mon Sep 17 00:00:00 2001
+From 25ea5be888dcc92cd0b3cb7d34b381f5005f1e30 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 16:09:25 -0400
-Subject: [PATCH 153/229] Make any of the loaders that link in efi mode honor
+Subject: [PATCH 152/229] Make any of the loaders that link in efi mode honor
  secure boot.
 
 And in this case "honor" means "even if somebody does link this in, they

0153-Make-grub_fatal-also-backtrace.patch

@@ -1,7 +1,7 @@
-From b2fd6377486d66ced5fd82325c3ee8e11f4f1176 Mon Sep 17 00:00:00 2001
+From eb1a27144476324a22561383a0a2e61aa327d2f5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 27 Jan 2016 09:22:42 -0500
-Subject: [PATCH 154/229] Make grub_fatal() also backtrace.
+Subject: [PATCH 153/229] Make grub_fatal() also backtrace.
 
 ---
  grub-core/Makefile.core.def     |  3 ++

0154-Rework-linux-command.patch

@@ -1,7 +1,7 @@
-From 4fec1bb24e09f36366c62196285392a674d259d3 Mon Sep 17 00:00:00 2001
+From 12312bfe1727a2992042436cb0f8c8ba1c69ee2f Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:12:39 -0700
-Subject: [PATCH 155/229] Rework linux command
+Subject: [PATCH 154/229] Rework linux command
 
 We want a single buffer that contains the entire kernel image in order to
 perform a TPM measurement. Allocate one and copy the entire kernel into it

0155-Rework-linux16-command.patch

@@ -1,7 +1,7 @@
-From 7d6ce3346f32a67e07fd3fda9ad65ac76f600628 Mon Sep 17 00:00:00 2001
+From 24250bbb84f8817462426c46b255d875de627bf1 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:20:58 -0700
-Subject: [PATCH 156/229] Rework linux16 command
+Subject: [PATCH 155/229] Rework linux16 command
 
 We want a single buffer that contains the entire kernel image in order to
 perform a TPM measurement. Allocate one and copy the entire kernel int it

0156-Make-grub-editenv-build-again.patch

@@ -1,7 +1,7 @@
-From 4e0105392434bac9f10ac79a820a69098abec2f5 Mon Sep 17 00:00:00 2001
+From ebe69b2682b5b3029d8ea503f12134ee81c4b2ce Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 4 Mar 2016 16:29:13 -0500
-Subject: [PATCH 157/229] Make grub-editenv build again.
+Subject: [PATCH 156/229] Make grub-editenv build again.
 
 36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage
 utility functions are defined, and they wind up being linked into

0157-Fix-up-some-man-pages-rpmdiff-noticed.patch

@@ -1,7 +1,7 @@
-From 7779112786e3f892e05b9d293299dd7ef151d9dd Mon Sep 17 00:00:00 2001
+From c71e6152ea8e4e525a853441bb5f08808bae3afd Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 23 Sep 2014 09:58:49 -0400
-Subject: [PATCH 158/229] Fix up some man pages rpmdiff noticed.
+Subject: [PATCH 157/229] Fix up some man pages rpmdiff noticed.
 
 ---
  configure.ac             |  2 ++

0158-Re-work-some-intricacies-of-PE-loading.patch

@@ -1,7 +1,7 @@
-From 9ca2908ab56bc32052b2f01bda6a35a190e39bae Mon Sep 17 00:00:00 2001
+From 145214ee7c411c7d600016f011dc11b213bce0b2 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 9 Jun 2016 12:22:29 -0400
-Subject: [PATCH 159/229] Re-work some intricacies of PE loading.
+Subject: [PATCH 158/229] Re-work some intricacies of PE loading.
 
 The PE spec is not a well written document, and awesomely every place
 where there's an ambiguous way to read something, Windows' bootmgfw.efi

0159-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch

@@ -1,7 +1,7 @@
-From d8441e12feab1ae94f11849d1bcc5e73abb69231 Mon Sep 17 00:00:00 2001
+From ef24bc601e11b96eefe06f477b5da1199d761b3d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 10 Jun 2016 14:06:15 -0400
-Subject: [PATCH 160/229] Rework even more of efi chainload so non-sb cases
+Subject: [PATCH 159/229] Rework even more of efi chainload so non-sb cases
  work right.
 
 This ensures that if shim protocol is not loaded, or is loaded but shim

0160-linuxefi-fix-double-free-on-verification-failure.patch

@@ -1,7 +1,7 @@
-From e432d9b485112f0d35fd623e4b2467a3d788a38f Mon Sep 17 00:00:00 2001
+From 5ef3f00e6be3033092453a66f456b8dac8cd4f7c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jun 2016 09:50:25 -0400
-Subject: [PATCH 161/229] linuxefi: fix double free on verification failure.
+Subject: [PATCH 160/229] linuxefi: fix double free on verification failure.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0161-fix-machine-type-test-in-30_os-prober.in.patch

@@ -1,7 +1,7 @@
-From 33faccd6c6f23774bbbbc83731a712a7bed76c3f Mon Sep 17 00:00:00 2001
+From 4139fdfdb64fd248a0d5f200b27c583159dbb190 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 11 Jul 2016 13:36:45 -0400
-Subject: [PATCH 162/229] fix machine type test in 30_os-prober.in
+Subject: [PATCH 161/229] fix machine type test in 30_os-prober.in
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0162-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch

@@ -1,7 +1,7 @@
-From ab9c2a7711858b2300abf802230c044db55c5171 Mon Sep 17 00:00:00 2001
+From 671699a76fa6510a62c3a94acd698a31686cb8fa Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Mon, 21 Nov 2016 15:34:00 +0100
-Subject: [PATCH 163/229] efi/chainloader: fix wrong sanity check in
+Subject: [PATCH 162/229] efi/chainloader: fix wrong sanity check in
  relocate_coff()
 
 In relocate_coff(), the relocation entries are parsed from the original