Reorder some patches to prep things for pushing upstream better.

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

0001-Fix-crash-on-http.patch

@@ -1,7 +1,7 @@
-From 9a80be91ab985c23d899d6ff5983b493e5ee6056 Mon Sep 17 00:00:00 2001
+From bf4d21655b4331c9f01e0ccca30a736e0503ce71 Mon Sep 17 00:00:00 2001
 From: Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
 Date: Tue, 25 Sep 2012 18:40:55 -0400
-Subject: [PATCH 07/85] Fix crash on http
+Subject: [PATCH 01/84] Fix crash on http
 
 Don't free file->data on receiving FIN flag since it is used all over without
 checking. http_close() will be called later to free that memory.

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

@@ -1,7 +1,7 @@
-From c99c2cfb38de87af4b9922467531d6c6a7fea6d2 Mon Sep 17 00:00:00 2001
+From f98bbe1c2072c2da29e7a9e963cae6a668a8b7c8 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 08/85] IBM client architecture (CAS) reboot support
+Subject: [PATCH 02/84] IBM client architecture (CAS) reboot support
 
 This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 
@@ -95,7 +95,7 @@ index ddb7783..6db8b98 100644
 +  return 0;
 +}
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index df12dfb..759c475 100644
+index 78a70a8..249e19b 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -33,6 +33,9 @@
@@ -132,7 +132,7 @@ index df12dfb..759c475 100644
        grub_errno = GRUB_ERR_NONE;
      }
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index 2fd7831..cf6cd66 100644
+index a8502d9..ab78ca8 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -27,6 +27,9 @@
@@ -145,7 +145,7 @@ index 2fd7831..cf6cd66 100644
  
  /* Max digits for a char is 3 (0xFF is 255), similarly for an int it
     is sizeof (int) * 3, and one extra for a possible -ve sign.  */
-@@ -908,6 +911,10 @@ grub_script_execute_sourcecode (const char *source)
+@@ -877,6 +880,10 @@ grub_script_execute_sourcecode (const char *source)
    grub_err_t ret = 0;
    struct grub_script *parsed_script;
  

0003-Add-vlan-tag-support.patch

@@ -1,7 +1,7 @@
-From 2167cb5522467d3c51ced3a9f115a770b1242f5a Mon Sep 17 00:00:00 2001
+From 1ca05028fd97aff0bf06049340a7cc00c88ca442 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 30 Oct 2012 15:19:39 -0200
-Subject: [PATCH 09/85] Add vlan-tag support
+Subject: [PATCH 03/84] Add vlan-tag 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 but

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

@@ -1,7 +1,7 @@
-From 27230b0e8df443de67ca83508f6346ddbd947dd4 Mon Sep 17 00:00:00 2001
+From 5e9b9981b492b4e4fe57eb501315ea0e0ef9ce4f 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 10/85] Add %X option to printf functions.
+Subject: [PATCH 04/84] Add %X option to printf functions.
 
 ---
  grub-core/kern/misc.c | 7 +++++--

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

@@ -1,7 +1,7 @@
-From 6907d098d8bc7b11eef31579754c46adfcfcefa3 Mon Sep 17 00:00:00 2001
+From 49db632e0f365fe9da225729724aa33b2d82ca00 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 11/85] DHCP client ID and UUID options added.
+Subject: [PATCH 05/84] DHCP client ID and UUID options added.
 
 ---
  grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----

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

@@ -1,7 +1,7 @@
-From 8dca5cb3080944f363e5f4a8ef14aef99204bc92 Mon Sep 17 00:00:00 2001
+From 1308e8229fc47df1cdecac5949d886404ef87b47 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 14/85] Move bash completion script (#922997)
+Subject: [PATCH 06/84] Move bash completion script (#922997)
 
 Apparently these go in a new place now.
 ---

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

@@ -1,7 +1,7 @@
-From 6e0dd47fe5b4b7b25704fa0ebde930000d2614c9 Mon Sep 17 00:00:00 2001
+From f3ead07820e443965aac5e6b4bdf9bdc45263a50 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 15/85] for ppc, reset console display attr when clear screen
+Subject: [PATCH 07/84] for ppc, reset console display attr when clear screen
 
 This should fix this bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=908519

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

@@ -1,7 +1,7 @@
-From 988114091719c624869e62f71503c4d7dbd4e0f9 Mon Sep 17 00:00:00 2001
+From b595a4f859e7b69040421f2e782c7f0ec0c98345 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 24/85] Add support for UEFI operating systems returned by
+Subject: [PATCH 08/84] Add support for UEFI operating systems returned by
  os-prober
 
 os-prober returns UEFI operating systems in the form:

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

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

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

@@ -1,7 +1,7 @@
-From bd76326f1ef98c116fec2a85973ce8e905eeb0b2 Mon Sep 17 00:00:00 2001
+From 614d0110ecf477c183afd7de9d8ac9aa8755f259 Mon Sep 17 00:00:00 2001
 From: Marcel Kolaja <mkolaja@redhat.com>
 Date: Tue, 21 Jan 2014 10:57:08 -0500
-Subject: [PATCH 36/85] Honor a symlink when generating configuration by
+Subject: [PATCH 10/84] Honor a symlink when generating configuration by
  grub2-mkconfig
 
 Honor a symlink when generating configuration by grub2-mkconfig, so that

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

@@ -1,7 +1,7 @@
-From 5a9956933791fe61fe42177c2cd1744f197e6553 Mon Sep 17 00:00:00 2001
+From d0f918f39cc44c3e99697b3c6707c13412bd3f4b 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 43/85] trim arp packets with abnormal size
+Subject: [PATCH 11/84] 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.

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

@@ -1,7 +1,7 @@
-From dba27fd157c5d4e48f0ab264df894d1290aa6f43 Mon Sep 17 00:00:00 2001
+From 4fdc2c3e8d35d5d9afd0350478944b3c350dbdff Mon Sep 17 00:00:00 2001
 From: Prarit Bhargava <prarit@redhat.com>
 Date: Wed, 12 Mar 2014 10:58:16 -0400
-Subject: [PATCH 45/85] Fix bad test on GRUB_DISABLE_SUBMENU.
+Subject: [PATCH 12/84] Fix bad test on GRUB_DISABLE_SUBMENU.
 
 The file /etc/grub.d/10_linux does
 
@@ -20,10 +20,10 @@ Resolves: rhbz#1063414
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 3790ac0..a0e71fa 100644
+index 5a78513..6f835b7 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -259,7 +259,11 @@ while [ "x$list" != "x" ] ; do
+@@ -224,7 +224,11 @@ while [ "x$list" != "x" ] ; do
      linux_root_device_thisversion=${GRUB_DEVICE}
    fi
  

0013-Add-GRUB_DISABLE_UUID.patch

@@ -1,14 +1,12 @@
-From af746a8a6352386bd6c8cc1d8411afda445f287b Mon Sep 17 00:00:00 2001
+From 261fa3b929847823e865f23fdd8bbd6d7a2271aa Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 16:49:25 -0400
-Subject: [PATCH 53/85] Add GRUB_DISABLE_UUID.
+Subject: [PATCH 13/84] 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
 as it understands it.
 
-Good luck.
-
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  docs/grub.texi            |  7 +++++++
@@ -35,7 +33,7 @@ index 82f6fa4..98d4d0d 100644
  If graphical video support is required, either because the @samp{gfxterm}
  graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 41e6afe..23fc01f 100644
+index 4345ea7..e576c98 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -133,11 +133,11 @@ fi
@@ -75,7 +73,7 @@ index 41e6afe..23fc01f 100644
    GRUB_GFXMODE \
    GRUB_BACKGROUND \
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index bfd3017..10fabee 100644
+index 60b31ca..cf35e41 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -156,7 +156,7 @@ prepare_grub_to_access_device ()

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

@@ -1,7 +1,7 @@
-From 64fb594957bb9653d970f66909668f1a1806a982 Mon Sep 17 00:00:00 2001
+From 4261ea480b10ab6beab394fcaf12749164ce2fc5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 5 Sep 2014 10:07:04 -0400
-Subject: [PATCH 54/85] Allow "fallback" to include entries by title, not just
+Subject: [PATCH 14/84] Allow "fallback" to include entries by title, not just
  number.
 
 Resolves: rhbz#1026084
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 49 insertions(+), 27 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 89ced26..5b971b3 100644
+index 719e2fb..4fecc28 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -163,12 +163,35 @@ grub_menu_set_timeout (int timeout)

0015-Update-to-minilzo-2.08.patch

@@ -1,7 +1,7 @@
-From 0e65d77f65f9f34e47e0e6b70262ac1beb631b89 Mon Sep 17 00:00:00 2001
+From da7fd8c2503c4d5d5c605a5ff25fb50d30476f75 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Dec 2014 15:36:09 -0500
-Subject: [PATCH 58/85] Update to minilzo-2.08
+Subject: [PATCH 15/84] Update to minilzo-2.08
 
 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow
 

0016-Fix-bzr-s-ignore-artificats-in-.gitignore.patch

@@ -1,7 +1,7 @@
-From 100f813fe3ac0926fb5eb7c6f4e025a8beb7d23e Mon Sep 17 00:00:00 2001
+From 6d2c0321bbc530a3dff070c7555248cafa45a7e9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 7 Jul 2015 10:13:14 -0400
-Subject: [PATCH 60/85] Make .gitignore suck way less
+Subject: [PATCH 16/84] Fix bzr's ignore artificats in .gitignore
 
 We lost a man page because of incompatibilities between bzr's ignore
 system and .gitignore, so solve that slightly better.

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

@@ -1,7 +1,7 @@
-From 486b53b5102bd17df3e7d596c71eb3b275933ce8 Mon Sep 17 00:00:00 2001
+From 1424c8dbcd795da2f41aa588803dc808c78084d4 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Wed, 26 Feb 2014 21:49:12 -0500
-Subject: [PATCH 64/85] Make "exit" take a return code.
+Subject: [PATCH 17/84] 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
@@ -59,7 +59,7 @@ index a3a1182..b25ca4b 100644
  }
  
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 4026e81..0859910 100644
+index caf9bcc..101307f 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -155,11 +155,16 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)
@@ -125,7 +125,7 @@ index 271b6fb..9fafe98 100644
    /* We can't use grub_fatal() in this function.  This would create an infinite
       loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 8957374..8efa1a6 100644
+index 5fa26e1..8a3ecd5 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
 @@ -68,7 +68,7 @@ grub_addr_t grub_ieee1275_original_stack;

0018-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch

@@ -1,7 +1,7 @@
-From 6b45009679f9979bfaad78906e77439f7ef342d7 Mon Sep 17 00:00:00 2001
+From e406ca2c569d1910eedf58c5647d3a524a09a60e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 7 Jul 2015 12:04:28 -0400
-Subject: [PATCH 65/85] Add some __unused__ where gcc 5.x is more picky about
+Subject: [PATCH 18/84] Add some __unused__ where gcc 5.x is more picky about
  it.
 
 With some build flags, gcc 5.x throws more warnings about __unused__ not
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 1e5c21d..b22e1bc 100644
+index 4880cef..1b1986f 100644
 --- a/grub-core/gettext/gettext.c
 +++ b/grub-core/gettext/gettext.c
 @@ -434,7 +434,7 @@ static char *
@@ -25,8 +25,8 @@ index 1e5c21d..b22e1bc 100644
 +  grub_err_t __attribute__((__unused__)) err;
    err = grub_gettext_init_ext (&main_context, val, grub_env_get ("locale_dir"),
  			       grub_env_get ("prefix"));
- 
+   if (err)
-@@ -447,7 +447,7 @@ grub_gettext_env_write_lang (struct grub_env_var *var
+@@ -451,7 +451,7 @@ grub_gettext_env_write_lang (struct grub_env_var *var
  void
  grub_gettext_reread_prefix (const char *val)
  {
@@ -35,7 +35,7 @@ index 1e5c21d..b22e1bc 100644
    err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), 
  			       grub_env_get ("locale_dir"),
  			       val);
-@@ -457,7 +457,7 @@ static char *
+@@ -463,7 +463,7 @@ static char *
  read_main (struct grub_env_var *var
  	   __attribute__ ((unused)), const char *val)
  {
@@ -43,8 +43,8 @@ index 1e5c21d..b22e1bc 100644
 +  grub_err_t __attribute__((__unused__)) err;
    err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), val,
  			       grub_env_get ("prefix"));
-   return grub_strdup (val);
+   if (err)
-@@ -467,7 +467,7 @@ static char *
+@@ -475,7 +475,7 @@ static char *
  read_secondary (struct grub_env_var *var
  		__attribute__ ((unused)), const char *val)
  {
@@ -52,8 +52,8 @@ index 1e5c21d..b22e1bc 100644
 +  grub_err_t __attribute__((__unused__)) err;
    err = grub_gettext_init_ext (&secondary_context, grub_env_get ("lang"), val,
  			       0);
-   return grub_strdup (val);
+   if (err)
-@@ -489,7 +489,7 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
+@@ -500,7 +500,7 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
  GRUB_MOD_INIT (gettext)
  {
    const char *lang;
@@ -63,7 +63,7 @@ index 1e5c21d..b22e1bc 100644
    lang = grub_env_get ("lang");
  
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 5b971b3..e74cb56 100644
+index 4fecc28..73a94aa 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -829,7 +829,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -74,7 +74,7 @@ index 5b971b3..e74cb56 100644
 +notify_booting (grub_menu_entry_t __attribute__((unused)) entry,
  		void *userdata __attribute__((unused)))
  {
- #if 0
+   grub_printf ("  ");
 -- 
 2.5.0
 

0019-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch

@@ -1,7 +1,7 @@
-From f41e27f8935118dab7ebfbbb93af81069e42fee0 Mon Sep 17 00:00:00 2001
+From 12c7d6cbeb8bdf9e0c990315c414a98eb056efae Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 22 Jul 2015 11:21:01 -0400
-Subject: [PATCH 67/85] Mark po/exclude.pot as binary so git won't try to diff
+Subject: [PATCH 19/84] Mark po/exclude.pot as binary so git won't try to diff
  nonprintables.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0020-Make-efi-machines-load-an-env-block-from-a-variable.patch

@@ -1,7 +1,7 @@
-From 03055b5b837187a511d23bbfa1ad80cd5b7c1619 Mon Sep 17 00:00:00 2001
+From fedda3d4db2953b8e971bfb2fbffe7ef0c12a4bd Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 7 Dec 2015 14:20:49 -0500
-Subject: [PATCH 72/85] Make efi machines load an env block from a variable
+Subject: [PATCH 20/84] Make efi machines load an env block from a variable
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 1656c01..ac195d1 100644
+index 58b4208..f8d4634 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -173,6 +173,7 @@ kernel = {

0021-Failed-config-now-returns-exit-code-1252311.patch

@@ -1,7 +1,7 @@
-From 4c8dba66554a0b7029270220a2b99d9fdd607560 Mon Sep 17 00:00:00 2001
+From f2ca800cfbbab4f59394a9f8304e74257d789a76 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Fri, 29 Jan 2016 14:49:24 -0500
-Subject: [PATCH 76/85] Failed config now returns exit code (#1252311)
+Subject: [PATCH 21/84] Failed config now returns exit code (#1252311)
 
 Grub would notify the user if the new config was invalid, however, it
 did not exit properly with exit code 1. Added the proper exit code.
@@ -12,10 +12,10 @@ Resolves: rhbz#1252311
  1 file changed, 1 insertion(+)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 54732a2..73a18f7 100644
+index e576c98..c088b70 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -284,6 +284,7 @@ Ensure that there are no errors in /etc/default/grub
+@@ -281,6 +281,7 @@ Ensure that there are no errors in /etc/default/grub
  and /etc/grub.d/* files or please file a bug report with
  %s file attached." "${grub_cfg}.new" >&2
      echo >&2

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

@@ -1,7 +1,7 @@
-From 16e9a0054a4e0b4238a7172a1731658d3407de0e Mon Sep 17 00:00:00 2001
+From e36c06dd35d09e97033fcacd5cfb61b54031555c 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 01/85] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 22/84] 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.

0023-Add-fw_path-variable-revised.patch

@@ -1,7 +1,7 @@
-From f8ca3a65c0d5095421b1924cc4e2c7a114d340b8 Mon Sep 17 00:00:00 2001
+From d90a70f58ecafc5e6da157345d35ccf68c207c14 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 02/85] Add fw_path variable (revised)
+Subject: [PATCH 23/84] 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
@@ -41,10 +41,10 @@ index 9cad0c4..8ab7794 100644
      }
  
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 78a70a8..df12dfb 100644
+index 249e19b..759c475 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -319,7 +319,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+@@ -338,7 +338,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
        /* Guess the config filename. It is necessary to make CONFIG static,
  	 so that it won't get broken by longjmp.  */
        char *config;

0024-Add-support-for-linuxefi.patch

@@ -1,7 +1,7 @@
-From 99cd396f6ea153326a77369decf679d8453f0058 Mon Sep 17 00:00:00 2001
+From 2e9bdf8a9adcfa26e3bd7bce548c104f220fea6a Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Tue, 10 Jul 2012 11:58:52 -0400
-Subject: [PATCH 03/85] Add support for linuxefi
+Subject: [PATCH 24/84] Add support for linuxefi
 
 ---
  grub-core/Makefile.core.def       |   8 +
@@ -13,10 +13,10 @@ Subject: [PATCH 03/85] Add support for linuxefi
  create mode 100644 grub-core/loader/i386/efi/linux.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 58b4208..2344a5e 100644
+index f8d4634..de8c9df 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -1731,6 +1731,14 @@ module = {
+@@ -1732,6 +1732,14 @@ module = {
  };
  
  module = {

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

@@ -1,14 +1,14 @@
-From dab2b4ed1807414a40e10c6176c7cdcd387269f7 Mon Sep 17 00:00:00 2001
+From 013c6c89d03cb409b6aaad53ff76d24493246487 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 16 Jul 2012 18:57:11 -0400
-Subject: [PATCH 04/85] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 25/84] Use "linuxefi" and "initrdefi" where appropriate.
 
 ---
  util/grub.d/10_linux.in | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 5a78513..ef9e103 100644
+index 6f835b7..c41a9ca 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -129,17 +129,31 @@ linux_entry ()

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

@@ -1,7 +1,7 @@
-From 29846060c0c3f42df442b18d1c19e4975760c0b9 Mon Sep 17 00:00:00 2001
+From 267a3758a50f99929058af3addd071cac40869dd Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 23 Oct 2012 10:40:49 -0400
-Subject: [PATCH 05/85] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 26/84] Don't allow insmod when secure boot is enabled.
 
 Hi,
 
@@ -62,10 +62,10 @@ index e394cd9..04e804d 100644
  
    file = grub_file_open (filename);
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index caf9bcc..4026e81 100644
+index 101307f..0859910 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -264,6 +264,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
+@@ -269,6 +269,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
    return NULL;
  }
  

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

@@ -1,7 +1,7 @@
-From fc4c2701e620c8b72ff13acde949d5718976259b Mon Sep 17 00:00:00 2001
+From 982930404b790cfb35bd5f29ce1ba0c708fc0051 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 06/85] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 27/84] Pass "\x[[:hex:]][[:hex:]]" straight through
  unmolested.
 
 ---
@@ -104,10 +104,10 @@ index d5e10ee..0a5b2af 100644
  
  	  *buf++ = *c;
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index a8502d9..2fd7831 100644
+index ab78ca8..cf6cd66 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
-@@ -52,6 +52,12 @@ static struct grub_script_scope *scope = 0;
+@@ -55,6 +55,12 @@ static struct grub_script_scope *scope = 0;
  /* Wildcard translator for GRUB script.  */
  struct grub_script_wildcard_translator *grub_wildcard_translator;
  
@@ -120,7 +120,7 @@ index a8502d9..2fd7831 100644
  static char*
  wildcard_escape (const char *s)
  {
-@@ -68,7 +74,15 @@ wildcard_escape (const char *s)
+@@ -71,7 +77,15 @@ wildcard_escape (const char *s)
    i = 0;
    while ((ch = *s++))
      {
@@ -137,7 +137,7 @@ index a8502d9..2fd7831 100644
  	p[i++] = '\\';
        p[i++] = ch;
      }
-@@ -92,7 +106,14 @@ wildcard_unescape (const char *s)
+@@ -95,7 +109,14 @@ wildcard_unescape (const char *s)
    i = 0;
    while ((ch = *s++))
      {
@@ -153,7 +153,7 @@ index a8502d9..2fd7831 100644
  	p[i++] = *s++;
        else
  	p[i++] = ch;
-@@ -394,10 +415,20 @@ parse_string (const char *str,
+@@ -397,10 +418,20 @@ parse_string (const char *str,
      switch (*ptr)
        {
        case '\\':

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

@@ -1,7 +1,7 @@
-From effaaa4ab3cf09f93b124a6242a52f911a9b08b0 Mon Sep 17 00:00:00 2001
+From 0e7f063c273be8b13c259824c3d660232def40a4 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 12/85] Search for specific config file for netboot
+Subject: [PATCH 28/84] 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:

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

@@ -1,7 +1,7 @@
-From ac6b510c9866cede4aa01e61f1714aba3330019f Mon Sep 17 00:00:00 2001
+From a0e15f6d86f9c21e2c0f9233f3ba43d7a861d3f1 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 13/85] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 29/84] blscfg: add blscfg module to parse Boot Loader
  Specification snippets
 
 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
@@ -21,10 +21,10 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
  create mode 100644 grub-core/commands/blscfg.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 2344a5e..8dc731e 100644
+index de8c9df..e79bb0c 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -740,6 +740,14 @@ module = {
+@@ -741,6 +741,14 @@ module = {
  };
  
  module = {

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

@@ -1,7 +1,7 @@
-From 1308677f1bca7991a62be27e90a29915b947c6cc Mon Sep 17 00:00:00 2001
+From 9e287ef25f7a64c356984b21b0812aab735ca9e9 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 16/85] Don't write messages to the screen
+Subject: [PATCH 30/84] 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
@@ -45,11 +45,11 @@ index 1ee4cf5..c8b87ed 100644
  	movw	$LOCAL(firstlist), %di
  
 diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 4880cef..1e5c21d 100644
+index 1b1986f..b22e1bc 100644
 --- a/grub-core/gettext/gettext.c
 +++ b/grub-core/gettext/gettext.c
 @@ -437,13 +437,9 @@ grub_gettext_env_write_lang (struct grub_env_var *var
-   grub_err_t err;
+   grub_err_t __attribute__((__unused__)) err;
    err = grub_gettext_init_ext (&main_context, val, grub_env_get ("locale_dir"),
  			       grub_env_get ("prefix"));
 -  if (err)
@@ -72,7 +72,7 @@ index 4880cef..1e5c21d 100644
  
  static char *
 @@ -466,8 +460,6 @@ read_main (struct grub_env_var *var
-   grub_err_t err;
+   grub_err_t __attribute__((__unused__)) err;
    err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), val,
  			       grub_env_get ("prefix"));
 -  if (err)
@@ -81,7 +81,7 @@ index 4880cef..1e5c21d 100644
  }
  
 @@ -478,9 +470,6 @@ read_secondary (struct grub_env_var *var
-   grub_err_t err;
+   grub_err_t __attribute__((__unused__)) err;
    err = grub_gettext_init_ext (&secondary_context, grub_env_get ("lang"), val,
  			       0);
 -  if (err)
@@ -120,7 +120,7 @@ index 8ab7794..da47b18 100644
  
    grub_boot_time ("Before loading embedded modules.");
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index ef9e103..f09011f 100644
+index c41a9ca..74f5f29 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -128,29 +128,22 @@ linux_entry ()

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

@@ -1,7 +1,7 @@
-From b7171d2b3f9109b0e63f374bc612587f053bc1c6 Mon Sep 17 00:00:00 2001
+From 55b0cc68bae2139c6ec5c7a51310f6e564b14b21 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 17/85] Don't print GNU GRUB header
+Subject: [PATCH 31/84] Don't print GNU GRUB header
 
 No one cares.
 ---

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

@@ -1,7 +1,7 @@
-From a2c0cf22de0845e951ec52d39cbc83465523c7cf Mon Sep 17 00:00:00 2001
+From 224e0a50040de66ac6c6b4295a47300e81c864fd 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 18/85] Don't add '*' to highlighted row
+Subject: [PATCH 32/84] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---

0033-Message-string-cleanups.patch

@@ -1,7 +1,7 @@
-From 6947454763fb5d3ab6b49528532dbe28c0263c15 Mon Sep 17 00:00:00 2001
+From 312b476b9c86b81daf224fce1c39012e6f1f6fd3 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 19/85] Message string cleanups
+Subject: [PATCH 33/84] Message string cleanups
 
 Make use of terminology consistent. Remove jargon.
 ---

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

@@ -1,7 +1,7 @@
-From 1f3200c3c71179ad7f7b17750bafc83a7241f170 Mon Sep 17 00:00:00 2001
+From 0ba4fd0deb1e6a4f8371755d4a114f73135b6f1a 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 20/85] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 34/84] Fix border spacing now that we aren't displaying it
 
 ---
  grub-core/normal/menu_text.c | 6 +++---

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

@@ -1,7 +1,7 @@
-From 9d5eee2350a4897ea27986b6de49cbfadf601ec1 Mon Sep 17 00:00:00 2001
+From d3e6135ee27820422710c33f04a818629da5d173 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 21/85] Use the correct indentation for the term help text
+Subject: [PATCH 35/84] Use the correct indentation for the term help text
 
 That is consistent with the menu help text
 ---

0036-Indent-menu-entries.patch

@@ -1,7 +1,7 @@
-From afb126ce795d0e8a3563fbe650d98e764c76e48e Mon Sep 17 00:00:00 2001
+From 3fd8f20e8c10cddd2bbafc1813214baa347c5180 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 22/85] Indent menu entries
+Subject: [PATCH 36/84] Indent menu entries
 
 ---
  grub-core/normal/menu_text.c | 3 ++-

0037-Fix-margins.patch

@@ -1,7 +1,7 @@
-From 351634e72bf586f8b32d0cd51bc046c11fa6faf1 Mon Sep 17 00:00:00 2001
+From a218713b98a679f13dcd64d3862c3a73cb904f89 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 23/85] Fix margins
+Subject: [PATCH 37/84] Fix margins
 
 ---
  grub-core/normal/menu_text.c | 8 +++-----

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

@@ -1,7 +1,7 @@
-From 0aad785ba452e8b07def0d7af4536e4db3a43e3f Mon Sep 17 00:00:00 2001
+From 5c4c01af03cc066441971d55949867773478764b Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 26/85] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 38/84] Use -2 instead of -1 for our right-hand margin, so
  linewrapping works (#976643).
 
 Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>

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

@@ -1,7 +1,7 @@
-From 7ee9874ed9efbe050ee4c17782b7c716fffd2c35 Mon Sep 17 00:00:00 2001
+From e41a76897d0af0250e5a7da4cc88da07156320c4 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:05:07 -0400
-Subject: [PATCH 27/85] Use linux16 when appropriate (#880840)
+Subject: [PATCH 39/84] Use linux16 when appropriate (#880840)
 
 The kernel group really would prefer that we use the 16 bit entry point
 on x86 bios machines.
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index f09011f..c425c90 100644
+index 74f5f29..5b49dcb 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -76,6 +76,11 @@ linux_entry ()

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

@@ -1,7 +1,7 @@
-From af60ead60d46234b1392561c88622aa4fcc04557 Mon Sep 17 00:00:00 2001
+From 62eed7a3cb99c04a303aff796d10fd0fe660dab9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 28/85] Enable pager by default. (#985860)
+Subject: [PATCH 40/84] Enable pager by default. (#985860)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

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

@@ -1,7 +1,7 @@
-From a0b51a60c9a47e9e0dc1c8b0e39a0e96ad7152eb Mon Sep 17 00:00:00 2001
+From 3f53f8ca96c9da0847d772e9a7a3074917caefac Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH 29/85] F10 doesn't work on serial, so don't tell the user to
+Subject: [PATCH 41/84] F10 doesn't work on serial, so don't tell the user to
  hit it (#987443)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

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

@@ -1,7 +1,7 @@
-From 22b6e282c8b2efb1cfafd465f7c1fbf0d14e7bb8 Mon Sep 17 00:00:00 2001
+From b3cb39e03253a964b07176c386d582e3f58cf8ac Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH 30/85] Don't say "GNU/Linux" in generated menus.
+Subject: [PATCH 42/84] Don't say "GNU/Linux" in generated menus.
 
 ---
  util/grub.d/10_linux.in     | 4 ++--
@@ -9,7 +9,7 @@ Subject: [PATCH 30/85] Don't say "GNU/Linux" in generated menus.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index c425c90..ef8a1ce 100644
+index 5b49dcb..d54b982 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"

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

@@ -1,7 +1,7 @@
-From 99ebf4c934795523601c232f8df39aa79e515fdb Mon Sep 17 00:00:00 2001
+From 55b55f9ce4b36217a57847b20df6ebb53d0c739f 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 31/85] Don't draw a border around the menu
+Subject: [PATCH 43/84] Don't draw a border around the menu
 
 It looks cleaner without it.
 ---

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

@@ -1,7 +1,7 @@
-From 78fe38273f3f442960788bda46a9411cf503da31 Mon Sep 17 00:00:00 2001
+From 53ca27b6d4ecdbe22925f5d0413880f3354397ec 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 32/85] Use the standard margin for the timeout string
+Subject: [PATCH 44/84] Use the standard margin for the timeout string
 
 So that it aligns with the other messages
 ---

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

@@ -1,7 +1,7 @@
-From 9076aa39f53beb88021bfcaf671d408379febc51 Mon Sep 17 00:00:00 2001
+From d6171073d7ebaee23fce165808d9337cd66ca4ea 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 33/85] Add .eh_frame to list of relocations stripped
+Subject: [PATCH 45/84] Add .eh_frame to list of relocations stripped
 
 ---
  conf/Makefile.common | 2 +-

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

@@ -1,7 +1,7 @@
-From 824e31316af5b80eef23af79b4059a7c9cca855a Mon Sep 17 00:00:00 2001
+From 9581b69e619131f3d602284c62733c18678fcdaf Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 13:12:23 -0500
-Subject: [PATCH 34/85] Make 10_linux work with our changes for linux16 and
+Subject: [PATCH 46/84] Make 10_linux work with our changes for linux16 and
  linuxefi on aarch64
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 28 insertions(+), 3 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index ef8a1ce..6c6a2c6 100644
+index d54b982..ab9d32d 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -77,8 +77,18 @@ linux_entry ()

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

@@ -1,7 +1,7 @@
-From 7e13f9c3289f17407e5fab95d123bc7e3af4f75b Mon Sep 17 00:00:00 2001
+From 78e9fe794063875149b9e4105520423d6d3c6f8c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 16:15:46 -0500
-Subject: [PATCH 35/85] Don't print during fdt loading method.
+Subject: [PATCH 47/84] Don't print during fdt loading method.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 6c6a2c6..652ecc6 100644
+index ab9d32d..04179d9 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -164,9 +164,7 @@ EOF

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

@@ -1,7 +1,7 @@
-From 7bd90fb60f66078c445c7f72f7df67957828d6c9 Mon Sep 17 00:00:00 2001
+From 3b37d2e328e221e81422370194a8ce1e0a5a932b 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 37/85] Don't munge raw spaces when we're doing our cmdline
+Subject: [PATCH 48/84] Don't munge raw spaces when we're doing our cmdline
  escaping (#923374)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

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

@@ -1,7 +1,7 @@
-From 34d870669e636f9261233d52605129e1672f966b Mon Sep 17 00:00:00 2001
+From 8fac789837a84b4b12446e8f79540edf4f49624a Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 11 Feb 2014 11:14:50 -0500
-Subject: [PATCH 38/85] Don't require a password to boot entries generated by
+Subject: [PATCH 49/84] 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.
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 652ecc6..3790ac0 100644
+index 04179d9..a0e71fa 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -26,7 +26,7 @@ datarootdir="@datarootdir@"

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

@@ -1,7 +1,7 @@
-From 5602e9afce77560ca22de1cbf96e2382b38d2d90 Mon Sep 17 00:00:00 2001
+From b14b8ac1abe0e8ba94ba7044186ad56bb5991271 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 09:37:49 -0500
-Subject: [PATCH 39/85] Don't emit "Booting ..." message.
+Subject: [PATCH 50/84] Don't emit "Booting ..." message.
 
 UI team still hates this stuff, so we're disabling it for RHEL 7.
 
@@ -14,11 +14,11 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 719e2fb..89ced26 100644
+index 73a94aa..e74cb56 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
-@@ -810,9 +810,11 @@ static void
+@@ -832,9 +832,11 @@ static void
- notify_booting (grub_menu_entry_t entry,
+ notify_booting (grub_menu_entry_t __attribute__((unused)) entry,
  		void *userdata __attribute__((unused)))
  {
 +#if 0

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

@@ -1,7 +1,7 @@
-From bbb23572730f4032f779ef368972461c272f7434 Mon Sep 17 00:00:00 2001
+From 351b9c107d1d15609cb53621ad9082b4632b26d8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 4 Mar 2014 11:00:23 -0500
-Subject: [PATCH 40/85] Replace a lot of man pages with slightly nicer ones.
+Subject: [PATCH 51/84] Replace a lot of man pages with slightly nicer ones.
 
 Replace a bunch of machine generated ones with ones that look nicer.
 ---

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

@@ -1,7 +1,7 @@
-From 8ac4eca0dbda31022f7e0851278dc827d1e9e002 Mon Sep 17 00:00:00 2001
+From fd6c7a8709a23d6a4b8f942851d9f5795306807c 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 41/85] use fw_path prefix when fallback searching for grub
+Subject: [PATCH 52/84] use fw_path prefix when fallback searching for grub
  config
 
 When PXE booting via UEFI firmware, grub was searching for grub.cfg

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

@@ -1,7 +1,7 @@
-From 6848f121f4e49661b7781a2281ac25e0719580bf Mon Sep 17 00:00:00 2001
+From ab6933e395beb44f75ed0a451e5036ac8c93f2d9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 6 Mar 2014 11:51:33 -0500
-Subject: [PATCH 42/85] Try mac/guid/etc before grub.cfg on tftp config files.
+Subject: [PATCH 53/84] Try mac/guid/etc before grub.cfg on tftp config files.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

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

@@ -1,7 +1,7 @@
-From 3c13b6b0e01eccc2f757283e56f8fa52c89a4dfa Mon Sep 17 00:00:00 2001
+From af87ce308a376abc81477977292c0afd9ea01f7a Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 11:34:00 -0500
-Subject: [PATCH 44/85] Fix convert function to support NVMe devices
+Subject: [PATCH 54/84] 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

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

@@ -1,7 +1,7 @@
-From 1cd2712d87952f48666ab1a309c8f58d0aa3cedf Mon Sep 17 00:00:00 2001
+From 50700eb3761e442dd7a569ad04165fd42d266298 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 46/85] Switch to use APM Mustang device tree, for hardware
+Subject: [PATCH 55/84] Switch to use APM Mustang device tree, for hardware
  testing.
 
 Signed-off-by: David A. Marlin <d.marlin@redhat.com>

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

@@ -1,7 +1,7 @@
-From 49a6a25e62a91c5ce5d61db8e6696fda42af1874 Mon Sep 17 00:00:00 2001
+From 48d90a9f4fcfcf1e3de386d23955a4beaff22858 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 47/85] Use the default device tree from the grub default file
+Subject: [PATCH 56/84] Use the default device tree from the grub default file
 
 instead of hardcoding a value.
 
@@ -12,10 +12,10 @@ Signed-off-by: David A. Marlin <dmarlin@redhat.com>
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 4345ea7..41e6afe 100644
+index c088b70..9d595ac 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -227,7 +227,8 @@ export GRUB_DEFAULT \
+@@ -235,7 +235,8 @@ export GRUB_DEFAULT \
    GRUB_ENABLE_CRYPTODISK \
    GRUB_BADRAM \
    GRUB_OS_PROBER_SKIP_LIST \

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

@@ -1,7 +1,7 @@
-From dd4e42e6b7f48e1fa535abba7ec18b827ab80a68 Mon Sep 17 00:00:00 2001
+From a889c7d2955b5afe2decc5f80e527d26b14eaedf 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 48/85] reopen SNP protocol for exclusive use by grub
+Subject: [PATCH 57/84] reopen SNP protocol for exclusive use by grub
 
 ---
  grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++

0058-Add-grub_util_readlink.patch

@@ -1,7 +1,7 @@
-From bae6e629b42cad8f456456cfd75f8d8af1a7185b Mon Sep 17 00:00:00 2001
+From a8b13c9b971ef22ba2f5b2ac5d23719d2224d3b2 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Sep 2014 10:01:03 -0400
-Subject: [PATCH 49/85] Add grub_util_readlink()
+Subject: [PATCH 58/84] 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

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

@@ -1,7 +1,7 @@
-From 77b1c342b0a8f471ed71a8be7f098d52f7ea2e72 Mon Sep 17 00:00:00 2001
+From 69f0407fa1d49c7fe7bfadc65c42eaadf03717c5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Sep 2014 10:38:00 -0400
-Subject: [PATCH 50/85] Make editenv chase symlinks including those across
+Subject: [PATCH 59/84] Make editenv chase symlinks including those across
  devices.
 
 This lets us make /boot/grub2/grubenv a symlink to

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

@@ -1,7 +1,7 @@
-From afd6af27e20cff7bab17e0c614fc18a2a622a909 Mon Sep 17 00:00:00 2001
+From ac24e029b2ec0ef213fe3c061ede46c7f84baa96 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 14:23:23 -0400
-Subject: [PATCH 51/85] Generate OS and CLASS in 10_linux from /etc/os-release
+Subject: [PATCH 60/84] Generate OS and CLASS in 10_linux from /etc/os-release
 
 This makes us use pretty names in the titles we generate in
 grub2-mkconfig when GRUB_DISTRIBUTOR isn't set.

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

@@ -1,7 +1,7 @@
-From 0abe2d18fd2924abb9445fbe8e5c51a86176403b Mon Sep 17 00:00:00 2001
+From c569bfac13a99b1eaab1fe5c2a7d9d190839c439 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 15:52:08 -0400
-Subject: [PATCH 52/85] Minimize the sort ordering for .debug and -rescue-
+Subject: [PATCH 61/84] Minimize the sort ordering for .debug and -rescue-
  kernels.
 
 Resolves: rhbz#1065360
@@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 60b31ca..bfd3017 100644
+index cf35e41..10fabee 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -248,6 +248,14 @@ version_test_gt ()

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

@@ -1,7 +1,7 @@
-From 07ed07a3184330f59264d325460857cd32f544c5 Mon Sep 17 00:00:00 2001
+From b0a16f0d97268e8b5a36419005697cce30d29a71 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 18 Sep 2014 11:26:14 -0400
-Subject: [PATCH 55/85] Load arm with SB enabled.
+Subject: [PATCH 62/84] 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.)
@@ -21,10 +21,10 @@ is enabled.
  create mode 100644 include/grub/efi/linux.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 8dc731e..94567da 100644
+index e79bb0c..7fba196 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -1675,6 +1675,8 @@ module = {
+@@ -1676,6 +1676,8 @@ module = {
    ia64_efi = loader/ia64/efi/linux.c;
    arm = loader/arm/linux.c;
    arm64 = loader/arm64/linux.c;
@@ -33,7 +33,7 @@ index 8dc731e..94567da 100644
    common = loader/linux.c;
    common = lib/cmdline.c;
    enable = noemu;
-@@ -1742,6 +1744,7 @@ module = {
+@@ -1743,6 +1745,7 @@ module = {
    name = linuxefi;
    efi = loader/i386/efi/linux.c;
    efi = lib/cmdline.c;

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

@@ -1,7 +1,7 @@
-From eb937ec97d488c88aa5d4e00761655a5e518c450 Mon Sep 17 00:00:00 2001
+From bb05ed28974e747b7efbad5fd72f972f8980f9d2 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 3 Oct 2014 11:08:03 -0400
-Subject: [PATCH 56/85] Try $prefix if $fw_path doesn't work.
+Subject: [PATCH 63/84] Try $prefix if $fw_path doesn't work.
 
 Related: rhbz#1148652
 
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  3 files changed, 75 insertions(+), 75 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 5fa26e1..8957374 100644
+index 8a3ecd5..8efa1a6 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
 @@ -139,23 +139,25 @@ grub_machine_get_bootlocation (char **device, char **path)

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

@@ -1,7 +1,7 @@
-From 583ace7292d12265b3a44db4190a30757843ff71 Mon Sep 17 00:00:00 2001
+From 44253fdc11a62ee9f3562a4da65f28b777fdc428 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 27 Oct 2014 09:22:55 -0400
-Subject: [PATCH 57/85] Try to emit linux16/initrd16 and linuxefi/initrdefi in
+Subject: [PATCH 64/84] Try to emit linux16/initrd16 and linuxefi/initrdefi in
  30-os_prober.
 
 Resolves: rhbz#1108296

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
-From 7c9fa22a1e2833f8c8fbee216476a432e7e42361 Mon Sep 17 00:00:00 2001
+From af1ed7aa16460f8a04a2077604af50b94cfad675 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Thu, 25 Jun 2015 11:13:11 -0400
-Subject: [PATCH 63/85] Add friendly grub2 password config tool (#985962)
+Subject: [PATCH 68/84] 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
@@ -77,7 +77,7 @@ index 127d91d..d6ef6c3 100644
  grub_TRANSFORM([grub-script-check])
  grub_TRANSFORM([grub-set-default])
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 23fc01f..435c1cd 100644
+index 9d595ac..fb87247 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -263,6 +263,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
@@ -91,7 +91,7 @@ index 23fc01f..435c1cd 100644
          echo
 diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
 new file mode 100644
-index 0000000..5973abe
+index 0000000..49200a8
 --- /dev/null
 +++ b/util/grub-setpassword.8
 @@ -0,0 +1,28 @@
@@ -106,7 +106,7 @@ index 0000000..5973abe
 +\fBgrub-setpassword\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user.
 +
 +The file has the format:
-+GRUB_2PASSWORD=<\fIhashed password\fR>.
++GRUB2_PASSWORD=<\fIhashed password\fR>.
 +
 +.SH OPTIONS
 +.TP
@@ -254,7 +254,7 @@ index 0000000..dd76f00
 +echo "GRUB2_PASSWORD=${MYPASS}" > "${grubdir}/user.cfg"
 diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in
 new file mode 100644
-index 0000000..facd409
+index 0000000..db2f44b
 --- /dev/null
 +++ b/util/grub.d/01_users.in
 @@ -0,0 +1,11 @@
@@ -262,7 +262,7 @@ index 0000000..facd409
 +cat << EOF
 +if [ -f \${prefix}/user.cfg ]; then
 +  source \${prefix}/user.cfg
-+  if [ -n \${GRUB2_PASSWORD} ]; then
++  if [ -n "\${GRUB2_PASSWORD}" ]; then
 +    set superusers="root"
 +    export superusers
 +    password_pbkdf2 root \${GRUB2_PASSWORD}

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

@@ -1,7 +1,7 @@
-From 2fcb75d742dda22a51b7f0e6b766dcf6d20d8633 Mon Sep 17 00:00:00 2001
+From 3b25f843202bbb072ec23c9b1d24c564dcb5fff4 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 14 Jul 2015 16:58:51 -0700
-Subject: [PATCH 66/85] Fix race in EFI validation
+Subject: [PATCH 69/84] Fix race in EFI validation
 
 ---
  grub-core/loader/i386/efi/linux.c | 44 ++++++++++-----------------------------

0070-ppc64le-sync-mkconfig-to-disk-1212114.patch

@@ -1,7 +1,7 @@
-From fab623aa983f7e713cb27024935191a57c164840 Mon Sep 17 00:00:00 2001
+From f62935eb77295a0c5f8bc4859a309366df8fd0b2 Mon Sep 17 00:00:00 2001
 From: Don Zickus <dzickus@redhat.com>
 Date: Wed, 22 Jul 2015 13:59:55 -0400
-Subject: [PATCH 68/85] ppc64le sync mkconfig to disk (#1212114)
+Subject: [PATCH 70/84] ppc64le sync mkconfig to disk (#1212114)
 
 If creating a new grub2 entry using grub2-mkconfig, the entry is not
 immediately sync'd to disk.  If a crash happens before the writeback,
@@ -21,10 +21,10 @@ Resolves: rhbz#1212114
  1 file changed, 9 insertions(+)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 435c1cd..54732a2 100644
+index fb87247..73a18f7 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -293,3 +293,12 @@ fi
+@@ -294,3 +294,12 @@ fi
  
  gettext "done" >&2
  echo >&2

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

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

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

@@ -1,7 +1,7 @@
-From 91d8a0c1767a892e7c73330ca018fbde0a7d2a8e Mon Sep 17 00:00:00 2001
+From f5ce2cd7edc832cb87a7b937918fedd52b84a5d7 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 13:04:37 -0400
-Subject: [PATCH 70/85] Add secureboot support on efi chainloader
+Subject: [PATCH 72/84] 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

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

@@ -1,7 +1,7 @@
-From f42d408e388e3e18da3ca17e0e88d08e8ee2260d Mon Sep 17 00:00:00 2001
+From ebab909a3a310e70db12c1ee2e9c41708b07ef53 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 16:09:25 -0400
-Subject: [PATCH 71/85] Make any of the loaders that link in efi mode honor
+Subject: [PATCH 73/84] 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
@@ -41,10 +41,10 @@ index 04e9395..fd715a8 100644
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 94567da..1656c01 100644
+index 7fba196..ac195d1 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -177,6 +177,7 @@ kernel = {
+@@ -178,6 +178,7 @@ kernel = {
    i386_multiboot = kern/i386/pc/acpi.c;
    i386_coreboot = kern/acpi.c;
    i386_multiboot = kern/acpi.c;

0074-01_users-Handle-GRUB_PASSWORD-better.patch

@@ -1,44 +0,0 @@
-From f415b6a5a0fe2a40f24435275fa30f146579928f Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Fri, 4 Dec 2015 09:28:38 -0500
-Subject: [PATCH 74/85] 01_users: Handle GRUB_PASSWORD better.
-
-Only handle GRUB2_PASSWORD not GRUB_PASSWORD.
-
-Related: rhbz#1284370
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- util/grub-setpassword.8 | 2 +-
- util/grub.d/01_users.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
-index 5973abe..49200a8 100644
---- a/util/grub-setpassword.8
-+++ b/util/grub-setpassword.8
-@@ -9,7 +9,7 @@
- \fBgrub-setpassword\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user.
- 
- The file has the format:
--GRUB_2PASSWORD=<\fIhashed password\fR>.
-+GRUB2_PASSWORD=<\fIhashed password\fR>.
- 
- .SH OPTIONS
- .TP
-diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in
-index facd409..db2f44b 100644
---- a/util/grub.d/01_users.in
-+++ b/util/grub.d/01_users.in
-@@ -2,7 +2,7 @@
- cat << EOF
- if [ -f \${prefix}/user.cfg ]; then
-   source \${prefix}/user.cfg
--  if [ -n \${GRUB2_PASSWORD} ]; then
-+  if [ -n "\${GRUB2_PASSWORD}" ]; then
-     set superusers="root"
-     export superusers
-     password_pbkdf2 root \${GRUB2_PASSWORD}
--- 
-2.5.0
-

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

@@ -1,7 +1,7 @@
-From 74d97a32e6a70d8083a53b85e4669f920a133b32 Mon Sep 17 00:00:00 2001
+From 01eb7229096581909923b3bbddc5f96102444ac7 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 73/85] Fix security issue when reading username and password
+Subject: [PATCH 74/84] Fix security issue when reading username and password
 
   This patch fixes two integer underflows at:
     * grub-core/lib/crypto.c

0075-Make-grub_fatal-also-backtrace.patch

@@ -1,7 +1,7 @@
-From 5154ca6af1dd682b7ab8e92b156d5256b27bed77 Mon Sep 17 00:00:00 2001
+From 2666d3d99c3d979625c28655165195177bc2290c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 27 Jan 2016 09:22:42 -0500
-Subject: [PATCH 75/85] Make grub_fatal() also backtrace.
+Subject: [PATCH 75/84] Make grub_fatal() also backtrace.
 
 ---
  grub-core/Makefile.core.def     |  3 ++

0076-Core-TPM-support.patch

@@ -1,7 +1,7 @@
-From 771a1c4dd99ba4cc6ae6fb980c173f8933752a65 Mon Sep 17 00:00:00 2001
+From f594712a6e917c80885a4e5e2a0768b46d005958 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 14 Jul 2015 17:06:35 -0700
-Subject: [PATCH 77/85] Core TPM support
+Subject: [PATCH 76/84] Core TPM support
 
 Add support for performing basic TPM measurements. Right now this only
 supports extending PCRs statically and only on UEFI and BIOS systems, but

0077-Measure-kernel-initrd.patch

@@ -1,7 +1,7 @@
-From 15861b92def9c82f505580b40049365952ea3f83 Mon Sep 17 00:00:00 2001
+From c999c6130354e7aced8ebf485172c593ff034d81 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Thu, 16 Jul 2015 15:22:34 -0700
-Subject: [PATCH 78/85] Measure kernel + initrd
+Subject: [PATCH 77/84] Measure kernel + initrd
 
 Measure the kernel and initrd when loaded on UEFI systems
 ---

0078-Add-BIOS-boot-measurement.patch

@@ -1,7 +1,7 @@
-From 7c80ec2e9a3beea04cc00ebf1fbbaa5f947f0388 Mon Sep 17 00:00:00 2001
+From 6715108eb5adec502b896feaca8997f841dcd335 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 15:48:51 -0700
-Subject: [PATCH 79/85] Add BIOS boot measurement
+Subject: [PATCH 78/84] Add BIOS boot measurement
 
 Measure the on-disk grub core on BIOS systems - unlike UEFI, the firmware
 can't do this stage for us.

0079-Rework-linux-command.patch

@@ -1,7 +1,7 @@
-From 600a01418498f09223aed5ebc693c941f4e7b049 Mon Sep 17 00:00:00 2001
+From ab08a3276ddccf99d51d57dca812e09618980828 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:12:39 -0700
-Subject: [PATCH 80/85] Rework linux command
+Subject: [PATCH 79/84] 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

0080-Rework-linux16-command.patch

@@ -1,7 +1,7 @@
-From 1f01062c05e9c86cbc5a01432a2a7293edfd30b6 Mon Sep 17 00:00:00 2001
+From 5440a125f295287f6fb998b7cecf6fd02712510d Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:20:58 -0700
-Subject: [PATCH 81/85] Rework linux16 command
+Subject: [PATCH 80/84] 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

0081-Measure-kernel-and-initrd-on-BIOS-systems.patch

@@ -1,7 +1,7 @@
-From 16e2e25c137c69a46d82b6d7a3fe540ec5a2cbc4 Mon Sep 17 00:00:00 2001
+From c84f92683520442e50b202a9802985a822d66277 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:28:29 -0700
-Subject: [PATCH 82/85] Measure kernel and initrd on BIOS systems
+Subject: [PATCH 81/84] Measure kernel and initrd on BIOS systems
 
 Measure the kernel and initrd when loaded on BIOS systems
 ---

0082-Measure-the-kernel-commandline.patch

@@ -1,7 +1,7 @@
-From c7e870b771bbe43d56143d0be62ba91e30a032cf Mon Sep 17 00:00:00 2001
+From 06f8c94c7fdde72f435dc258f674da9ae7403e43 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:32:29 -0700
-Subject: [PATCH 83/85] Measure the kernel commandline
+Subject: [PATCH 82/84] Measure the kernel commandline
 
 Measure the kernel commandline to ensure that it hasn't been modified
 ---

0083-Measure-commands.patch

@@ -1,7 +1,7 @@
-From 9c55b8018c900f7e67e80693311ac3173a5df7fc Mon Sep 17 00:00:00 2001
+From 29c62ddf38164d307df69224f59ec183098cda94 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@srcf.ucam.org>
 Date: Mon, 10 Aug 2015 15:27:12 -0700
-Subject: [PATCH 84/85] Measure commands
+Subject: [PATCH 83/84] Measure commands
 
 Measure each command executed by grub, which includes script execution.
 ---

0084-Measure-multiboot-images-and-modules.patch

@@ -1,7 +1,7 @@
-From 8e7be33d76340fde72c128019ce72f5e0da6135c Mon Sep 17 00:00:00 2001
+From f3b10975f02c550752de2e759060d041aae1ff4b Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 1 Sep 2015 16:02:55 -0700
-Subject: [PATCH 85/85] Measure multiboot images and modules
+Subject: [PATCH 84/84] Measure multiboot images and modules
 
 ---
  grub-core/loader/i386/multiboot_mbi.c | 3 +++

grub.patches

@@ -1,86 +1,85 @@
 Patch0000: grub-2.02-beta3-to-origin-master.patch
-Patch0001: 0001-Migrate-PPC-from-Yaboot-to-Grub2.patch
+Patch0001: 0001-Fix-crash-on-http.patch
-Patch0002: 0002-Add-fw_path-variable-revised.patch
+Patch0002: 0002-IBM-client-architecture-CAS-reboot-support.patch
-Patch0003: 0003-Add-support-for-linuxefi.patch
+Patch0003: 0003-Add-vlan-tag-support.patch
-Patch0004: 0004-Use-linuxefi-and-initrdefi-where-appropriate.patch
+Patch0004: 0004-Add-X-option-to-printf-functions.patch
-Patch0005: 0005-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
+Patch0005: 0005-DHCP-client-ID-and-UUID-options-added.patch
-Patch0006: 0006-Pass-x-hex-hex-straight-through-unmolested.patch
+Patch0006: 0006-Move-bash-completion-script-922997.patch
-Patch0007: 0007-Fix-crash-on-http.patch
+Patch0007: 0007-for-ppc-reset-console-display-attr-when-clear-screen.patch
-Patch0008: 0008-IBM-client-architecture-CAS-reboot-support.patch
+Patch0008: 0008-Add-support-for-UEFI-operating-systems-returned-by-o.patch
-Patch0009: 0009-Add-vlan-tag-support.patch
+Patch0009: 0009-Disable-GRUB-video-support-for-IBM-power-machines.patch
-Patch0010: 0010-Add-X-option-to-printf-functions.patch
+Patch0010: 0010-Honor-a-symlink-when-generating-configuration-by-gru.patch
-Patch0011: 0011-DHCP-client-ID-and-UUID-options-added.patch
+Patch0011: 0011-trim-arp-packets-with-abnormal-size.patch
-Patch0012: 0012-Search-for-specific-config-file-for-netboot.patch
+Patch0012: 0012-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
-Patch0013: 0013-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+Patch0013: 0013-Add-GRUB_DISABLE_UUID.patch
-Patch0014: 0014-Move-bash-completion-script-922997.patch
+Patch0014: 0014-Allow-fallback-to-include-entries-by-title-not-just-.patch
-Patch0015: 0015-for-ppc-reset-console-display-attr-when-clear-screen.patch
+Patch0015: 0015-Update-to-minilzo-2.08.patch
-Patch0016: 0016-Don-t-write-messages-to-the-screen.patch
+Patch0016: 0016-Fix-bzr-s-ignore-artificats-in-.gitignore.patch
-Patch0017: 0017-Don-t-print-GNU-GRUB-header.patch
+Patch0017: 0017-Make-exit-take-a-return-code.patch
-Patch0018: 0018-Don-t-add-to-highlighted-row.patch
+Patch0018: 0018-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch
-Patch0019: 0019-Message-string-cleanups.patch
+Patch0019: 0019-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
-Patch0020: 0020-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+Patch0020: 0020-Make-efi-machines-load-an-env-block-from-a-variable.patch
-Patch0021: 0021-Use-the-correct-indentation-for-the-term-help-text.patch
+Patch0021: 0021-Failed-config-now-returns-exit-code-1252311.patch
-Patch0022: 0022-Indent-menu-entries.patch
+Patch0022: 0022-Migrate-PPC-from-Yaboot-to-Grub2.patch
-Patch0023: 0023-Fix-margins.patch
+Patch0023: 0023-Add-fw_path-variable-revised.patch
-Patch0024: 0024-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+Patch0024: 0024-Add-support-for-linuxefi.patch
-Patch0025: 0025-Disable-GRUB-video-support-for-IBM-power-machines.patch
+Patch0025: 0025-Use-linuxefi-and-initrdefi-where-appropriate.patch
-Patch0026: 0026-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+Patch0026: 0026-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
-Patch0027: 0027-Use-linux16-when-appropriate-880840.patch
+Patch0027: 0027-Pass-x-hex-hex-straight-through-unmolested.patch
-Patch0028: 0028-Enable-pager-by-default.-985860.patch
+Patch0028: 0028-Search-for-specific-config-file-for-netboot.patch
-Patch0029: 0029-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+Patch0029: 0029-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
-Patch0030: 0030-Don-t-say-GNU-Linux-in-generated-menus.patch
+Patch0030: 0030-Don-t-write-messages-to-the-screen.patch
-Patch0031: 0031-Don-t-draw-a-border-around-the-menu.patch
+Patch0031: 0031-Don-t-print-GNU-GRUB-header.patch
-Patch0032: 0032-Use-the-standard-margin-for-the-timeout-string.patch
+Patch0032: 0032-Don-t-add-to-highlighted-row.patch
-Patch0033: 0033-Add-.eh_frame-to-list-of-relocations-stripped.patch
+Patch0033: 0033-Message-string-cleanups.patch
-Patch0034: 0034-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
+Patch0034: 0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
-Patch0035: 0035-Don-t-print-during-fdt-loading-method.patch
+Patch0035: 0035-Use-the-correct-indentation-for-the-term-help-text.patch
-Patch0036: 0036-Honor-a-symlink-when-generating-configuration-by-gru.patch
+Patch0036: 0036-Indent-menu-entries.patch
-Patch0037: 0037-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
+Patch0037: 0037-Fix-margins.patch
-Patch0038: 0038-Don-t-require-a-password-to-boot-entries-generated-b.patch
+Patch0038: 0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
-Patch0039: 0039-Don-t-emit-Booting-.-message.patch
+Patch0039: 0039-Use-linux16-when-appropriate-880840.patch
-Patch0040: 0040-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
+Patch0040: 0040-Enable-pager-by-default.-985860.patch
-Patch0041: 0041-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+Patch0041: 0041-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
-Patch0042: 0042-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+Patch0042: 0042-Don-t-say-GNU-Linux-in-generated-menus.patch
-Patch0043: 0043-trim-arp-packets-with-abnormal-size.patch
+Patch0043: 0043-Don-t-draw-a-border-around-the-menu.patch
-Patch0044: 0044-Fix-convert-function-to-support-NVMe-devices.patch
+Patch0044: 0044-Use-the-standard-margin-for-the-timeout-string.patch
-Patch0045: 0045-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
+Patch0045: 0045-Add-.eh_frame-to-list-of-relocations-stripped.patch
-Patch0046: 0046-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
+Patch0046: 0046-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
-Patch0047: 0047-Use-the-default-device-tree-from-the-grub-default-fi.patch
+Patch0047: 0047-Don-t-print-during-fdt-loading-method.patch
-Patch0048: 0048-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+Patch0048: 0048-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
-Patch0049: 0049-Add-grub_util_readlink.patch
+Patch0049: 0049-Don-t-require-a-password-to-boot-entries-generated-b.patch
-Patch0050: 0050-Make-editenv-chase-symlinks-including-those-across-d.patch
+Patch0050: 0050-Don-t-emit-Booting-.-message.patch
-Patch0051: 0051-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+Patch0051: 0051-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
-Patch0052: 0052-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+Patch0052: 0052-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
-Patch0053: 0053-Add-GRUB_DISABLE_UUID.patch
+Patch0053: 0053-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
-Patch0054: 0054-Allow-fallback-to-include-entries-by-title-not-just-.patch
+Patch0054: 0054-Fix-convert-function-to-support-NVMe-devices.patch
-Patch0055: 0055-Load-arm-with-SB-enabled.patch
+Patch0055: 0055-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
-Patch0056: 0056-Try-prefix-if-fw_path-doesn-t-work.patch
+Patch0056: 0056-Use-the-default-device-tree-from-the-grub-default-fi.patch
-Patch0057: 0057-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
+Patch0057: 0057-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
-Patch0058: 0058-Update-to-minilzo-2.08.patch
+Patch0058: 0058-Add-grub_util_readlink.patch
-Patch0059: 0059-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+Patch0059: 0059-Make-editenv-chase-symlinks-including-those-across-d.patch
-Patch0060: 0060-Make-.gitignore-suck-way-less.patch
+Patch0060: 0060-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
-Patch0061: 0061-Update-info-with-grub.cfg-netboot-selection-order-11.patch
+Patch0061: 0061-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
-Patch0062: 0062-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
+Patch0062: 0062-Load-arm-with-SB-enabled.patch
-Patch0063: 0063-Add-friendly-grub2-password-config-tool-985962.patch
+Patch0063: 0063-Try-prefix-if-fw_path-doesn-t-work.patch
-Patch0064: 0064-Make-exit-take-a-return-code.patch
+Patch0064: 0064-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
-Patch0065: 0065-Add-some-__unused__-where-gcc-5.x-is-more-picky-abou.patch
+Patch0065: 0065-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
-Patch0066: 0066-Fix-race-in-EFI-validation.patch
+Patch0066: 0066-Update-info-with-grub.cfg-netboot-selection-order-11.patch
-Patch0067: 0067-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
+Patch0067: 0067-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
-Patch0068: 0068-ppc64le-sync-mkconfig-to-disk-1212114.patch
+Patch0068: 0068-Add-friendly-grub2-password-config-tool-985962.patch
-Patch0069: 0069-Use-device-part-of-chainloader-target-if-present.patch
+Patch0069: 0069-Fix-race-in-EFI-validation.patch
-Patch0070: 0070-Add-secureboot-support-on-efi-chainloader.patch
+Patch0070: 0070-ppc64le-sync-mkconfig-to-disk-1212114.patch
-Patch0071: 0071-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+Patch0071: 0071-Use-device-part-of-chainloader-target-if-present.patch
-Patch0072: 0072-Make-efi-machines-load-an-env-block-from-a-variable.patch
+Patch0072: 0072-Add-secureboot-support-on-efi-chainloader.patch
-Patch0073: 0073-Fix-security-issue-when-reading-username-and-passwor.patch
+Patch0073: 0073-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
-Patch0074: 0074-01_users-Handle-GRUB_PASSWORD-better.patch
+Patch0074: 0074-Fix-security-issue-when-reading-username-and-passwor.patch
 Patch0075: 0075-Make-grub_fatal-also-backtrace.patch
-Patch0076: 0076-Failed-config-now-returns-exit-code-1252311.patch
+Patch0076: 0076-Core-TPM-support.patch
-Patch0077: 0077-Core-TPM-support.patch
+Patch0077: 0077-Measure-kernel-initrd.patch
-Patch0078: 0078-Measure-kernel-initrd.patch
+Patch0078: 0078-Add-BIOS-boot-measurement.patch
-Patch0079: 0079-Add-BIOS-boot-measurement.patch
+Patch0079: 0079-Rework-linux-command.patch
-Patch0080: 0080-Rework-linux-command.patch
+Patch0080: 0080-Rework-linux16-command.patch
-Patch0081: 0081-Rework-linux16-command.patch
+Patch0081: 0081-Measure-kernel-and-initrd-on-BIOS-systems.patch
-Patch0082: 0082-Measure-kernel-and-initrd-on-BIOS-systems.patch
+Patch0082: 0082-Measure-the-kernel-commandline.patch
-Patch0083: 0083-Measure-the-kernel-commandline.patch
+Patch0083: 0083-Measure-commands.patch
-Patch0084: 0084-Measure-commands.patch
+Patch0084: 0084-Measure-multiboot-images-and-modules.patch
-Patch0085: 0085-Measure-multiboot-images-and-modules.patch