Fix a mismerge that makes arm not boot.

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

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

@@ -1,4 +1,4 @@
-From 6e8a67f6e4d0699d47c6fe86343d122252491f09 Mon Sep 17 00:00:00 2001
+From 89cc931e0faf05a4cf79cf8554037d035b829d0a 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/192] Load arm with SB enabled.
@@ -42,7 +42,7 @@ index 7f3d5a2bf..5ae70204c 100644
    enable = x86_64_efi;
  };
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 746edd104..450d1a1de 100644
+index 746edd104..03ff83563 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -28,6 +28,7 @@
@@ -86,8 +86,8 @@ index 746edd104..450d1a1de 100644
 +  loaded_image->load_options_size = len =
 +    (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t);
 +  loaded_image->load_options =
-+    grub_efi_allocate_pages (0,
-+			     GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
++    grub_efi_allocate_pages_max (0,
++				 GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
 +  if (!loaded_image->load_options)
 +    return grub_error(GRUB_ERR_BAD_OS, "failed to create kernel parameters");
 +

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

@@ -1,4 +1,4 @@
-From 55734dd999108c3658a3b866fffc3102737c10a5 Mon Sep 17 00:00:00 2001
+From 9f6d403d5d3e782759276c158736e431e5c9de3f 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/192] Try $prefix if $fw_path doesn't work.

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

@@ -1,4 +1,4 @@
-From b3d96d38f0f7ac225efe863eb34aaec71f5c6236 Mon Sep 17 00:00:00 2001
+From fdd459b6c8a262066c1dcbebd919b03e566bd597 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/192] Update info with grub.cfg netboot selection order

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

@@ -1,4 +1,4 @@
-From 61e77dd153b356351235c0e548ab52f81fe473b9 Mon Sep 17 00:00:00 2001
+From 8da9508faa25ba5add92267cce1286c0d44541e7 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/192] Use Distribution Package Sort for grub2-mkconfig

0127-Handle-rssd-storage-devices.patch

@@ -1,4 +1,4 @@
-From 6865b4f0ee030c7575ecf7d1bf31bdef3981d43b Mon Sep 17 00:00:00 2001
+From cdbc94f3f51b2575535a51c952238b2cd5b34639 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/192] Handle rssd storage devices.

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

@@ -1,4 +1,4 @@
-From 426b12a33d84f11e896c19cc2e1fdc5a695ebdc3 Mon Sep 17 00:00:00 2001
+From ce0866787ab88f37c346595c639921ef8922975e 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/192] Try to emit linux16/initrd16 and linuxefi/initrdefi

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

@@ -1,4 +1,4 @@
-From 2672466f667ac62616ccaf274d40a3d10ab9b61b Mon Sep 17 00:00:00 2001
+From abd7a4299e641a3c3ee2d91dfe7721796355ee2d 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/192] Make grub2-mkconfig construct titles that look like

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

@@ -1,4 +1,4 @@
-From 6fc3455ae10a9e6c18e37c781cda811b3a73285e Mon Sep 17 00:00:00 2001
+From 03c35775014c6937302aad6c97e87734c7f6a82f 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/192] Add friendly grub2 password config tool (#985962)

0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch

@@ -1,4 +1,4 @@
-From 8d52adac75a53452e6b1e6ed527b90b7cbaac7a6 Mon Sep 17 00:00:00 2001
+From 2e6a1b095ea2acab1b16a80f199e34d9a287a6da Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 10 Oct 2014 11:11:09 +0200
 Subject: [PATCH 131/192] calibrate_tsc(): use the Stall() EFI boot service on

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

@@ -1,4 +1,4 @@
-From 3c013a85d664c54b2079b3a99ed9b3c35ed35558 Mon Sep 17 00:00:00 2001
+From e0ceb7a5c51264891d65944e3da487c076a362d9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 28 Apr 2015 11:15:03 -0400
 Subject: [PATCH 132/192] Make grub2-mkconfig construct titles that look like

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

@@ -1,4 +1,4 @@
-From 941c74e3216ffe8f8fe24e7ba36a50455ed6b497 Mon Sep 17 00:00:00 2001
+From 696f516bc0868f089f1298ebbe7889f9fdc2930c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 3 Aug 2015 11:46:42 -0400
 Subject: [PATCH 133/192] Try to make sure configure.ac and grub-rpm-sort play

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

@@ -1,4 +1,4 @@
-From 4a2c29f5380f275e6bc45da4aab984b508c33b86 Mon Sep 17 00:00:00 2001
+From 1fa17daed3d36b3697a2af98ecbf05aeb0cdffa8 Mon Sep 17 00:00:00 2001
 From: Josef Bacik <jbacik@fb.com>
 Date: Wed, 12 Aug 2015 08:57:55 -0700
 Subject: [PATCH 134/192] tcp: add window scaling support

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

@@ -1,4 +1,4 @@
-From c0eee5273948412c2b9ef225b42e0ced909aeb43 Mon Sep 17 00:00:00 2001
+From cc3b425098bae73eb87947785aeea6a4fb3c8d05 Mon Sep 17 00:00:00 2001
 From: Josef Bacik <jbacik@fb.com>
 Date: Mon, 31 Aug 2015 13:34:35 -0400
 Subject: [PATCH 135/192] efinet: retransmit if our device is busy

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

@@ -1,4 +1,4 @@
-From 44d119990a08f605076bac1066d0292ab8e74dda Mon Sep 17 00:00:00 2001
+From d09b120606921bde20630c4a9dd1c500104cef13 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 11 Sep 2015 17:30:49 -0400
 Subject: [PATCH 136/192] Be more aggro about actually using the *configured*

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

@@ -1,4 +1,4 @@
-From eb23b29a1a70fc61ac2cc68acb756499e7a60cb2 Mon Sep 17 00:00:00 2001
+From b3a46d78db26c265e3343c26e3322b03e825b6c1 Mon Sep 17 00:00:00 2001
 From: RHEL Ninjas <example@example.com>
 Date: Fri, 25 Sep 2015 16:24:23 +0900
 Subject: [PATCH 137/192] efinet: add filter for the first exclusive reopen of

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

@@ -1,4 +1,4 @@
-From ba44a4863d38296e61ee7be3e71841fafe655b71 Mon Sep 17 00:00:00 2001
+From 31eb7da21d59107afb5e1e0d4f732d1dc269a2c0 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 138/192] Fix security issue when reading username and password

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

@@ -1,4 +1,4 @@
-From ae7883c825d891acf86441d36736d04bbf50521c Mon Sep 17 00:00:00 2001
+From 97ec7dbda41e62685428fc695ba593986bbf9ef0 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 22 Feb 2016 15:30:05 -0500
 Subject: [PATCH 139/192] Warn if grub password will not be read (#1290803)

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

@@ -1,4 +1,4 @@
-From 97810f430350c3844e233f66dd5ed8823448a546 Mon Sep 17 00:00:00 2001
+From 92a6412b9e3cf872792a2748310cd2a5861953da Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Tue, 26 Jan 2016 10:28:35 -0500
 Subject: [PATCH 140/192] Clean up grub-setpassword documentation (#1290799)

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

@@ -1,4 +1,4 @@
-From f577bb7128c8985b656ad8c70f44a4ee866da21e Mon Sep 17 00:00:00 2001
+From 4a85dce84b2ed10b30abcc40ab40d5882afae028 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Fri, 29 Jan 2016 16:56:11 -0500
 Subject: [PATCH 141/192] Fix locale issue in grub-setpassword (#1294243)

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

@@ -1,4 +1,4 @@
-From f9fd25d475d0cae011fa18d709a1fe071d8124e1 Mon Sep 17 00:00:00 2001
+From 8935c9fd26c5d4e2517393d4665b4602dfac0d63 Mon Sep 17 00:00:00 2001
 From: Robert Elliott <elliott@hpe.com>
 Date: Fri, 22 Jan 2016 13:32:30 +0100
 Subject: [PATCH 142/192] efiemu: Handle persistent RAM and unknown possible

0143-efiemu-Fix-compilation-failure.patch

@@ -1,4 +1,4 @@
-From d1dcefa3407afe1d4bc7e6de773386509290e8e2 Mon Sep 17 00:00:00 2001
+From a017f7824b24be5e818c4fd110c2a06df4d45a0f Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 22 Jan 2016 14:10:30 +0100
 Subject: [PATCH 143/192] efiemu: Fix compilation failure

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

@@ -1,4 +1,4 @@
-From b415a4bfdd6f48944a92d0b3c0a0eb6dd8042dde Mon Sep 17 00:00:00 2001
+From 29a2a50d54efc3dbc79031e9188aa5694f2fcfc1 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 7 Apr 2016 10:58:06 -0400
 Subject: [PATCH 144/192] Revert "reopen SNP protocol for exclusive use by

0145-Add-a-url-parser.patch

@@ -1,4 +1,4 @@
-From c6222c1a74d13ffe7b70aad9f2bc12dc2dc79c9a Mon Sep 17 00:00:00 2001
+From 8616d37a59d2cce2e68ec4c497a7c42d525481d8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jun 2016 16:18:44 -0400
 Subject: [PATCH 145/192] Add a url parser.

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

@@ -1,4 +1,4 @@
-From 4a9dea49f6ef9b81b8b78af3f893a5030219bd25 Mon Sep 17 00:00:00 2001
+From 973a2cbc0d4cb3ac66b32525ba047f59dab060b2 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 8 Jun 2016 21:03:37 -0400
 Subject: [PATCH 146/192] efinet and bootp: add support for dhcpv6

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

@@ -1,4 +1,4 @@
-From 96527f198250d25e29c23d6905481c96233bb032 Mon Sep 17 00:00:00 2001
+From 291e69a7b9b2f56c8928e2a33827980992c94d1e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 23 Jun 2016 11:01:39 -0400
 Subject: [PATCH 147/192] Add grub-get-kernel-settings and use it in 10_linux

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

@@ -1,4 +1,4 @@
-From dad8660131c924b29b3020dafb59b36be3093efa Mon Sep 17 00:00:00 2001
+From bac663561b4d6b666d3a89d80f21a81667353989 Mon Sep 17 00:00:00 2001
 From: Lenny Szubowicz <lszubowi@redhat.com>
 Date: Mon, 29 Aug 2016 11:04:48 -0400
 Subject: [PATCH 148/192] Normalize slashes in tftp paths.

0149-Fix-malformed-tftp-packets.patch

@@ -1,4 +1,4 @@
-From 02884031aa1677f6c6af8a6a58c33f701a8984d3 Mon Sep 17 00:00:00 2001
+From bb1eaf9f908130c805db845dfc5fffcaec0d98e4 Mon Sep 17 00:00:00 2001
 From: Mark Salter <msalter@redhat.com>
 Date: Tue, 7 Mar 2017 18:26:17 -0500
 Subject: [PATCH 149/192] Fix malformed tftp packets

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

@@ -1,4 +1,4 @@
-From 4c081b1042610b4726a2463dd364c9ee21769d20 Mon Sep 17 00:00:00 2001
+From 387037519dbb9f019fa377026f8abf27e34d0327 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 14 Jul 2015 16:58:51 -0700
 Subject: [PATCH 150/192] Fix race in EFI validation

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

@@ -1,4 +1,4 @@
-From 4acdb98d4b6e1204a70f1a4dd435fd8176dad8cf Mon Sep 17 00:00:00 2001
+From e84de0761303285ef42940c70fc7a7d53a4a2504 Mon Sep 17 00:00:00 2001
 From: Masahiro Matsuya <mmatsuya@redhat.com>
 Date: Sat, 29 Oct 2016 08:35:26 +0900
 Subject: [PATCH 151/192] bz1374141 fix incorrect mask for ppc64

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

@@ -1,4 +1,4 @@
-From 01e86878090c2b7d9c0e63024da5d86130da8d4d Mon Sep 17 00:00:00 2001
+From 90a2478253009a33584ee4ba3785e5945e64482d Mon Sep 17 00:00:00 2001
 From: Raymund Will <rw@suse.com>
 Date: Fri, 10 Apr 2015 01:45:02 -0400
 Subject: [PATCH 152/192] Use device part of chainloader target, if present.

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

@@ -1,4 +1,4 @@
-From 4d7c46d507e90d67c1c3c8e773940f41d3c647e9 Mon Sep 17 00:00:00 2001
+From f4cf150259fab118806ac1dcc4e73cb2e50b3ffc Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 13:04:37 -0400
 Subject: [PATCH 153/192] Add secureboot support on efi chainloader

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

@@ -1,4 +1,4 @@
-From 23965f6becb9ab6e8e83495d70dbdf650811b630 Mon Sep 17 00:00:00 2001
+From 4c768f9b3ee1f26b1d7cedc6f5aa79e9a77a0f1b Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 16:09:25 -0400
 Subject: [PATCH 154/192] Make any of the loaders that link in efi mode honor

0155-Make-grub_fatal-also-backtrace.patch

@@ -1,4 +1,4 @@
-From 2bc3a40466e0175bd24343420c4ae3f3eb497abf Mon Sep 17 00:00:00 2001
+From 6cc2859f44543f71ff448c44e65a65d867687ae8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 27 Jan 2016 09:22:42 -0500
 Subject: [PATCH 155/192] Make grub_fatal() also backtrace.

0156-Rework-linux-command.patch

@@ -1,4 +1,4 @@
-From c75fd7cc69873a8347a536aa760c019990b3c7a1 Mon Sep 17 00:00:00 2001
+From 8c04cd7ab27fadf834df9f2f4d767b100547c190 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:12:39 -0700
 Subject: [PATCH 156/192] Rework linux command

0157-Rework-linux16-command.patch

@@ -1,4 +1,4 @@
-From de0c8783e1177f81fe2ac90edbfdc282ae986803 Mon Sep 17 00:00:00 2001
+From 17f5bd6c5f9c7d9e7ec922852038dcdfe9f52e86 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:20:58 -0700
 Subject: [PATCH 157/192] Rework linux16 command

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

@@ -1,4 +1,4 @@
-From 4d8aa8cf3ae80f86fa99dbc69f4d44697b5f7ea3 Mon Sep 17 00:00:00 2001
+From 0102b5ffd55e96280fbbf67c823d52c4f913c3a5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 4 Mar 2016 16:29:13 -0500
 Subject: [PATCH 158/192] Make grub-editenv build again.

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

@@ -1,4 +1,4 @@
-From c50df5e0ea3ab065d373c91b408eb7bb48d824a6 Mon Sep 17 00:00:00 2001
+From 6c3247e1bcad21587e3ec5ace9a5cd3b717471cf Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 23 Sep 2014 09:58:49 -0400
 Subject: [PATCH 159/192] Fix up some man pages rpmdiff noticed.

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

@@ -1,4 +1,4 @@
-From d0bac1cacf14200def2c4d00268b8f655fec7f16 Mon Sep 17 00:00:00 2001
+From 98f57101ba066e247c87b7b39b53df2e597805ee Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 9 Jun 2016 12:22:29 -0400
 Subject: [PATCH 160/192] Re-work some intricacies of PE loading.

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

@@ -1,4 +1,4 @@
-From 341c267c6e2613b3fc5341578ee9ec3524fb7098 Mon Sep 17 00:00:00 2001
+From b25aeee879c5b5dc8bf642c11090feb9b3ed875f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 10 Jun 2016 14:06:15 -0400
 Subject: [PATCH 161/192] Rework even more of efi chainload so non-sb cases
@@ -80,7 +80,7 @@ index a41b6c5b8..d74778b0c 100644
    if (*secure_boot && !*setup_mode)
      ret = 1;
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 450d1a1de..854971ae6 100644
+index 03ff83563..34f34e65a 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -248,6 +248,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

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

@@ -1,4 +1,4 @@
-From 18e355bbefe3dd75526da4b6b99046ea609d4c1b Mon Sep 17 00:00:00 2001
+From 174e79117b2996a9388c1cba6ac3bfbf053396c3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jun 2016 09:50:25 -0400
 Subject: [PATCH 162/192] linuxefi: fix double free on verification failure.

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

@@ -1,4 +1,4 @@
-From e091c46338bf077d93e3b99d6e326e78afcf902f Mon Sep 17 00:00:00 2001
+From 5368a034f371af6614de303b057fdc092892611a Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 11 Jul 2016 13:36:45 -0400
 Subject: [PATCH 163/192] fix machine type test in 30_os-prober.in

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

@@ -1,4 +1,4 @@
-From 51618e3f04dbb8b9ea8d7c151bb09d527dcbd1c5 Mon Sep 17 00:00:00 2001
+From 7004abbe4fd446b9ad6b03b657397704009382af Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Mon, 21 Nov 2016 15:34:00 +0100
 Subject: [PATCH 164/192] efi/chainloader: fix wrong sanity check in

0165-efi-chainloader-truncate-overlong-relocation-section.patch

@@ -1,4 +1,4 @@
-From 48ee84721c03de835647bba063436d73238c5cf9 Mon Sep 17 00:00:00 2001
+From 0e2289b515d283b72ab86959a76d8a9ea2b608fc Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Wed, 23 Nov 2016 06:27:09 +0100
 Subject: [PATCH 165/192] efi/chainloader: truncate overlong relocation section

0166-linuxefi-minor-cleanups.patch

@@ -1,4 +1,4 @@
-From 5eea84e1d48dcda4721ddc079f7edae55db544cb Mon Sep 17 00:00:00 2001
+From 7daabb17821b515b26c948275ee5aa8b2208c649 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Feb 2017 16:31:52 -0500
 Subject: [PATCH 166/192] linuxefi: minor cleanups

0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch

@@ -1,4 +1,4 @@
-From de23e4dbf4ff4472b76f1ff2094bf62a1a99acbb Mon Sep 17 00:00:00 2001
+From 5a5ab4ce7f57bf2e18ba0f1cfb8ab478adf32676 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Feb 2017 16:18:54 -0500
 Subject: [PATCH 167/192] Handle multi-arch (64-on-32) boot in linuxefi loader.

0168-Fix-up-linux-params-usage.patch

@@ -1,4 +1,4 @@
-From 6ae54e020cecce28305756cc6b7e7e3729c48f17 Mon Sep 17 00:00:00 2001
+From 6b2eba692ce88288202c826e70d30164b7d7f606 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 30 May 2017 14:16:07 -0400
 Subject: [PATCH 168/192] Fix up linux params usage...

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

@@ -1,4 +1,4 @@
-From 056fa8b0acc08d135f5b93c79ed917fb039c2401 Mon Sep 17 00:00:00 2001
+From f06b7aa6c687bec98c237da8e63c4420fc46a7e5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 26 Feb 2014 21:49:12 -0500
 Subject: [PATCH 169/192] Make "exit" take a return code.

0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch

@@ -1,4 +1,4 @@
-From 9365f56c0ff31b62a4334f583c04da8ddd5a3274 Mon Sep 17 00:00:00 2001
+From 8ed119f11ac2981a123f192ba9229c31d4ecb287 Mon Sep 17 00:00:00 2001
 From: Mark Salter <msalter@redhat.com>
 Date: Mon, 17 Apr 2017 08:44:29 -0400
 Subject: [PATCH 170/192] arm64: make sure fdt has #address-cells and
@@ -14,7 +14,7 @@ make sure they exist.
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 854971ae6..83f5a6de2 100644
+index 34f34e65a..530c4ba2d 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -79,7 +79,21 @@ finalize_params_linux (void)

0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch

@@ -1,4 +1,4 @@
-From bb19df579a0b6eae01f440c295756258b027abfd Mon Sep 17 00:00:00 2001
+From d23b61bdbd200bfb6428dd1b36053614913c596b Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 9 May 2016 14:15:17 -0400
 Subject: [PATCH 171/192] Add some grub_dprintf() in the secure boot verify

0172-Make-our-info-pages-say-grub2-where-appropriate.patch

@@ -1,4 +1,4 @@
-From 0d5dd185e24f202e6d647c4db3ea59a67b799909 Mon Sep 17 00:00:00 2001
+From c4a0a288ce09453a94c2e655094158338e20db6d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 6 May 2016 18:43:08 -0400
 Subject: [PATCH 172/192] Make our info pages say "grub2" where appropriate.

0173-print-more-debug-info-in-our-module-loader.patch

@@ -1,4 +1,4 @@
-From 15e52b061ea65d3baee2279b8e4e9fe85a252b4e Mon Sep 17 00:00:00 2001
+From c94146470358e5ba3b2047f8e0aa762f9357a15e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 May 2017 11:19:40 -0400
 Subject: [PATCH 173/192] print more debug info in our module loader.

0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch

@@ -1,4 +1,4 @@
-From af947a9dfab90eff972d000a6a7506ce052d11ea Mon Sep 17 00:00:00 2001
+From 47b6acd4424c9e1dce694d1cc287fda2d3eca685 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 24 May 2017 12:42:32 -0400
 Subject: [PATCH 174/192] macos: just build chainloader entries, don't try any

0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch

@@ -1,4 +1,4 @@
-From 2820f28d209a67dda25b74527150be87bceb1efd Mon Sep 17 00:00:00 2001
+From a3eaa70d8fec7f0fc5c13c4886bc67d3eab8ba6e Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@suse.com>
 Date: Wed, 18 Dec 2013 09:57:04 +0000
 Subject: [PATCH 175/192] grub2/btrfs: Add ability to boot from subvolumes

0176-export-btrfs_subvol-and-btrfs_subvolid.patch

@@ -1,4 +1,4 @@
-From 405a7c2f16f6ab331a853fed4bf26fa3ad561c4c Mon Sep 17 00:00:00 2001
+From 1dcd15bbf1da1839c6dfa3e475f185fb72e55332 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Wed, 18 Dec 2013 09:57:04 +0000
 Subject: [PATCH 176/192] export btrfs_subvol and btrfs_subvolid

0177-grub2-btrfs-03-follow_default.patch

@@ -1,4 +1,4 @@
-From ab593d129dd76437dc05e328852106e917d6fc7e Mon Sep 17 00:00:00 2001
+From c92dacf72b436c42f7a417b161852017bd95ac72 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
 Subject: [PATCH 177/192] grub2-btrfs-03-follow_default

0178-grub2-btrfs-04-grub2-install.patch

@@ -1,4 +1,4 @@
-From 48c1105e0755c455c70b39eeb03e7d138a9205a6 Mon Sep 17 00:00:00 2001
+From 9501029137b4751b2cb0c84baf23f31a8ff1a4dd Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
 Subject: [PATCH 178/192] grub2-btrfs-04-grub2-install

0179-grub2-btrfs-05-grub2-mkconfig.patch

@@ -1,4 +1,4 @@
-From 0d943cd642131e4f6d6ca9edde9d9373294ec1db Mon Sep 17 00:00:00 2001
+From d5f0e3cb0b3e038f35cdddf798e095cb1c9b8d00 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 21 Aug 2014 03:39:11 +0000
 Subject: [PATCH 179/192] grub2-btrfs-05-grub2-mkconfig

0180-grub2-btrfs-06-subvol-mount.patch

@@ -1,4 +1,4 @@
-From 8011b1d2b6e3f239bdee7ba22f9d08b613d24113 Mon Sep 17 00:00:00 2001
+From db75dad097b89491d1f2140a054a08c9a2975c40 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Fri, 22 May 2015 11:45:25 +0000
 Subject: [PATCH 180/192] grub2-btrfs-06-subvol-mount

0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch

@@ -1,4 +1,4 @@
-From 9e5e9e44d13de2f297c60ddb956d838054c92578 Mon Sep 17 00:00:00 2001
+From dcccb8337cd0a5e7fdcaa32be83466430a4919dd Mon Sep 17 00:00:00 2001
 From: Dusty Mabe <dusty@dustymabe.com>
 Date: Sat, 18 Jul 2015 15:38:08 +0000
 Subject: [PATCH 181/192] No more "Bootable Snapshot" submenu in grub.cfg.

0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch

@@ -1,4 +1,4 @@
-From 88db0c4fb663e700115f88303b6aacd9a29a6ff1 Mon Sep 17 00:00:00 2001
+From 71e874b34e9af7a3cd92742064ff53356f30614c Mon Sep 17 00:00:00 2001
 From: Andrei Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jun 2016 16:44:17 +0000
 Subject: [PATCH 182/192] Fallback to old subvol name scheme to support old

0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch

@@ -1,4 +1,4 @@
-From f125fb3b2523e0d15d243f52c008503065c1d825 Mon Sep 17 00:00:00 2001
+From c7ef72a2a071bce0560483cb963ca4734b69ceee Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 11 May 2017 08:56:57 +0000
 Subject: [PATCH 183/192] Grub not working correctly with btrfs snapshots

0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch

@@ -1,4 +1,4 @@
-From dd0f61076714c4b63da8e780a3e4823e4af17833 Mon Sep 17 00:00:00 2001
+From 7775ed257814eff3867bd09a3156b7ca77bc0f6d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 1 Jun 2017 09:59:56 -0400
 Subject: [PATCH 184/192] Add grub_efi_allocate_pool() and grub_efi_free_pool()

0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch

@@ -1,4 +1,4 @@
-From fdcd3314bf7570e459007efc2553991da0d35619 Mon Sep 17 00:00:00 2001
+From 8877b728ff3c33f0fc25a2bf6cda8dfbe30ef8c5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 1 Jun 2017 10:06:38 -0400
 Subject: [PATCH 185/192] Use grub_efi_...() memory helpers where reasonable.

0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch

@@ -1,4 +1,4 @@
-From 56174d5d4a91cc0df9421ef82613ec332011e826 Mon Sep 17 00:00:00 2001
+From 6ba24572ef934a14b56f32bd2cd9655d5e216d2e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 1 Jun 2017 10:07:50 -0400
 Subject: [PATCH 186/192] Add PRIxGRUB_EFI_STATUS and use it.

0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch

@@ -1,4 +1,4 @@
-From ea0790c19fc06366031390e39f70191499054a0a Mon Sep 17 00:00:00 2001
+From 94763d8eb1aeb0a1332f6e262dfc0bde4540b868 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 26 Jun 2017 12:42:57 -0400
 Subject: [PATCH 187/192] Don't use dynamic sized arrays since we don't build

0188-don-t-ignore-const.patch

@@ -1,4 +1,4 @@
-From da09d4c837884ccfbd51452f6af37044501de7d6 Mon Sep 17 00:00:00 2001
+From ba1843ecde7b5352aeebbe8ce0f7d9bfb95ec3fb Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 26 Jun 2017 12:43:22 -0400
 Subject: [PATCH 188/192] don't ignore const

0189-don-t-use-int-for-efi-status.patch

@@ -1,4 +1,4 @@
-From b80f9447368083bc90d2a2642e790fb0b8ae1010 Mon Sep 17 00:00:00 2001
+From 6711c5bb2641789ac5e24bf880283eef65532518 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 26 Jun 2017 12:44:59 -0400
 Subject: [PATCH 189/192] don't use int for efi status

0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch

@@ -1,4 +1,4 @@
-From fb2c03f93456f934e090730589cf37495d613427 Mon Sep 17 00:00:00 2001
+From a80182d86a6a55413b5794a2eca80b4b7dfc9be5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 26 Jun 2017 12:46:23 -0400
 Subject: [PATCH 190/192] make GRUB_MOD_INIT() declare its function prototypes.

0191-Clean-up-some-errors-in-the-linuxefi-loader.patch

@@ -1,4 +1,4 @@
-From 3baddd2a95ca1026951e2d8bb0b39b9e22471eb1 Mon Sep 17 00:00:00 2001
+From 7d1c68137a2c4c69e3b4407d9771ccb51f3341fe Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 24 May 2017 15:58:18 -0400
 Subject: [PATCH 191/192] Clean up some errors in the linuxefi loader

0192-editenv-handle-relative-symlinks.patch

@@ -1,3 +1,4 @@
+From 54a01b15263a71dce51f4da826e1364780c45590 Mon Sep 17 00:00:00 2001
 From: Jonathan Lebon <jlebon@redhat.com>
 Date: Mon, 14 Aug 2017 14:37:20 -0400
 Subject: [PATCH 192/192] editenv: handle relative symlinks