diff --git a/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch b/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch
index 4824aa14..51621653 100644
--- a/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch
+++ b/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch
@@ -10,7 +10,7 @@ This reverts commit 722737630889607c3b5761f1f5a48f1674cd2821.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 5984e92d29..9462248128 100644
+index 656301eaf22..376ca47efe4 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -36,7 +36,7 @@ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/n
diff --git a/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch b/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch
index 05ac0f8e..aa5a3263 100644
--- a/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch
+++ b/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch
@@ -10,7 +10,7 @@ This reverts commit 54e0a1bbf1e9106901a557195bb35e5e20fb3925.
  2 files changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f8cbb8d7a2..d3e879b8e5 100644
+index 32c480daeb2..7516a015be0 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -140,9 +140,6 @@ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2
@@ -31,7 +31,7 @@ index f8cbb8d7a2..d3e879b8e5 100644
    GRUB_FS \
    GRUB_FONT \
    GRUB_PRELOAD_MODULES \
-@@ -246,6 +242,7 @@ export GRUB_DEFAULT \
+@@ -250,6 +246,7 @@ export GRUB_DEFAULT \
    GRUB_BACKGROUND \
    GRUB_THEME \
    GRUB_GFXPAYLOAD_LINUX \
@@ -40,7 +40,7 @@ index f8cbb8d7a2..d3e879b8e5 100644
    GRUB_SAVEDEFAULT \
    GRUB_ENABLE_CRYPTODISK \
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 9462248128..80685b15f4 100644
+index 376ca47efe4..30f27f15b83 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -26,8 +26,8 @@ export TEXTDOMAINDIR="@localedir@"
diff --git a/0003-Revert-templates-Disable-the-os-prober-by-default.patch b/0003-Revert-templates-Disable-the-os-prober-by-default.patch
index 94927953..a51779d9 100644
--- a/0003-Revert-templates-Disable-the-os-prober-by-default.patch
+++ b/0003-Revert-templates-Disable-the-os-prober-by-default.patch
@@ -10,10 +10,10 @@ This reverts commit e346414725a70e5c74ee87ca14e580c66f517666.
  2 files changed, 9 insertions(+), 14 deletions(-)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index f8b4b3b21a..69f08d289f 100644
+index a225f9a88d2..974bc0ddb07 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -1519,13 +1519,10 @@ boot sequence.  If you have problems, set this option to @samp{text} and
+@@ -1552,13 +1552,10 @@ boot sequence.  If you have problems, set this option to @samp{text} and
  GRUB will tell Linux to boot in normal text mode.
  
  @item GRUB_DISABLE_OS_PROBER
@@ -31,7 +31,7 @@ index f8b4b3b21a..69f08d289f 100644
  
  @item GRUB_OS_PROBER_SKIP_LIST
  List of space-separated FS UUIDs of filesystems to be ignored from os-prober
-@@ -1853,9 +1850,10 @@ than zero; otherwise 0.
+@@ -1889,9 +1886,10 @@ than zero; otherwise 0.
  @section Multi-boot manual config
  
  Currently autogenerating config files for multi-boot environments depends on
@@ -46,7 +46,7 @@ index f8b4b3b21a..69f08d289f 100644
  First create a separate GRUB partition, big enough to hold GRUB. Some of the
  following entries show how to load OS installer images from this same partition,
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 80685b15f4..1b91c102f3 100644
+index 30f27f15b83..f300e46fc6a 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -26,8 +26,7 @@ export TEXTDOMAINDIR="@localedir@"
diff --git a/0005-Rework-linux-command.patch b/0004-Rework-linux-command.patch
similarity index 86%
rename from 0005-Rework-linux-command.patch
rename to 0004-Rework-linux-command.patch
index 694e4237..26d10ac8 100644
--- a/0005-Rework-linux-command.patch
+++ b/0004-Rework-linux-command.patch
@@ -13,10 +13,10 @@ Signed-off-by: Matthew Garrett <mjg59@coreos.com>
  1 file changed, 23 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 9f74a96b19..dccf3bb300 100644
+index 977757f2cc9..10f967f2563 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
-@@ -649,13 +649,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -661,13 +661,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  {
    grub_file_t file = 0;
    struct linux_i386_kernel_header lh;
@@ -33,7 +33,7 @@ index 9f74a96b19..dccf3bb300 100644
  
    grub_dl_ref (my_mod);
  
-@@ -669,7 +671,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -681,7 +683,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    if (! file)
      goto fail;
  
@@ -50,7 +50,7 @@ index 9f74a96b19..dccf3bb300 100644
      {
        if (!grub_errno)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -677,6 +687,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -689,6 +699,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -60,7 +60,7 @@ index 9f74a96b19..dccf3bb300 100644
    if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
      {
        grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
-@@ -784,13 +797,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -796,13 +809,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    /* We've already read lh so there is no need to read it second time. */
    len -= sizeof(lh);
  
@@ -78,7 +78,7 @@ index 9f74a96b19..dccf3bb300 100644
      }
  
    linux_params.code32_start = prot_mode_target + lh.code32_start - GRUB_LINUX_BZIMAGE_ADDR;
-@@ -853,7 +864,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -865,7 +876,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    /* The other parameters are filled when booting.  */
  
@@ -87,7 +87,7 @@ index 9f74a96b19..dccf3bb300 100644
  
    grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
  		(unsigned) real_size, (unsigned) prot_size);
-@@ -1007,9 +1018,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -1019,9 +1030,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    }
  
    len = prot_file_size;
@@ -98,7 +98,7 @@ index 9f74a96b19..dccf3bb300 100644
  
    if (grub_errno == GRUB_ERR_NONE)
      {
-@@ -1020,6 +1029,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -1032,6 +1041,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
   fail:
  
diff --git a/0006-Rework-linux16-command.patch b/0005-Rework-linux16-command.patch
similarity index 98%
rename from 0006-Rework-linux16-command.patch
rename to 0005-Rework-linux16-command.patch
index 5adaaba6..50a648c8 100644
--- a/0006-Rework-linux16-command.patch
+++ b/0005-Rework-linux16-command.patch
@@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <mjg59@coreos.com>
  1 file changed, 21 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 8be4c3b3f4..4b1750e360 100644
+index 4adeee9ae00..600530a742b 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/0010-re-write-.gitignore.patch b/0006-re-write-.gitignore.patch
similarity index 92%
rename from 0010-re-write-.gitignore.patch
rename to 0006-re-write-.gitignore.patch
index 3e0b46c8..36b0efd8 100644
--- a/0010-re-write-.gitignore.patch
+++ b/0006-re-write-.gitignore.patch
@@ -4,14 +4,14 @@ Date: Mon, 8 Jul 2019 12:55:29 +0200
 Subject: [PATCH] re-write .gitignore
 
 ---
- .gitignore                        | 152 ++++++++++++++++++++++++++++++++++++++
+ .gitignore                        | 150 ++++++++++++++++++++++++++++++++++++++
  docs/.gitignore                   |   5 ++
  grub-core/.gitignore              |  16 ++++
  grub-core/lib/.gitignore          |   1 +
  include/grub/gcrypt/.gitignore    |   2 +
  po/.gitignore                     |   5 ++
  util/bash-completion.d/.gitignore |   2 +
- 7 files changed, 183 insertions(+)
+ 7 files changed, 181 insertions(+)
  create mode 100644 docs/.gitignore
  create mode 100644 grub-core/.gitignore
  create mode 100644 grub-core/lib/.gitignore
@@ -20,10 +20,10 @@ Subject: [PATCH] re-write .gitignore
  create mode 100644 util/bash-completion.d/.gitignore
 
 diff --git a/.gitignore b/.gitignore
-index f6a1bd0517..594d0134d3 100644
+index 4d0dfb700e4..a18787dcfe6 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -275,3 +275,155 @@ widthspec.bin
+@@ -279,3 +279,153 @@ widthspec.bin
  /xfs_test
  /xzcompress_test
  /zfs_test
@@ -152,8 +152,6 @@ index f6a1bd0517..594d0134d3 100644
 +/grub*-reboot.8
 +/grub*-render-label
 +/grub*-render-label.1
-+/grub*-rpm-sort
-+/grub*-rpm-sort.8
 +/grub*-script-check
 +/grub*-script-check.1
 +/grub*-set-bootflag
@@ -181,7 +179,7 @@ index f6a1bd0517..594d0134d3 100644
 +/widthspec.h
 diff --git a/docs/.gitignore b/docs/.gitignore
 new file mode 100644
-index 0000000000..e1d849ef95
+index 00000000000..e1d849ef95b
 --- /dev/null
 +++ b/docs/.gitignore
 @@ -0,0 +1,5 @@
@@ -192,7 +190,7 @@ index 0000000000..e1d849ef95
 +/version*.texi
 diff --git a/grub-core/.gitignore b/grub-core/.gitignore
 new file mode 100644
-index 0000000000..2acce28115
+index 00000000000..2acce281159
 --- /dev/null
 +++ b/grub-core/.gitignore
 @@ -0,0 +1,16 @@
@@ -214,14 +212,14 @@ index 0000000000..2acce28115
 +/trigtables.c
 diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore
 new file mode 100644
-index 0000000000..6815459140
+index 00000000000..68154591404
 --- /dev/null
 +++ b/grub-core/lib/.gitignore
 @@ -0,0 +1 @@
 +/libgcrypt-grub/
 diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore
 new file mode 100644
-index 0000000000..8fbf564624
+index 00000000000..8fbf5646246
 --- /dev/null
 +++ b/include/grub/gcrypt/.gitignore
 @@ -0,0 +1,2 @@
@@ -229,7 +227,7 @@ index 0000000000..8fbf564624
 +gcrypt.h
 diff --git a/po/.gitignore b/po/.gitignore
 new file mode 100644
-index 0000000000..f507e7741e
+index 00000000000..f507e7741e3
 --- /dev/null
 +++ b/po/.gitignore
 @@ -0,0 +1,5 @@
@@ -240,7 +238,7 @@ index 0000000000..f507e7741e
 +/stamp-po
 diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore
 new file mode 100644
-index 0000000000..6813a527ad
+index 00000000000..6813a527ad3
 --- /dev/null
 +++ b/util/bash-completion.d/.gitignore
 @@ -0,0 +1,2 @@
diff --git a/0011-IBM-client-architecture-CAS-reboot-support.patch b/0007-IBM-client-architecture-CAS-reboot-support.patch
similarity index 96%
rename from 0011-IBM-client-architecture-CAS-reboot-support.patch
rename to 0007-IBM-client-architecture-CAS-reboot-support.patch
index 316b9eb2..44755349 100644
--- a/0011-IBM-client-architecture-CAS-reboot-support.patch
+++ b/0007-IBM-client-architecture-CAS-reboot-support.patch
@@ -29,7 +29,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  4 files changed, 91 insertions(+)
 
 diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
-index 4d493ab766..3a6689abb1 100644
+index 11b2beb2ff2..e2ecc65d2d8 100644
 --- a/grub-core/kern/ieee1275/openfw.c
 +++ b/grub-core/kern/ieee1275/openfw.c
 @@ -591,3 +591,66 @@ grub_ieee1275_get_boot_dev (void)
@@ -100,7 +100,7 @@ index 4d493ab766..3a6689abb1 100644
 +  return 0;
 +}
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index c4ebe9e22a..70614de156 100644
+index bd44310005d..d3f53d93d87 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -34,6 +34,9 @@
@@ -137,7 +137,7 @@ index c4ebe9e22a..70614de156 100644
        grub_errno = GRUB_ERR_NONE;
      }
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index 25158407dd..ad80399246 100644
+index 14ff09094f0..dab8fd2aeb0 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -28,6 +28,9 @@
@@ -162,10 +162,10 @@ index 25158407dd..ad80399246 100644
      {
        char *line;
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 73e2f46447..0a599607f3 100644
+index dddb385149e..4f6e6aaa098 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
-@@ -254,6 +254,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali
+@@ -251,6 +251,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali
  void EXPORT_FUNC(grub_ieee1275_children_peer) (struct grub_ieee1275_devalias *alias);
  void EXPORT_FUNC(grub_ieee1275_children_first) (const char *devpath,
  						struct grub_ieee1275_devalias *alias);
diff --git a/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0008-for-ppc-reset-console-display-attr-when-clear-screen.patch
similarity index 97%
rename from 0012-for-ppc-reset-console-display-attr-when-clear-screen.patch
rename to 0008-for-ppc-reset-console-display-attr-when-clear-screen.patch
index 121af849..63359395 100644
--- a/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch
+++ b/0008-for-ppc-reset-console-display-attr-when-clear-screen.patch
@@ -17,7 +17,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index 85ecf06b4d..05c88dcf49 100644
+index 4e534c683eb..3dbe88e8933 100644
 --- a/grub-core/term/terminfo.c
 +++ b/grub-core/term/terminfo.c
 @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,
diff --git a/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0009-Disable-GRUB-video-support-for-IBM-power-machines.patch
similarity index 85%
rename from 0013-Disable-GRUB-video-support-for-IBM-power-machines.patch
rename to 0009-Disable-GRUB-video-support-for-IBM-power-machines.patch
index 917943fd..d55e7d03 100644
--- a/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch
+++ b/0009-Disable-GRUB-video-support-for-IBM-power-machines.patch
@@ -15,10 +15,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  3 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
-index 20cbbd761e..04df9d2c66 100644
+index e74de32483f..810a089a934 100644
 --- a/grub-core/kern/ieee1275/cmain.c
 +++ b/grub-core/kern/ieee1275/cmain.c
-@@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
+@@ -89,7 +89,10 @@ grub_ieee1275_find_options (void)
    }
  
    if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
@@ -31,10 +31,10 @@ index 20cbbd761e..04df9d2c66 100644
    /* Old Macs have no key repeat, newer ones have fully working one.
       The ones inbetween when repeated key generates an escaoe sequence
 diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
-index 17a3dbbb57..b8e4b3feb3 100644
+index ca3d3c3b2c8..5592e4bb7c9 100644
 --- a/grub-core/video/ieee1275.c
 +++ b/grub-core/video/ieee1275.c
-@@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
+@@ -351,9 +351,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
  
  GRUB_MOD_INIT(ieee1275_fb)
  {
@@ -51,14 +51,14 @@ index 17a3dbbb57..b8e4b3feb3 100644
  
  GRUB_MOD_FINI(ieee1275_fb)
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 0a599607f3..b5a1d49bbc 100644
+index 4f6e6aaa098..db0ec5f4c68 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
-@@ -148,6 +148,8 @@ enum grub_ieee1275_flag
-   GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN,
+@@ -145,6 +145,8 @@ enum grub_ieee1275_flag
+   GRUB_IEEE1275_FLAG_POWER_VM,
  
-   GRUB_IEEE1275_FLAG_RAW_DEVNAMES,
-+  
+   GRUB_IEEE1275_FLAG_POWER_KVM,
++
 +  GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT
  };
  
diff --git a/0014-Move-bash-completion-script-922997.patch b/0010-Move-bash-completion-script-922997.patch
similarity index 89%
rename from 0014-Move-bash-completion-script-922997.patch
rename to 0010-Move-bash-completion-script-922997.patch
index a84d66e5..113f8b08 100644
--- a/0014-Move-bash-completion-script-922997.patch
+++ b/0010-Move-bash-completion-script-922997.patch
@@ -10,10 +10,10 @@ Apparently these go in a new place now.
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 7517fc49d9..8331f95b64 100644
+index cd667a2eb75..ae3a49321ad 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -314,6 +314,14 @@ AC_SUBST(grubdirname)
+@@ -319,6 +319,14 @@ AC_SUBST(grubdirname)
  AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
      [Default grub directory name])
  
@@ -28,7 +28,7 @@ index 7517fc49d9..8331f95b64 100644
  #
  # Checks for build programs.
  #
-@@ -525,6 +533,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
+@@ -534,6 +542,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
  # Check for target programs.
  #
  
@@ -39,7 +39,7 @@ index 7517fc49d9..8331f95b64 100644
  if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
    tmp_ac_tool_prefix="$ac_tool_prefix"
 diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am
-index 136287cf1b..61108f0542 100644
+index 136287cf1bf..61108f05429 100644
 --- a/util/bash-completion.d/Makefile.am
 +++ b/util/bash-completion.d/Makefile.am
 @@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source)
diff --git a/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0011-Allow-fallback-to-include-entries-by-title-not-just-.patch
similarity index 98%
rename from 0015-Allow-fallback-to-include-entries-by-title-not-just-.patch
rename to 0011-Allow-fallback-to-include-entries-by-title-not-just-.patch
index 6450a543..b85e5e6e 100644
--- a/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch
+++ b/0011-Allow-fallback-to-include-entries-by-title-not-just-.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 58 insertions(+), 27 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 8397886fa0..d7a222e681 100644
+index 6a90e091f22..6444ee6f969 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -163,15 +163,40 @@ grub_menu_set_timeout (int timeout)
diff --git a/0016-Make-exit-take-a-return-code.patch b/0012-Make-exit-take-a-return-code.patch
similarity index 82%
rename from 0016-Make-exit-take-a-return-code.patch
rename to 0012-Make-exit-take-a-return-code.patch
index 654ef73b..87e03ad8 100644
--- a/0016-Make-exit-take-a-return-code.patch
+++ b/0012-Make-exit-take-a-return-code.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/commands/minicmd.c         | 20 ++++++++++++++++----
  grub-core/kern/efi/efi.c             |  9 +++++++--
  grub-core/kern/emu/main.c            |  2 +-
- grub-core/kern/emu/misc.c            |  5 +++--
+ grub-core/kern/emu/misc.c            |  9 +++++----
  grub-core/kern/i386/coreboot/init.c  |  2 +-
  grub-core/kern/i386/qemu/init.c      |  2 +-
  grub-core/kern/ieee1275/init.c       |  2 +-
@@ -24,10 +24,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/kern/uboot/init.c          |  6 +++---
  grub-core/kern/xen/init.c            |  2 +-
  include/grub/misc.h                  |  2 +-
- 14 files changed, 48 insertions(+), 21 deletions(-)
+ 14 files changed, 50 insertions(+), 23 deletions(-)
 
 diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index fa498931ed..2bd3ac76f2 100644
+index fa498931ed2..2bd3ac76f2d 100644
 --- a/grub-core/commands/minicmd.c
 +++ b/grub-core/commands/minicmd.c
 @@ -182,12 +182,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
@@ -60,10 +60,10 @@ index fa498931ed..2bd3ac76f2 100644
  }
  
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 8cff7be028..05d8237a9b 100644
+index b93ae3aba12..885d7c6420e 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -165,11 +165,16 @@ grub_reboot (void)
+@@ -175,11 +175,16 @@ grub_reboot (void)
  }
  
  void
@@ -76,14 +76,14 @@ index 8cff7be028..05d8237a9b 100644
 +    rc = GRUB_EFI_SUCCESS;
 +
    grub_machine_fini (GRUB_LOADER_FLAG_NORETURN);
-   efi_call_4 (grub_efi_system_table->boot_services->exit,
--              grub_efi_image_handle, GRUB_EFI_SUCCESS, 0, 0);
-+              grub_efi_image_handle, rc, 0, 0);
+   grub_efi_system_table->boot_services->exit (grub_efi_image_handle,
+-					      GRUB_EFI_SUCCESS, 0, 0);
++					      rc, 0, 0);
    for (;;) ;
  }
  
 diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 425bb96034..55ea5a11cc 100644
+index 855b11c3dec..38c1576a2ef 100644
 --- a/grub-core/kern/emu/main.c
 +++ b/grub-core/kern/emu/main.c
 @@ -67,7 +67,7 @@ grub_reboot (void)
@@ -96,10 +96,19 @@ index 425bb96034..55ea5a11cc 100644
    grub_reboot ();
  }
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index dfd8a8ec48..0ff13bcaf8 100644
+index 521220b49d2..16c79bc9488 100644
 --- a/grub-core/kern/emu/misc.c
 +++ b/grub-core/kern/emu/misc.c
-@@ -151,9 +151,10 @@ xasprintf (const char *fmt, ...)
+@@ -83,7 +83,7 @@ grub_util_error (const char *fmt, ...)
+   vfprintf (stderr, fmt, ap);
+   va_end (ap);
+   fprintf (stderr, ".\n");
+-  grub_exit ();
++  grub_exit (1);
+ }
+ 
+ void *
+@@ -152,12 +152,13 @@ xasprintf (const char *fmt, ...)
  
  #if !defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
  void
@@ -107,13 +116,17 @@ index dfd8a8ec48..0ff13bcaf8 100644
 +__attribute__ ((noreturn))
 +grub_exit (int rc)
  {
+-#if defined (GRUB_KERNEL)
++#if defined (GRUB_KERNEL) && !defined (GRUB_MACHINE_EFI)
+   grub_reboot ();
+ #endif
 -  exit (1);
 +  exit (rc < 0 ? 1 : rc);
  }
  #endif
  
 diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
-index 3314f027fe..36f9134b7b 100644
+index 4fae8b571f1..feaf9295e30 100644
 --- a/grub-core/kern/i386/coreboot/init.c
 +++ b/grub-core/kern/i386/coreboot/init.c
 @@ -41,7 +41,7 @@ extern grub_uint8_t _end[];
@@ -126,7 +139,7 @@ index 3314f027fe..36f9134b7b 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/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c
-index 271b6fbfab..9fafe98f01 100644
+index 08f81d25e68..604fc94b5a0 100644
 --- a/grub-core/kern/i386/qemu/init.c
 +++ b/grub-core/kern/i386/qemu/init.c
 @@ -42,7 +42,7 @@ extern grub_uint8_t _end[];
@@ -139,11 +152,11 @@ index 271b6fbfab..9fafe98f01 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 d483e35eed..e71d158416 100644
+index fb7d1a3bacf..50c65b2f6e5 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
-@@ -71,7 +71,7 @@ grub_addr_t grub_ieee1275_original_stack;
- #endif
+@@ -114,7 +114,7 @@ grub_addr_t grub_ieee1275_original_stack;
+ #define BYTE22              (DY_MEM_V2 | DRC_INFO)
  
  void
 -grub_exit (void)
@@ -152,7 +165,7 @@ index d483e35eed..e71d158416 100644
    grub_ieee1275_exit ();
  }
 diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
-index 2ed3ff3191..5c40c34078 100644
+index 2ed3ff3191e..5c40c34078d 100644
 --- a/grub-core/kern/mips/arc/init.c
 +++ b/grub-core/kern/mips/arc/init.c
 @@ -276,7 +276,7 @@ grub_halt (void)
@@ -165,7 +178,7 @@ index 2ed3ff3191..5c40c34078 100644
    GRUB_ARC_FIRMWARE_VECTOR->exit ();
  
 diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
-index 7b96531b98..dff598ca7b 100644
+index 5bd721260f6..97b09b0eeea 100644
 --- a/grub-core/kern/mips/loongson/init.c
 +++ b/grub-core/kern/mips/loongson/init.c
 @@ -304,7 +304,7 @@ grub_halt (void)
@@ -178,7 +191,7 @@ index 7b96531b98..dff598ca7b 100644
    grub_halt ();
  }
 diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c
-index be88b77d22..8b6c55ffc0 100644
+index b5477b87ffa..69488a34e7c 100644
 --- a/grub-core/kern/mips/qemu_mips/init.c
 +++ b/grub-core/kern/mips/qemu_mips/init.c
 @@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused)))
@@ -191,10 +204,10 @@ index be88b77d22..8b6c55ffc0 100644
    grub_halt ();
  }
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 3af336ee22..63b586d09c 100644
+index 7cee5d75c3c..11037dc0227 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -1209,9 +1209,18 @@ grub_abort (void)
+@@ -1311,9 +1311,18 @@ grub_abort (void)
        grub_getkey ();
      }
  
@@ -215,7 +228,7 @@ index 3af336ee22..63b586d09c 100644
  grub_fatal (const char *fmt, ...)
  {
 diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
-index 3e338645c5..be2a5be1d0 100644
+index 3e338645c57..be2a5be1d07 100644
 --- a/grub-core/kern/uboot/init.c
 +++ b/grub-core/kern/uboot/init.c
 @@ -39,9 +39,9 @@ extern grub_size_t grub_total_module_size;
@@ -240,7 +253,7 @@ index 3e338645c5..be2a5be1d0 100644
    else if (ver > API_SIG_VERSION)
      {
 diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
-index 782ca72952..708b060f32 100644
+index 782ca72952a..708b060f324 100644
 --- a/grub-core/kern/xen/init.c
 +++ b/grub-core/kern/xen/init.c
 @@ -584,7 +584,7 @@ grub_machine_init (void)
@@ -253,15 +266,15 @@ index 782ca72952..708b060f32 100644
    struct sched_shutdown arg;
  
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 7d2b551969..fd18e6320b 100644
+index 1b35a167fde..72aff15750d 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
-@@ -353,7 +353,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
- char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
+@@ -385,7 +385,7 @@ char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
       __attribute__ ((format (GNU_PRINTF, 1, 2))) WARN_UNUSED_RESULT;
  char *EXPORT_FUNC(grub_xvasprintf) (const char *fmt, va_list args) WARN_UNUSED_RESULT;
+ 
 -void EXPORT_FUNC(grub_exit) (void) __attribute__ ((noreturn));
 +void EXPORT_FUNC(grub_exit) (int rc) __attribute__ ((noreturn));
+ void EXPORT_FUNC(grub_abort) (void) __attribute__ ((noreturn));
  grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
  					  grub_uint64_t d,
- 					  grub_uint64_t *r);
diff --git a/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0013-Make-efi-machines-load-an-env-block-from-a-variable.patch
similarity index 71%
rename from 0017-Make-efi-machines-load-an-env-block-from-a-variable.patch
rename to 0013-Make-efi-machines-load-an-env-block-from-a-variable.patch
index ecfab5ae..93552985 100644
--- a/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch
+++ b/0013-Make-efi-machines-load-an-env-block-from-a-variable.patch
@@ -6,14 +6,14 @@ Subject: [PATCH] Make efi machines load an env block from a variable
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  grub-core/Makefile.core.def |  1 +
- grub-core/kern/efi/init.c   | 36 +++++++++++++++++++++++++++++++++++-
- 2 files changed, 36 insertions(+), 1 deletion(-)
+ grub-core/kern/efi/init.c   | 34 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 35 insertions(+)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 45d3edaa4d..c865a08b02 100644
+index 1571421d7e8..0bffbfea917 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -207,6 +207,7 @@ kernel = {
+@@ -219,6 +219,7 @@ kernel = {
    efi = kern/efi/acpi.c;
    efi = kern/efi/sb.c;
    efi = kern/lockdown.c;
@@ -22,10 +22,10 @@ index 45d3edaa4d..c865a08b02 100644
    i386_multiboot = kern/i386/pc/acpi.c;
    i386_coreboot = kern/acpi.c;
 diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 7facacf09c..6d39bd3ad2 100644
+index 6c54af6e79e..b5201974a76 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
-@@ -27,8 +27,11 @@
+@@ -28,8 +28,11 @@
  #include <grub/env.h>
  #include <grub/mm.h>
  #include <grub/kernel.h>
@@ -36,8 +36,8 @@ index 7facacf09c..6d39bd3ad2 100644
 +
  #ifdef GRUB_STACK_PROTECTOR
  
- static grub_efi_guid_t rng_protocol_guid = GRUB_EFI_RNG_PROTOCOL_GUID;
-@@ -82,6 +85,36 @@ stack_protector_init (void)
+ static grub_efi_char16_t stack_chk_fail_msg[] =
+@@ -103,6 +106,36 @@ stack_protector_init (void)
  
  grub_addr_t grub_modbase;
  
@@ -58,7 +58,7 @@ index 7facacf09c..6d39bd3ad2 100644
 +static void
 +grub_efi_env_init (void)
 +{
-+  grub_efi_guid_t efi_grub_guid = GRUB_EFI_GRUB_VARIABLE_GUID;
++  grub_guid_t efi_grub_guid = GRUB_EFI_GRUB_VARIABLE_GUID;
 +  struct grub_envblk envblk_s = { NULL, 0 };
 +  grub_envblk_t envblk = &envblk_s;
 +
@@ -71,19 +71,14 @@ index 7facacf09c..6d39bd3ad2 100644
 +  grub_free (envblk_s.buf);
 +}
 +
- void
+ __attribute__ ((__optimize__ ("-fno-stack-protector"))) void
  grub_efi_init (void)
  {
-@@ -108,10 +141,11 @@ grub_efi_init (void)
-   efi_call_4 (grub_efi_system_table->boot_services->set_watchdog_timer,
- 	      0, 0, 0, NULL);
+@@ -128,6 +161,7 @@ grub_efi_init (void)
+ 
+   grub_efi_system_table->boot_services->set_watchdog_timer (0, 0, 0, NULL);
  
 +  grub_efi_env_init ();
    grub_efidisk_init ();
- }
- 
--void (*grub_efi_net_config) (grub_efi_handle_t hnd, 
-+void (*grub_efi_net_config) (grub_efi_handle_t hnd,
- 			     char **device,
- 			     char **path);
  
+   grub_efi_register_debug_commands ();
diff --git a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0014-Migrate-PPC-from-Yaboot-to-Grub2.patch
similarity index 96%
rename from 0018-Migrate-PPC-from-Yaboot-to-Grub2.patch
rename to 0014-Migrate-PPC-from-Yaboot-to-Grub2.patch
index 1e310e98..1ff254cc 100644
--- a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch
+++ b/0014-Migrate-PPC-from-Yaboot-to-Grub2.patch
@@ -15,11 +15,11 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 util/grub.d/20_ppc_terminfo.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index f8b356cc1f..2c9b283a23 100644
+index 9432365a9df..09bfcadd976 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -508,6 +508,13 @@ script = {
-   condition = COND_HOST_LINUX;
+@@ -517,6 +517,13 @@ script = {
+   installdir = grubconf;
  };
  
 +script = {
@@ -34,7 +34,7 @@ index f8b356cc1f..2c9b283a23 100644
    common = util/grub.d/30_os-prober.in;
 diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in
 new file mode 100644
-index 0000000000..10d6658682
+index 00000000000..10d66586820
 --- /dev/null
 +++ b/util/grub.d/20_ppc_terminfo.in
 @@ -0,0 +1,114 @@
diff --git a/0019-Add-fw_path-variable-revised.patch b/0015-Add-fw_path-variable-revised.patch
similarity index 96%
rename from 0019-Add-fw_path-variable-revised.patch
rename to 0015-Add-fw_path-variable-revised.patch
index 804938bd..4012f3fe 100644
--- a/0019-Add-fw_path-variable-revised.patch
+++ b/0015-Add-fw_path-variable-revised.patch
@@ -17,7 +17,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  2 files changed, 30 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 73967e2f5b..d1de9fa687 100644
+index 731c07c2901..463dafdba02 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -128,16 +128,15 @@ grub_set_prefix_and_root (void)
@@ -44,7 +44,7 @@ index 73967e2f5b..d1de9fa687 100644
      }
  
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 70614de156..62571e6dfc 100644
+index d3f53d93d87..08f48c71df1 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -339,7 +339,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
diff --git a/0020-Pass-x-hex-hex-straight-through-unmolested.patch b/0016-Pass-x-hex-hex-straight-through-unmolested.patch
similarity index 97%
rename from 0020-Pass-x-hex-hex-straight-through-unmolested.patch
rename to 0016-Pass-x-hex-hex-straight-through-unmolested.patch
index c2623acf..e1aa1aff 100644
--- a/0020-Pass-x-hex-hex-straight-through-unmolested.patch
+++ b/0016-Pass-x-hex-hex-straight-through-unmolested.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  3 files changed, 75 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
-index cc3290311f..8f67a4be7f 100644
+index ed65865050a..5455242c352 100644
 --- a/grub-core/commands/wildcard.c
 +++ b/grub-core/commands/wildcard.c
 @@ -488,6 +488,12 @@ check_file (const char *dir, const char *basename)
@@ -47,7 +47,7 @@ index cc3290311f..8f67a4be7f 100644
  	  *optr++ = iptr[1];
  	  iptr += 2;
 diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index ed0b149dca..8e2294d8ff 100644
+index ed0b149dca5..8e2294d8ff6 100644
 --- a/grub-core/lib/cmdline.c
 +++ b/grub-core/lib/cmdline.c
 @@ -20,6 +20,12 @@
@@ -97,7 +97,7 @@ index ed0b149dca..8e2294d8ff 100644
  
  	  *buf++ = *c;
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index ad80399246..0c6dd9c520 100644
+index dab8fd2aeb0..c19b4bf700e 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0;
diff --git a/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0017-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
similarity index 98%
rename from 0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
rename to 0017-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
index c452b5f8..56582e58 100644
--- a/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+++ b/0017-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
@@ -28,10 +28,10 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
  create mode 100644 grub-core/commands/loadenv.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index c865a08b02..c15e91943b 100644
+index 0bffbfea917..47c0fc755a2 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -814,6 +814,16 @@ module = {
+@@ -842,6 +842,16 @@ module = {
    common = commands/blocklist.c;
  };
  
@@ -48,7 +48,7 @@ index c865a08b02..c15e91943b 100644
  module = {
    name = boot;
    common = commands/boot.c;
-@@ -980,6 +990,7 @@ module = {
+@@ -1009,6 +1019,7 @@ module = {
  module = {
    name = loadenv;
    common = commands/loadenv.c;
@@ -58,7 +58,7 @@ index c865a08b02..c15e91943b 100644
  
 diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
 new file mode 100644
-index 0000000000..e907a6a5d2
+index 00000000000..e907a6a5d28
 --- /dev/null
 +++ b/grub-core/commands/blscfg.c
 @@ -0,0 +1,1177 @@
@@ -1240,7 +1240,7 @@ index 0000000000..e907a6a5d2
 +  grub_unregister_extcmd (oldcmd);
 +}
 diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
-index cc5971f4db..782761c31a 100644
+index e9e9d94eff5..2c5d1a0ef9a 100644
 --- a/grub-core/commands/legacycfg.c
 +++ b/grub-core/commands/legacycfg.c
 @@ -143,7 +143,7 @@ legacy_file (const char *filename)
@@ -1263,7 +1263,7 @@ index cc5971f4db..782761c31a 100644
      }
  
 diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
-index 3fd664aac3..163b9a0904 100644
+index 16644584978..dfcb19e0ff8 100644
 --- a/grub-core/commands/loadenv.c
 +++ b/grub-core/commands/loadenv.c
 @@ -28,6 +28,8 @@
@@ -1358,7 +1358,7 @@ index 3fd664aac3..163b9a0904 100644
  grub_cmd_load_env (grub_extcmd_context_t ctxt, int argc, char **args)
  {
 diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
-index 720e6d8ea3..b194123eb6 100644
+index 720e6d8ea3b..b194123eb67 100644
 --- a/grub-core/commands/menuentry.c
 +++ b/grub-core/commands/menuentry.c
 @@ -78,7 +78,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
@@ -1430,7 +1430,7 @@ index 720e6d8ea3..b194123eb6 100644
    src[len - 1] = ch;
    args[argc - 1] = src;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 62571e6dfc..7ca2e5400b 100644
+index 08f48c71df1..1317279c081 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -21,6 +21,7 @@
@@ -1455,7 +1455,7 @@ index 62571e6dfc..7ca2e5400b 100644
        grub_free ((void *) entry->title);
 diff --git a/grub-core/commands/loadenv.h b/grub-core/commands/loadenv.h
 new file mode 100644
-index 0000000000..952f46121b
+index 00000000000..952f46121bd
 --- /dev/null
 +++ b/grub-core/commands/loadenv.h
 @@ -0,0 +1,93 @@
@@ -1553,7 +1553,7 @@ index 0000000000..952f46121b
 +  return 0;
 +}
 diff --git a/include/grub/compiler.h b/include/grub/compiler.h
-index 8f3be3ae70..ebafec6895 100644
+index 0c5519387b2..441a9eca07c 100644
 --- a/include/grub/compiler.h
 +++ b/include/grub/compiler.h
 @@ -56,4 +56,6 @@
@@ -1564,7 +1564,7 @@ index 8f3be3ae70..ebafec6895 100644
 +
  #endif /* ! GRUB_COMPILER_HEADER */
 diff --git a/include/grub/menu.h b/include/grub/menu.h
-index ee2b5e9104..0acdc2aa6b 100644
+index ee2b5e91045..0acdc2aa6bf 100644
 --- a/include/grub/menu.h
 +++ b/include/grub/menu.h
 @@ -20,6 +20,16 @@
@@ -1595,7 +1595,7 @@ index ee2b5e9104..0acdc2aa6b 100644
  typedef struct grub_menu_entry *grub_menu_entry_t;
  
 diff --git a/include/grub/normal.h b/include/grub/normal.h
-index 218cbabcca..8839ad85a1 100644
+index 218cbabccaf..8839ad85a19 100644
 --- a/include/grub/normal.h
 +++ b/include/grub/normal.h
 @@ -145,7 +145,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes,
diff --git a/0022-Add-devicetree-loading.patch b/0018-Add-devicetree-loading.patch
similarity index 90%
rename from 0022-Add-devicetree-loading.patch
rename to 0018-Add-devicetree-loading.patch
index 466ddba8..3897a2a6 100644
--- a/0022-Add-devicetree-loading.patch
+++ b/0018-Add-devicetree-loading.patch
@@ -20,10 +20,10 @@ Signed-off-by: David A. Marlin <dmarlin@redhat.com>
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index d3e879b8e5..8ea2315ebc 100644
+index 7516a015be0..7b355115dd4 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -248,7 +248,8 @@ export GRUB_DEFAULT \
+@@ -252,7 +252,8 @@ export GRUB_DEFAULT \
    GRUB_ENABLE_CRYPTODISK \
    GRUB_BADRAM \
    GRUB_OS_PROBER_SKIP_LIST \
@@ -34,10 +34,10 @@ index d3e879b8e5..8ea2315ebc 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index e8b01c0d0c..dc75a1c30b 100644
+index cc393be7eda..00d4b220ccb 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -153,6 +153,13 @@ EOF
+@@ -155,6 +155,13 @@ EOF
      sed "s/^/$submenu_indentation/" << EOF
  	echo	'$(echo "$message" | grub_quote)'
  	initrd	$(echo $initrd_path)
@@ -51,7 +51,7 @@ index e8b01c0d0c..dc75a1c30b 100644
  EOF
    fi
    sed "s/^/$submenu_indentation/" << EOF
-@@ -236,6 +243,14 @@ while [ "x$list" != "x" ] ; do
+@@ -250,6 +257,14 @@ for linux in ${reverse_sorted_list}; do
      gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
    fi
  
diff --git a/0023-Enable-pager-by-default.-985860.patch b/0019-Enable-pager-by-default.-985860.patch
similarity index 94%
rename from 0023-Enable-pager-by-default.-985860.patch
rename to 0019-Enable-pager-by-default.-985860.patch
index 63cf787b..8f38cc2b 100644
--- a/0023-Enable-pager-by-default.-985860.patch
+++ b/0019-Enable-pager-by-default.-985860.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a90233ea..858b526c92 100644
+index 6a316a5ba77..c2d8b093762 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_
diff --git a/0024-Don-t-say-GNU-Linux-in-generated-menus.patch b/0020-Don-t-say-GNU-Linux-in-generated-menus.patch
similarity index 91%
rename from 0024-Don-t-say-GNU-Linux-in-generated-menus.patch
rename to 0020-Don-t-say-GNU-Linux-in-generated-menus.patch
index 5b967849..a299f052 100644
--- a/0024-Don-t-say-GNU-Linux-in-generated-menus.patch
+++ b/0020-Don-t-say-GNU-Linux-in-generated-menus.patch
@@ -13,20 +13,20 @@ Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
  5 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 7ca2e5400b..98372217ad 100644
+index 1317279c081..568c2adfa16 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -218,7 +218,7 @@ grub_normal_init_page (struct grub_term_output *term,
-  
+ 
    grub_term_cls (term);
  
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
 +  msg_formatted = grub_xasprintf (_("GRUB version %s"), PACKAGE_VERSION);
    if (!msg_formatted)
      return;
-  
+ 
 diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
-index 8a87109b15..9a4319d4f4 100644
+index 8a87109b152..9a4319d4f4f 100644
 --- a/tests/util/grub-shell-tester.in
 +++ b/tests/util/grub-shell-tester.in
 @@ -56,7 +56,7 @@ for option in "$@"; do
@@ -39,10 +39,10 @@ index 8a87109b15..9a4319d4f4 100644
      --modules=*)
  	ms=`echo "$option" | sed -e 's/--modules=//'`
 diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
-index 93e9f51484..ec1182bf93 100644
+index 496e1bab33c..e0570c88e15 100644
 --- a/tests/util/grub-shell.in
 +++ b/tests/util/grub-shell.in
-@@ -209,7 +209,7 @@ for option in "$@"; do
+@@ -243,7 +243,7 @@ for option in "$@"; do
  	usage
  	exit 0 ;;
      -v | --version)
@@ -50,9 +50,9 @@ index 93e9f51484..ec1182bf93 100644
 +	echo "$0 (GRUB ${PACKAGE_VERSION})"
  	exit 0 ;;
      --trim)
- 	trim=1
+ 	trim=1 ;;
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index dc75a1c30b..4a499c53a6 100644
+index 00d4b220ccb..901745707f1 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
@@ -68,7 +68,7 @@ index dc75a1c30b..4a499c53a6 100644
  fi
  
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index 3b1f470492..ada20775a1 100644
+index 94dd8be1342..98ee5bc58dc 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
diff --git a/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0021-Add-.eh_frame-to-list-of-relocations-stripped.patch
similarity index 76%
rename from 0025-Add-.eh_frame-to-list-of-relocations-stripped.patch
rename to 0021-Add-.eh_frame-to-list-of-relocations-stripped.patch
index 0532a041..9344171f 100644
--- a/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch
+++ b/0021-Add-.eh_frame-to-list-of-relocations-stripped.patch
@@ -3,20 +3,21 @@ From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 13 Jan 2014 21:50:59 -0500
 Subject: [PATCH] Add .eh_frame to list of relocations stripped
 
+Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  conf/Makefile.common | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 2a1a886f6d..191b1a70c6 100644
+index b8f216f6cd3..ece9ed8a1bf 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
-@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
+@@ -41,7 +41,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
  LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC)
  CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
  CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
 -STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
 +STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
- 
- CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
- LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
+ if !COND_emu
+ if COND_HAVE_ASM_USCORE
+   LDFLAGS_KERNEL += -Wl,--defsym=_malloc=_grub_malloc -Wl,--defsym=_free=_grub_free
diff --git a/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0022-Don-t-require-a-password-to-boot-entries-generated-b.patch
similarity index 96%
rename from 0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
rename to 0022-Don-t-require-a-password-to-boot-entries-generated-b.patch
index 89887c11..b2806860 100644
--- a/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
+++ b/0022-Don-t-require-a-password-to-boot-entries-generated-b.patch
@@ -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 4a499c53a6..cf8d118698 100644
+index 901745707f1..9c31a94decb 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -26,7 +26,7 @@ datarootdir="@datarootdir@"
diff --git a/0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0023-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
similarity index 97%
rename from 0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
rename to 0023-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
index 1da91e10..40f598dd 100644
--- a/0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+++ b/0023-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 98372217ad..bf24e65713 100644
+index 568c2adfa16..0b2bbee19c3 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -347,7 +347,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
diff --git a/0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0024-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
similarity index 99%
rename from 0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
rename to 0024-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
index 0d772813..be44d1a5 100644
--- a/0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+++ b/0024-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 51 insertions(+), 46 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index bf24e65713..0a99768f75 100644
+index 0b2bbee19c3..4c89892fa70 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -345,61 +345,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
diff --git a/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0025-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
similarity index 96%
rename from 0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
rename to 0025-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
index f22e6f9c..d29c0aff 100644
--- a/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+++ b/0025-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index cf8d118698..5f6d3c8d52 100644
+index 9c31a94decb..b7809091b36 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"
diff --git a/0031-Try-prefix-if-fw_path-doesn-t-work.patch b/0026-Try-prefix-if-fw_path-doesn-t-work.patch
similarity index 93%
rename from 0031-Try-prefix-if-fw_path-doesn-t-work.patch
rename to 0026-Try-prefix-if-fw_path-doesn-t-work.patch
index a1c0d9e9..effa3510 100644
--- a/0031-Try-prefix-if-fw_path-doesn-t-work.patch
+++ b/0026-Try-prefix-if-fw_path-doesn-t-work.patch
@@ -7,38 +7,26 @@ Related: rhbz#1148652
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/kern/ieee1275/init.c |  28 +++++----
+ grub-core/kern/ieee1275/init.c |  34 ++++++-----
  grub-core/net/net.c            |   2 +-
  grub-core/normal/main.c        | 134 ++++++++++++++++++++---------------------
- 3 files changed, 82 insertions(+), 82 deletions(-)
+ 3 files changed, 85 insertions(+), 85 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index e71d158416..0cd2a62723 100644
+index 50c65b2f6e5..51c1e1c9d9f 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
-@@ -127,23 +127,25 @@ grub_machine_get_bootlocation (char **device, char **path)
+@@ -170,23 +170,25 @@ grub_machine_get_bootlocation (char **device, char **path)
        grub_free (canon);
      }
    else
 -    *device = grub_ieee1275_encode_devname (bootpath);
--  grub_free (type);
--
--  filename = grub_ieee1275_get_filename (bootpath);
--  if (filename)
-     {
--      char *lastslash = grub_strrchr (filename, '\\');
--
--      /* Truncate at last directory.  */
--      if (lastslash)
++    {
 +      filename = grub_ieee1275_get_filename (bootpath);
 +      if (filename)
-         {
--	  *lastslash = '\0';
--	  grub_translate_ieee1275_path (filename);
++        {
 +          char *lastslash = grub_strrchr (filename, '\\');
- 
--	  *path = filename;
--	}
++
 +          /* Truncate at last directory.  */
 +          if (lastslash)
 +            {
@@ -49,17 +37,32 @@ index e71d158416..0cd2a62723 100644
 +            }
 +        }
 +      *device = grub_ieee1275_encode_devname (bootpath);
-     }
++    }
 +
-+  grub_free (type);
+   grub_free (type);
+-
+-  filename = grub_ieee1275_get_filename (bootpath);
+-  if (filename)
+-    {
+-      char *lastslash = grub_strrchr (filename, '\\');
+-
+-      /* Truncate at last directory.  */
+-      if (lastslash)
+-        {
+-	  *lastslash = '\0';
+-	  grub_translate_ieee1275_path (filename);
+-
+-	  *path = filename;
+-	}
+-    }
    grub_free (bootpath);
  }
  
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 4d3eb5c1a5..0ef148f4ad 100644
+index 8cad4fb6d4d..54451cea2a7 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
-@@ -1869,7 +1869,7 @@ grub_net_search_config_file (char *config)
+@@ -2005,7 +2005,7 @@ grub_net_search_config_file (char *config)
    /* Remove the remaining minus sign at the end. */
    config[config_len] = '\0';
  
@@ -69,7 +72,7 @@ index 4d3eb5c1a5..0ef148f4ad 100644
  
  static struct grub_preboot *fini_hnd;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 0a99768f75..55558cc0b9 100644
+index 4c89892fa70..3463f444f74 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -335,81 +335,79 @@ grub_enter_normal_mode (const char *config)
diff --git a/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0027-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
similarity index 95%
rename from 0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
rename to 0027-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
index db101c02..1fb624e3 100644
--- a/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+++ b/0027-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
@@ -12,10 +12,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 27 insertions(+), 7 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 5f6d3c8d52..786dbabb4a 100644
+index b7809091b36..993c53ad92e 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -78,6 +78,32 @@ case x"$GRUB_FS" in
+@@ -80,6 +80,32 @@ case x"$GRUB_FS" in
  	;;
  esac
  
@@ -48,7 +48,7 @@ index 5f6d3c8d52..786dbabb4a 100644
  title_correction_code=
  
  linux_entry ()
-@@ -91,17 +117,11 @@ linux_entry ()
+@@ -93,17 +119,11 @@ linux_entry ()
        boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
    fi
    if [ x$type != xsimple ] ; then
diff --git a/0034-Add-friendly-grub2-password-config-tool-985962.patch b/0028-Add-friendly-grub2-password-config-tool-985962.patch
similarity index 93%
rename from 0034-Add-friendly-grub2-password-config-tool-985962.patch
rename to 0028-Add-friendly-grub2-password-config-tool-985962.patch
index 49089f95..2e1ba2cd 100644
--- a/0034-Add-friendly-grub2-password-config-tool-985962.patch
+++ b/0028-Add-friendly-grub2-password-config-tool-985962.patch
@@ -14,7 +14,7 @@ Signed-off-by: Robert Marshall <rmarshall@redhat.com>
 Signed-off-by: Peter Jones <pjones@redhat.com>
 [luto: fix grub-setpassword -o's output path]
 Signed-off-by: Andy Lutomirski <luto@kernel.org>
-[rharwood: migrate man page to h2m]
+[rharwood: migrate man page to h2m, context]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  configure.ac                   |   1 +
@@ -29,22 +29,22 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 util/grub.d/01_users.in
 
 diff --git a/configure.ac b/configure.ac
-index 87c8f17393..916bede6bf 100644
+index ae3a49321ad..493e336ec6c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
+@@ -77,6 +77,7 @@ grub_TRANSFORM([grub-mkrelpath])
  grub_TRANSFORM([grub-mkrescue])
  grub_TRANSFORM([grub-probe])
  grub_TRANSFORM([grub-reboot])
 +grub_TRANSFORM([grub-set-password])
- grub_TRANSFORM([grub-rpm-sort])
  grub_TRANSFORM([grub-script-check])
  grub_TRANSFORM([grub-set-default])
+ grub_TRANSFORM([grub-sparc64-setup])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index bc10cc7972..8ca4c14f0b 100644
+index 09bfcadd976..95884956a68 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -452,6 +452,12 @@ script = {
+@@ -455,6 +455,12 @@ script = {
    installdir = grubconf;
  };
  
@@ -57,7 +57,7 @@ index bc10cc7972..8ca4c14f0b 100644
  script = {
    name = '10_windows';
    common = util/grub.d/10_windows.in;
-@@ -741,6 +747,13 @@ script = {
+@@ -733,6 +739,13 @@ script = {
    installdir = sbin;
  };
  
@@ -73,17 +73,17 @@ index bc10cc7972..8ca4c14f0b 100644
    common = util/grub-mkconfig_lib.in;
 diff --git a/docs/man/grub-set-password.h2m b/docs/man/grub-set-password.h2m
 new file mode 100644
-index 0000000000..10ee82f4d5
+index 00000000000..10ee82f4d52
 --- /dev/null
 +++ b/docs/man/grub-set-password.h2m
 @@ -0,0 +1,2 @@
 +[NAME]
 +grub-set-password \- generate the user.cfg file containing the hashed grub bootloader password
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 8ea2315ebc..ba14cf6261 100644
+index 7b355115dd4..5f2824d4f58 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -276,6 +276,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
+@@ -280,6 +280,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
      *~) ;;
      # emacsen autosave files. FIXME: support other editors
      */\#*\#) ;;
@@ -94,7 +94,7 @@ index 8ea2315ebc..ba14cf6261 100644
          echo
 diff --git a/util/grub-set-password.in b/util/grub-set-password.in
 new file mode 100644
-index 0000000000..5ebf50576d
+index 00000000000..5ebf50576d6
 --- /dev/null
 +++ b/util/grub-set-password.in
 @@ -0,0 +1,128 @@
@@ -228,7 +228,7 @@ index 0000000000..5ebf50576d
 +fi
 diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in
 new file mode 100644
-index 0000000000..db2f44bfb7
+index 00000000000..db2f44bfb78
 --- /dev/null
 +++ b/util/grub.d/01_users.in
 @@ -0,0 +1,11 @@
diff --git a/0035-tcp-add-window-scaling-support.patch b/0029-tcp-add-window-scaling-support.patch
similarity index 95%
rename from 0035-tcp-add-window-scaling-support.patch
rename to 0029-tcp-add-window-scaling-support.patch
index 61b5a679..ef3a81ee 100644
--- a/0035-tcp-add-window-scaling-support.patch
+++ b/0029-tcp-add-window-scaling-support.patch
@@ -17,7 +17,7 @@ Signed-off-by: Josef Bacik <jbacik@fb.com>
  1 file changed, 29 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
-index e8ad34b84d..7d4b822626 100644
+index 93dee0caa1b..902ab7e8ae6 100644
 --- a/grub-core/net/tcp.c
 +++ b/grub-core/net/tcp.c
 @@ -106,6 +106,18 @@ struct tcphdr
@@ -39,7 +39,7 @@ index e8ad34b84d..7d4b822626 100644
  struct tcp_pseudohdr
  {
    grub_uint32_t src;
-@@ -566,7 +578,7 @@ grub_net_tcp_open (char *server,
+@@ -571,7 +583,7 @@ grub_net_tcp_open (char *server,
    grub_net_tcp_socket_t socket;
    static grub_uint16_t in_port = 21550;
    struct grub_net_buff *nb;
@@ -48,7 +48,7 @@ index e8ad34b84d..7d4b822626 100644
    int i;
    grub_uint8_t *nbd;
    grub_net_link_level_address_t ll_target_addr;
-@@ -635,20 +647,24 @@ grub_net_tcp_open (char *server,
+@@ -640,20 +652,24 @@ grub_net_tcp_open (char *server,
      }
  
    tcph = (void *) nb->data;
diff --git a/0036-efinet-and-bootp-add-support-for-dhcpv6.patch b/0030-efinet-and-bootp-add-support-for-dhcpv6.patch
similarity index 84%
rename from 0036-efinet-and-bootp-add-support-for-dhcpv6.patch
rename to 0030-efinet-and-bootp-add-support-for-dhcpv6.patch
index efeeee0a..19a63c5b 100644
--- a/0036-efinet-and-bootp-add-support-for-dhcpv6.patch
+++ b/0030-efinet-and-bootp-add-support-for-dhcpv6.patch
@@ -6,18 +6,18 @@ Subject: [PATCH] efinet and bootp: add support for dhcpv6
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  grub-core/net/bootp.c              | 173 +++++++++++++++++++++++++++++++++++++
- grub-core/net/drivers/efi/efinet.c |  53 ++++++++++--
+ grub-core/net/drivers/efi/efinet.c |  84 +++++++++++++-----
  grub-core/net/net.c                |  72 +++++++++++++++
- grub-core/net/tftp.c               |   4 +
+ grub-core/net/tftp.c               |   3 +
  include/grub/efi/api.h             | 129 +++++++++++++++++++++++++--
  include/grub/net.h                 |  60 +++++++++++++
- 6 files changed, 477 insertions(+), 14 deletions(-)
+ 6 files changed, 491 insertions(+), 30 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 6fb5627025..e28fb6a09f 100644
+index abe45ef7bf6..02d2c2614cb 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
-@@ -902,6 +902,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
+@@ -905,6 +905,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
  
  static grub_command_t cmd_getdhcp, cmd_bootp, cmd_dhcp;
  
@@ -198,7 +198,7 @@ index 6fb5627025..e28fb6a09f 100644
  grub_bootp_init (void)
  {
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952ba..173fb63153 100644
+index 3ea25cf9894..2af8742f904 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -18,11 +18,14 @@
@@ -216,16 +216,16 @@ index 5388f952ba..173fb63153 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -329,7 +332,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -346,7 +349,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  			  char **path)
  {
    struct grub_net_card *card;
 -  grub_efi_device_path_t *dp;
 +  grub_efi_device_path_t *dp, *ldp = NULL;
- 
-   dp = grub_efi_get_device_path (hnd);
-   if (! dp)
-@@ -340,14 +343,19 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+   struct grub_net_network_level_interface *inter;
+   grub_efi_device_path_t *vlan_dp;
+   grub_efi_uint16_t vlan_dp_len;
+@@ -361,14 +364,19 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
      grub_efi_device_path_t *cdp;
      struct grub_efi_pxe *pxe;
      struct grub_efi_pxe_mode *pxe_mode;
@@ -246,7 +246,7 @@ index 5388f952ba..173fb63153 100644
  	int match;
  
  	/* EDK2 UEFI PXE driver creates pseudo devices with type IPv4/IPv6
-@@ -356,7 +364,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -377,7 +385,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	   devices. We skip them when enumerating cards, so here we need to
  	   find matching MAC device.
           */
@@ -254,7 +254,7 @@ index 5388f952ba..173fb63153 100644
  	if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
  	    || (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
  		&& GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE))
-@@ -373,16 +380,46 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -394,41 +401,70 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	if (!match)
  	  continue;
        }
@@ -265,11 +265,6 @@ index 5388f952ba..173fb63153 100644
        continue;
 +
      pxe_mode = pxe->mode;
--    grub_net_configure_by_dhcp_ack (card->name, card, 0,
--				    (struct grub_net_bootp_packet *)
--				    &pxe_mode->dhcp_ack,
--				    sizeof (pxe_mode->dhcp_ack),
--				    1, device, path);
 +    if (pxe_mode->using_ipv6)
 +      {
 +	grub_net_link_level_address_t hwaddr;
@@ -281,41 +276,86 @@ index 5388f952ba..173fb63153 100644
 +		      pxe_mode->dhcp_ack_received ? "" : " cannot continue");
 +	if (!pxe_mode->dhcp_ack_received)
 +	  continue;
-+
+ 
+-    inter = grub_net_configure_by_dhcp_ack (card->name, card, 0,
+-					    (struct grub_net_bootp_packet *)
+-					    &pxe_mode->dhcp_ack,
+-					    sizeof (pxe_mode->dhcp_ack),
+-					    1, device, path);
 +	hwaddr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
 +	grub_memcpy (hwaddr.mac,
 +		     card->efi_net->mode->current_address,
 +		     sizeof (hwaddr.mac));
-+
-+	intf = grub_net_configure_by_dhcpv6_ack (card->name, card, 0, &hwaddr,
+ 
+-    if (inter != NULL)
++	inter = grub_net_configure_by_dhcpv6_ack (card->name, card, 0, &hwaddr,
 +	      (const struct grub_net_dhcpv6_packet *)&pxe_mode->dhcp_ack.dhcpv6,
 +	      1, device, path);
-+	if (intf && device && path)
++	if (inter && device && path)
 +	  grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
 +      }
 +    else
-+      {
+       {
+-	/*
+-	 * Search the device path for any VLAN subtype and use it
+-	 * to configure the interface.
+-	 */
+-	vlan_dp = dp;
 +	grub_dprintf ("efinet", "using ipv4 and dhcp\n");
-+	grub_net_configure_by_dhcp_ack (card->name, card, 0,
-+					(struct grub_net_bootp_packet *)
-+					&pxe_mode->dhcp_ack,
-+					sizeof (pxe_mode->dhcp_ack),
-+					1, device, path);
++	inter = grub_net_configure_by_dhcp_ack (card->name, card, 0,
++						(struct grub_net_bootp_packet *)
++						&pxe_mode->dhcp_ack,
++						sizeof (pxe_mode->dhcp_ack),
++						1, device, path);
+ 
+-	while (!GRUB_EFI_END_ENTIRE_DEVICE_PATH (vlan_dp))
 +	grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
-+      }
-     return;
++	if (inter != NULL)
+ 	  {
+-	    if (GRUB_EFI_DEVICE_PATH_TYPE (vlan_dp) == GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE &&
+-		GRUB_EFI_DEVICE_PATH_SUBTYPE (vlan_dp) == GRUB_EFI_VLAN_DEVICE_PATH_SUBTYPE)
++	    /*
++	     * Search the device path for any VLAN subtype and use it
++	     * to configure the interface.
++	     */
++	    vlan_dp = dp;
++
++	    while (!GRUB_EFI_END_ENTIRE_DEVICE_PATH (vlan_dp))
+ 	      {
+-		vlan = (grub_efi_vlan_device_path_t *) vlan_dp;
+-		inter->vlantag = vlan->vlan_id;
+-		break;
++		if (GRUB_EFI_DEVICE_PATH_TYPE (vlan_dp) == GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE &&
++		    GRUB_EFI_DEVICE_PATH_SUBTYPE (vlan_dp) == GRUB_EFI_VLAN_DEVICE_PATH_SUBTYPE)
++		  {
++		    vlan = (grub_efi_vlan_device_path_t *) vlan_dp;
++		    inter->vlantag = vlan->vlan_id;
++		    break;
++		  }
++
++		vlan_dp_len = GRUB_EFI_DEVICE_PATH_LENGTH (vlan_dp);
++		vlan_dp = (grub_efi_device_path_t *) ((grub_efi_uint8_t *) vlan_dp + vlan_dp_len);
+ 	      }
+-
+-	    vlan_dp_len = GRUB_EFI_DEVICE_PATH_LENGTH (vlan_dp);
+-	    vlan_dp = (grub_efi_device_path_t *) ((grub_efi_uint8_t *) vlan_dp + vlan_dp_len);
+ 	  }
++	return;
+       }
+-    return;
    }
  }
+ 
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 0ef148f4ad..22f2689aae 100644
+index 54451cea2a7..20c55257647 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
-@@ -960,6 +960,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
+@@ -984,6 +984,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
    grub_net_network_level_interfaces = inter;
  }
  
 +int
-+grub_ipv6_get_masksize (grub_uint16_t be_mask[8])
++grub_ipv6_get_masksize (grub_uint16_t *be_mask)
 +{
 +  grub_uint8_t *mask;
 +  grub_uint16_t mask16[8];
@@ -390,10 +430,10 @@ index 0ef148f4ad..22f2689aae 100644
  grub_err_t
  grub_net_add_ipv4_local (struct grub_net_network_level_interface *inter,
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 7f44b30f52..4ab2f5c735 100644
+index 409b1d09bcd..f300a9d4007 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
-@@ -358,18 +358,22 @@ tftp_open (struct grub_file *file, const char *filename)
+@@ -359,6 +359,7 @@ tftp_open (struct grub_file *file, const char *filename)
    file->not_easily_seekable = 1;
    file->data = data;
  
@@ -401,14 +441,13 @@ index 7f44b30f52..4ab2f5c735 100644
    err = grub_net_resolve_address (file->device->net->server, &addr);
    if (err)
      {
-+      grub_dprintf("tftp", "Address resolution failed: %d\n", err);
-       grub_free (data);
+@@ -369,11 +370,13 @@ tftp_open (struct grub_file *file, const char *filename)
        return err;
      }
  
 +  grub_dprintf("tftp", "opening connection\n");
    data->sock = grub_net_udp_open (addr,
- 				  TFTP_SERVER_PORT, tftp_receive,
+ 				  port ? port : TFTP_SERVER_PORT, tftp_receive,
  				  file);
    if (!data->sock)
      {
@@ -417,10 +456,10 @@ index 7f44b30f52..4ab2f5c735 100644
        return grub_errno;
      }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index f1a52210c0..117469450d 100644
+index d44d00ad7d5..c6d702831f7 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -592,10 +592,16 @@ typedef void *grub_efi_handle_t;
+@@ -637,10 +637,16 @@ typedef void *grub_efi_handle_t;
  typedef void *grub_efi_event_t;
  typedef grub_efi_uint64_t grub_efi_lba_t;
  typedef grub_efi_uintn_t grub_efi_tpl_t;
@@ -441,7 +480,7 @@ index f1a52210c0..117469450d 100644
  typedef grub_efi_uint64_t grub_efi_physical_address_t;
  typedef grub_efi_uint64_t grub_efi_virtual_address_t;
  
-@@ -1474,16 +1480,127 @@ struct grub_efi_simple_text_output_interface
+@@ -1521,16 +1527,127 @@ struct grub_efi_simple_text_output_interface
  };
  typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output_interface_t;
  
@@ -572,10 +611,10 @@ index f1a52210c0..117469450d 100644
  
  typedef struct grub_efi_pxe
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 7ae4b6bd80..8a05ec4fe7 100644
+index 844e501c128..bf8430a6364 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
-@@ -447,6 +447,51 @@ struct grub_net_bootp_packet
+@@ -450,6 +450,51 @@ struct grub_net_bootp_packet
    grub_uint8_t vendor[0];
  } GRUB_PACKED;
  
@@ -627,7 +666,7 @@ index 7ae4b6bd80..8a05ec4fe7 100644
  #define	GRUB_NET_BOOTP_RFC1048_MAGIC_0	0x63
  #define	GRUB_NET_BOOTP_RFC1048_MAGIC_1	0x82
  #define	GRUB_NET_BOOTP_RFC1048_MAGIC_2	0x53
-@@ -482,6 +527,21 @@ grub_net_configure_by_dhcp_ack (const char *name,
+@@ -485,6 +530,21 @@ grub_net_configure_by_dhcp_ack (const char *name,
  				grub_size_t size,
  				int is_def, char **device, char **path);
  
diff --git a/0074-bootp-New-net_bootp6-command.patch b/0031-bootp-New-net_bootp6-command.patch
similarity index 96%
rename from 0074-bootp-New-net_bootp6-command.patch
rename to 0031-bootp-New-net_bootp6-command.patch
index bef3acdc..91e58f29 100644
--- a/0074-bootp-New-net_bootp6-command.patch
+++ b/0031-bootp-New-net_bootp6-command.patch
@@ -12,14 +12,14 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  grub-core/net/bootp.c              | 1059 ++++++++++++++++++++++++++++++------
- grub-core/net/drivers/efi/efinet.c |   20 +-
+ grub-core/net/drivers/efi/efinet.c |   18 +-
  grub-core/net/ip.c                 |   39 ++
  include/grub/efi/api.h             |    2 +-
  include/grub/net.h                 |   91 ++--
- 5 files changed, 1002 insertions(+), 209 deletions(-)
+ 5 files changed, 1001 insertions(+), 208 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 08b6b2b5d6..fe93b80f1c 100644
+index 02d2c2614cb..e0aec25233d 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -24,6 +24,98 @@
@@ -121,7 +121,7 @@ index 08b6b2b5d6..fe93b80f1c 100644
  
  struct grub_dhcp_discover_options
  {
-@@ -604,6 +696,584 @@ out:
+@@ -610,6 +702,584 @@ out:
    return err;
  }
  
@@ -427,7 +427,7 @@ index 08b6b2b5d6..fe93b80f1c 100644
 +  grub_dhcp6_session_t se;
 +  struct grub_datetime date;
 +  grub_err_t err;
-+  grub_int32_t t = 0;
++  grub_int64_t t = 0;
 +
 +  se = grub_malloc (sizeof (*se));
 +
@@ -706,7 +706,7 @@ index 08b6b2b5d6..fe93b80f1c 100644
  /*
   * This is called directly from net/ip.c:handle_dgram(), because those
   * BOOTP/DHCP packets are a bit special due to their improper
-@@ -672,6 +1342,77 @@ grub_net_process_dhcp (struct grub_net_buff *nb,
+@@ -678,6 +1348,77 @@ grub_net_process_dhcp (struct grub_net_buff *nb,
      }
  }
  
@@ -784,7 +784,7 @@ index 08b6b2b5d6..fe93b80f1c 100644
  static grub_err_t
  grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
  		  int argc, char **args)
-@@ -897,180 +1638,174 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
+@@ -903,180 +1644,174 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
    return err;
  }
  
@@ -1119,7 +1119,7 @@ index 08b6b2b5d6..fe93b80f1c 100644
  
  void
  grub_bootp_init (void)
-@@ -1084,11 +1819,15 @@ grub_bootp_init (void)
+@@ -1090,11 +1825,15 @@ grub_bootp_init (void)
    cmd_getdhcp = grub_register_command ("net_get_dhcp_option", grub_cmd_dhcpopt,
  				       N_("VAR INTERFACE NUMBER DESCRIPTION"),
  				       N_("retrieve DHCP option and save it into VAR. If VAR is - then print the value."));
@@ -1136,10 +1136,10 @@ index 08b6b2b5d6..fe93b80f1c 100644
    grub_unregister_command (cmd_bootp);
    grub_unregister_command (cmd_dhcp);
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index a673bea807..8e25680db0 100644
+index 2af8742f904..3e2432fb61c 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -393,9 +393,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -410,9 +410,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
      pxe_mode = pxe->mode;
      if (pxe_mode->using_ipv6)
        {
@@ -1149,7 +1149,7 @@ index a673bea807..8e25680db0 100644
  	grub_dprintf ("efinet", "using ipv6 and dhcpv6\n");
  	grub_dprintf ("efinet", "dhcp_ack_received: %s%s\n",
  		      pxe_mode->dhcp_ack_received ? "yes" : "no",
-@@ -403,15 +400,14 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -420,14 +417,13 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	if (!pxe_mode->dhcp_ack_received)
  	  continue;
  
@@ -1158,26 +1158,24 @@ index a673bea807..8e25680db0 100644
 -		     card->efi_net->mode->current_address,
 -		     sizeof (hwaddr.mac));
 -
--	intf = grub_net_configure_by_dhcpv6_ack (card->name, card, 0, &hwaddr,
+-	inter = grub_net_configure_by_dhcpv6_ack (card->name, card, 0, &hwaddr,
 -	      (const struct grub_net_dhcpv6_packet *)&pxe_mode->dhcp_ack.dhcpv6,
 -	      1, device, path);
--	if (intf && device && path)
-+	grub_net_configure_by_dhcpv6_reply (card->name, card, 0,
-+					    (struct grub_net_dhcp6_packet *)
-+					    &pxe_mode->dhcp_ack,
-+					    sizeof (pxe_mode->dhcp_ack),
-+					    1, device, path);
++	inter = grub_net_configure_by_dhcpv6_reply (card->name, card, 0,
++						    (struct grub_net_dhcp6_packet *)
++						    &pxe_mode->dhcp_ack,
++						    sizeof (pxe_mode->dhcp_ack),
++						    1, device, path);
 +	if (grub_errno)
 +	  grub_print_error ();
-+	if (device && path)
+ 	if (inter && device && path)
  	  grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
        }
-     else
 diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index a5896f6dc2..ce6bdc75c6 100644
+index 3c3d0be0e57..f967618e53f 100644
 --- a/grub-core/net/ip.c
 +++ b/grub-core/net/ip.c
-@@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb,
+@@ -240,6 +240,45 @@ handle_dgram (struct grub_net_buff *nb,
    {
      struct udphdr *udph;
      udph = (struct udphdr *) nb->data;
@@ -1224,10 +1222,10 @@ index a5896f6dc2..ce6bdc75c6 100644
        {
  	const struct grub_net_bootp_packet *bootp;
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 9962880147..7614b58dca 100644
+index c6d702831f7..c1b869db520 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -1532,7 +1532,7 @@ typedef struct grub_efi_pxe_ip_filter
+@@ -1570,7 +1570,7 @@ typedef struct grub_efi_pxe_ip_filter
  {
    grub_efi_uint8_t filters;
    grub_efi_uint8_t ip_count;
@@ -1237,10 +1235,10 @@ index 9962880147..7614b58dca 100644
  } grub_efi_pxe_ip_filter_t;
  
 diff --git a/include/grub/net.h b/include/grub/net.h
-index d55d505a03..543251f727 100644
+index bf8430a6364..ff901b96e22 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
-@@ -451,50 +451,65 @@ struct grub_net_bootp_packet
+@@ -450,50 +450,65 @@ struct grub_net_bootp_packet
    grub_uint8_t vendor[0];
  } GRUB_PACKED;
  
@@ -1336,7 +1334,7 @@ index d55d505a03..543251f727 100644
  
  #define	GRUB_NET_BOOTP_RFC1048_MAGIC_0	0x63
  #define	GRUB_NET_BOOTP_RFC1048_MAGIC_1	0x82
-@@ -532,12 +547,12 @@ grub_net_configure_by_dhcp_ack (const char *name,
+@@ -531,12 +546,12 @@ grub_net_configure_by_dhcp_ack (const char *name,
  				int is_def, char **device, char **path);
  
  struct grub_net_network_level_interface *
@@ -1355,7 +1353,7 @@ index d55d505a03..543251f727 100644
  
  int
  grub_ipv6_get_masksize(grub_uint16_t *mask);
-@@ -554,6 +569,10 @@ void
+@@ -553,6 +568,10 @@ void
  grub_net_process_dhcp (struct grub_net_buff *nb,
  		       struct grub_net_network_level_interface *iface);
  
diff --git a/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0032-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
similarity index 92%
rename from 0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
rename to 0032-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
index b3f5df40..8890e10d 100644
--- a/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+++ b/0032-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
@@ -24,10 +24,10 @@ Resolves: rhbz#1226325
  create mode 100644 util/grub-get-kernel-settings.in
 
 diff --git a/configure.ac b/configure.ac
-index 916bede6bf..4f1676967e 100644
+index 493e336ec6c..3602b4ab62b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install])
+@@ -70,6 +70,7 @@ grub_TRANSFORM([grub-install])
  grub_TRANSFORM([grub-mkconfig])
  grub_TRANSFORM([grub-mkfont])
  grub_TRANSFORM([grub-mkimage])
@@ -36,10 +36,10 @@ index 916bede6bf..4f1676967e 100644
  grub_TRANSFORM([grub-mklayout])
  grub_TRANSFORM([grub-mkpasswd-pbkdf2])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 8ca4c14f0b..43a1c7453b 100644
+index 95884956a68..84a17ef5cfa 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -733,6 +733,13 @@ script = {
+@@ -725,6 +725,13 @@ script = {
    installdir = sbin;
  };
  
@@ -55,17 +55,17 @@ index 8ca4c14f0b..43a1c7453b 100644
    common = util/grub-set-default.in;
 diff --git a/docs/man/grub-get-kernel-settings.h2m b/docs/man/grub-get-kernel-settings.h2m
 new file mode 100644
-index 0000000000..b8051f01f3
+index 00000000000..b8051f01f3a
 --- /dev/null
 +++ b/docs/man/grub-get-kernel-settings.h2m
 @@ -0,0 +1,2 @@
 +[NAME]
 +grub-get-kernel-settings \- Evaluate the system's kernel installation settings for use while making a grub configuration file
 diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
-index 44bf135b9f..5c4acd496d 100644
+index 213ce1e57cf..da7fca5efac 100644
 --- a/util/bash-completion.d/grub-completion.bash.in
 +++ b/util/bash-completion.d/grub-completion.bash.in
-@@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \
+@@ -275,6 +275,28 @@ have ${__grub_sparc64_setup_program} && \
  unset __grub_sparc64_setup_program
  
  
@@ -96,7 +96,7 @@ index 44bf135b9f..5c4acd496d 100644
  #
 diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
 new file mode 100644
-index 0000000000..7e87dfccc0
+index 00000000000..7e87dfccc0e
 --- /dev/null
 +++ b/util/grub-get-kernel-settings.in
 @@ -0,0 +1,88 @@
@@ -189,7 +189,7 @@ index 0000000000..7e87dfccc0
 +    echo export GRUB_UPDATE_DEFAULT_KERNEL
 +fi
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index ba14cf6261..005f093809 100644
+index 5f2824d4f58..28e92515795 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
@@ -210,10 +210,10 @@ index ba14cf6261..005f093809 100644
    if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
      GRUB_DISABLE_LINUX_UUID="true"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 786dbabb4a..292e333324 100644
+index 993c53ad92e..e8ab4082f87 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -111,7 +111,8 @@ linux_entry ()
+@@ -113,7 +113,8 @@ linux_entry ()
    os="$1"
    version="$2"
    type="$3"
@@ -223,7 +223,7 @@ index 786dbabb4a..292e333324 100644
  
    if [ -z "$boot_device_id" ]; then
        boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
-@@ -123,6 +124,9 @@ linux_entry ()
+@@ -125,6 +126,9 @@ linux_entry ()
  	  quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
  	  title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
        fi
@@ -233,7 +233,7 @@ index 786dbabb4a..292e333324 100644
        echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
    else
        echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
-@@ -306,11 +310,15 @@ while [ "x$list" != "x" ] ; do
+@@ -320,11 +324,15 @@ for linux in ${reverse_sorted_list}; do
    fi
  
    if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
@@ -251,7 +251,7 @@ index 786dbabb4a..292e333324 100644
      if [ -z "$boot_device_id" ]; then
  	boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
      fi
-@@ -319,10 +327,15 @@ while [ "x$list" != "x" ] ; do
+@@ -333,10 +341,15 @@ for linux in ${reverse_sorted_list}; do
      is_top_level=false
    fi
  
@@ -266,6 +266,6 @@ index 786dbabb4a..292e333324 100644
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
 -    linux_entry "${OS}" "${version}" recovery \
 +    linux_entry "${OS}" "${version}" recovery standard \
-                 "single ${GRUB_CMDLINE_LINUX}"
+                 "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}"
    fi
- 
+ done
diff --git a/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch b/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch
deleted file mode 100644
index 9463ef82..00000000
--- a/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch
+++ /dev/null
@@ -1,457 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robert Marshall <rmarshall@redhat.com>
-Date: Mon, 16 Mar 2015 14:14:19 -0400
-Subject: [PATCH] Use rpm's sort for grub2-mkconfig
-
-Add an option for rpm-based systems to use the rpm-sort library to sort
-kernels.  This avoids problems due to discrepancies between `sort -V`
-and rpm.
-
-Signed-off-by: Robert Marshall <rmarshall@redhat.com>
-[pjones: fix --enable-rpm-sort configure option]
-Signed-off-by: Peter Jones <pjones@redhat.com>
-[thierry.vignaud: fix build with rpm-4.16]
-Signed-off-by: Thierry Vignaud <thierry.vignaud@gmail.com>
-[tim: fix disabling grub-rpm-sort by ./configure]
-Signed-off-by: Tim Landscheidt <tim@tim-landscheidt.de>
-[javierm: don't check for rpmvercmp in librpm]
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
-[rharwood: commit message, migrate to h2m]
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- configure.ac               |  36 ++++++
- Makefile.util.def          |  17 +++
- util/grub-rpm-sort.c       | 281 +++++++++++++++++++++++++++++++++++++++++++++
- docs/man/grub-rpm-sort.h2m |   2 +
- util/grub-mkconfig_lib.in  |  11 +-
- 5 files changed, 346 insertions(+), 1 deletion(-)
- create mode 100644 util/grub-rpm-sort.c
- create mode 100644 docs/man/grub-rpm-sort.h2m
-
-diff --git a/configure.ac b/configure.ac
-index 8331f95b64..87c8f17393 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
- grub_TRANSFORM([grub-mkrescue])
- grub_TRANSFORM([grub-probe])
- grub_TRANSFORM([grub-reboot])
-+grub_TRANSFORM([grub-rpm-sort])
- grub_TRANSFORM([grub-script-check])
- grub_TRANSFORM([grub-set-default])
- grub_TRANSFORM([grub-sparc64-setup])
-@@ -1837,6 +1838,35 @@ fi
- 
- AC_SUBST([LIBDEVMAPPER])
- 
-+AC_ARG_ENABLE([rpm-sort],
-+              [AS_HELP_STRING([--enable-rpm-sort],
-+                              [enable native rpm sorting of kernels in grub (default=guessed)])])
-+if test x"$enable_rpm_sort" = xno ; then
-+  rpm_sort_excuse="explicitly disabled"
-+else
-+  enable_rpm_sort=yes
-+fi
-+
-+if test x"$rpm_sort_excuse" = x ; then
-+  # Check for rpmlib header.
-+  AC_CHECK_HEADER([rpm/rpmlib.h], [],
-+               [rpm_sort_excuse="need rpm/rpmlib header"])
-+fi
-+
-+if test x"$rpm_sort_excuse" = x ; then
-+  # Check for rpmio library.
-+  AC_CHECK_LIB([rpmio], [rpmvercmp], [],
-+               [rpm_sort_excuse="rpmio missing rpmvercmp"])
-+fi
-+
-+if test x"$rpm_sort_excuse" = x ; then
-+   LIBRPM="-lrpmio";
-+   AC_DEFINE([HAVE_RPMIO], [1],
-+             [Define to 1 if you have the rpmio library.])
-+fi
-+
-+AC_SUBST([LIBRPM])
-+
- LIBGEOM=
- if test x$host_kernel = xkfreebsd; then
-   AC_CHECK_LIB([geom], [geom_gettree], [],
-@@ -2024,6 +2054,7 @@ AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
- AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
- AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
- AM_CONDITIONAL([COND_GRUB_MOUNT], [test x$enable_grub_mount = xyes])
-+AM_CONDITIONAL([COND_GRUB_RPM_SORT], [test x$enable_rpm_sort = xyes])
- AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
- if test x$FONT_SOURCE != x ; then
-    HAVE_FONT_SOURCE=1
-@@ -2145,6 +2176,11 @@ echo grub-mount: Yes
- else
- echo grub-mount: No "($grub_mount_excuse)"
- fi
-+if [ x"$rpm_sort_excuse" = x ]; then
-+echo grub-rpm-sort: Yes
-+else
-+echo grub-rpm-sort: No "($rpm_sort_excuse)"
-+fi
- if [ x"$starfield_excuse" = x ]; then
- echo starfield theme: Yes
- echo With DejaVuSans font from $DJVU_FONT_SOURCE
-diff --git a/Makefile.util.def b/Makefile.util.def
-index 2c9b283a23..bc10cc7972 100644
---- a/Makefile.util.def
-+++ b/Makefile.util.def
-@@ -703,6 +703,23 @@ program = {
-   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
- };
- 
-+program = {
-+  name = grub-rpm-sort;
-+  mansection = 8;
-+  installdir = sbin;
-+
-+  common = grub-core/kern/emu/misc.c;
-+  common = grub-core/kern/emu/argp_common.c;
-+  common = grub-core/osdep/init.c;
-+  common = util/misc.c;
-+  common = util/grub-rpm-sort.c;
-+
-+  ldadd = libgrubkern.a;
-+  ldadd = grub-core/lib/gnulib/libgnu.a;
-+  ldadd = '$(LIBDEVMAPPER) $(LIBRPM)';
-+  condition = COND_GRUB_RPM_SORT;
-+};
-+
- script = {
-   name = grub-mkconfig;
-   common = util/grub-mkconfig.in;
-diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
-new file mode 100644
-index 0000000000..f33bd1ed56
---- /dev/null
-+++ b/util/grub-rpm-sort.c
-@@ -0,0 +1,281 @@
-+#include <config.h>
-+#include <grub/types.h>
-+#include <grub/util/misc.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <assert.h>
-+#include <argp.h>
-+#include <rpm/rpmlib.h>
-+
-+static size_t
-+read_file (const char *input, char **ret)
-+{
-+  FILE *in;
-+  size_t s;
-+  size_t sz = 2048;
-+  size_t offset = 0;
-+  char *text;
-+
-+  if (!strcmp(input, "-"))
-+    in = stdin;
-+  else
-+    in = grub_util_fopen(input, "r");
-+
-+  text = xmalloc (sz);
-+
-+  if (!in)
-+    grub_util_error (_("cannot open `%s': %s"), input, strerror (errno));
-+
-+  while ((s = fread (text + offset, 1, sz - offset, in)) != 0)
-+    {
-+      offset += s;
-+      if (sz - offset == 0)
-+	{
-+	  sz += 2048;
-+	  text = xrealloc (text, sz);
-+	}
-+    }
-+
-+  text[offset] = '\0';
-+  *ret = text;
-+
-+  if (in != stdin)
-+    fclose(in);
-+
-+  return offset + 1;
-+}
-+
-+/* returns name/version/release */
-+/* NULL string pointer returned if nothing found */
-+static void
-+split_package_string (char *package_string, char **name,
-+                     char **version, char **release)
-+{
-+  char *package_version, *package_release;
-+
-+  /* Release */
-+  package_release = strrchr (package_string, '-');
-+
-+  if (package_release != NULL)
-+      *package_release++ = '\0';
-+
-+  *release = package_release;
-+
-+  /* Version */
-+  package_version = strrchr(package_string, '-');
-+
-+  if (package_version != NULL)
-+      *package_version++ = '\0';
-+
-+  *version = package_version;
-+  /* Name */
-+  *name = package_string;
-+
-+  /* Bubble up non-null values from release to name */
-+  if (*name == NULL)
-+    {
-+      *name = (*version == NULL ? *release : *version);
-+      *version = *release;
-+      *release = NULL;
-+    }
-+  if (*version == NULL)
-+    {
-+      *version = *release;
-+      *release = NULL;
-+    }
-+}
-+
-+/*
-+ * package name-version-release comparator for qsort
-+ * expects p, q which are pointers to character strings (char *)
-+ * which will not be altered in this function
-+ */
-+static int
-+package_version_compare (const void *p, const void *q)
-+{
-+  char *local_p, *local_q;
-+  char *lhs_name, *lhs_version, *lhs_release;
-+  char *rhs_name, *rhs_version, *rhs_release;
-+  int vercmpflag = 0;
-+
-+  local_p = alloca (strlen (*(char * const *)p) + 1);
-+  local_q = alloca (strlen (*(char * const *)q) + 1);
-+
-+  /* make sure these allocated */
-+  assert (local_p);
-+  assert (local_q);
-+
-+  strcpy (local_p, *(char * const *)p);
-+  strcpy (local_q, *(char * const *)q);
-+
-+  split_package_string (local_p, &lhs_name, &lhs_version, &lhs_release);
-+  split_package_string (local_q, &rhs_name, &rhs_version, &rhs_release);
-+
-+  /* Check Name and return if unequal */
-+  vercmpflag = rpmvercmp ((lhs_name == NULL ? "" : lhs_name),
-+                          (rhs_name == NULL ? "" : rhs_name));
-+  if (vercmpflag != 0)
-+    return vercmpflag;
-+
-+  /* Check version and return if unequal */
-+  vercmpflag = rpmvercmp ((lhs_version == NULL ? "" : lhs_version),
-+                          (rhs_version == NULL ? "" : rhs_version));
-+  if (vercmpflag != 0)
-+    return vercmpflag;
-+
-+  /* Check release and return the version compare value */
-+  vercmpflag = rpmvercmp ((lhs_release == NULL ? "" : lhs_release),
-+                          (rhs_release == NULL ? "" : rhs_release));
-+
-+  return vercmpflag;
-+}
-+
-+static void
-+add_input (const char *filename, char ***package_names, size_t *n_package_names)
-+{
-+  char *orig_input_buffer = NULL;
-+  char *input_buffer;
-+  char *position_of_newline;
-+  char **names = *package_names;
-+  char **new_names = NULL;
-+  size_t n_names = *n_package_names;
-+
-+  if (!*package_names)
-+    new_names = names = xmalloc (sizeof (char *) * 2);
-+
-+  if (read_file (filename, &orig_input_buffer) < 2)
-+    {
-+      if (new_names)
-+	free (new_names);
-+      if (orig_input_buffer)
-+	free (orig_input_buffer);
-+      return;
-+    }
-+
-+  input_buffer = orig_input_buffer;
-+  while (input_buffer && *input_buffer &&
-+	 (position_of_newline = strchrnul (input_buffer, '\n')))
-+    {
-+      size_t sz = position_of_newline - input_buffer;
-+      char *new;
-+
-+      if (sz == 0)
-+	{
-+	  input_buffer = position_of_newline + 1;
-+	  continue;
-+	}
-+
-+      new = xmalloc (sz+1);
-+      strncpy (new, input_buffer, sz);
-+      new[sz] = '\0';
-+
-+      names = xrealloc (names, sizeof (char *) * (n_names + 1));
-+      names[n_names] = new;
-+      n_names++;
-+
-+      /* move buffer ahead to next line */
-+      input_buffer = position_of_newline + 1;
-+      if (*position_of_newline == '\0')
-+	input_buffer = NULL;
-+    }
-+
-+  free (orig_input_buffer);
-+
-+  *package_names = names;
-+  *n_package_names = n_names;
-+}
-+
-+static char *
-+help_filter (int key, const char *text, void *input __attribute__ ((unused)))
-+{
-+  return (char *)text;
-+}
-+
-+static struct argp_option options[] = {
-+  { 0, }
-+};
-+
-+struct arguments
-+{
-+  size_t ninputs;
-+  size_t input_max;
-+  char **inputs;
-+};
-+
-+static error_t
-+argp_parser (int key, char *arg, struct argp_state *state)
-+{
-+  struct arguments *arguments = state->input;
-+  switch (key)
-+    {
-+    case ARGP_KEY_ARG:
-+      assert (arguments->ninputs < arguments->input_max);
-+      arguments->inputs[arguments->ninputs++] = xstrdup (arg);
-+      break;
-+    default:
-+      return ARGP_ERR_UNKNOWN;
-+    }
-+  return 0;
-+}
-+
-+static struct argp argp = {
-+  options, argp_parser, N_("[INPUT_FILES]"),
-+  N_("Sort a list of strings in RPM version sort order."),
-+  NULL, help_filter, NULL
-+};
-+
-+int
-+main (int argc, char *argv[])
-+{
-+  struct arguments arguments;
-+  char **package_names = NULL;
-+  size_t n_package_names = 0;
-+  int i;
-+
-+  grub_util_host_init (&argc, &argv);
-+
-+  memset (&arguments, 0, sizeof (struct arguments));
-+  arguments.input_max = argc+1;
-+  arguments.inputs = xmalloc ((arguments.input_max + 1)
-+			      * sizeof (arguments.inputs[0]));
-+  memset (arguments.inputs, 0, (arguments.input_max + 1)
-+	  * sizeof (arguments.inputs[0]));
-+
-+  /* Parse our arguments */
-+  if (argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
-+    grub_util_error ("%s", _("Error in parsing command line arguments\n"));
-+
-+  /* If there's no inputs in argv, add one for stdin */
-+  if (!arguments.ninputs)
-+    {
-+      arguments.ninputs = 1;
-+      arguments.inputs[0] = xmalloc (2);
-+      strcpy(arguments.inputs[0], "-");
-+    }
-+
-+  for (i = 0; i < arguments.ninputs; i++)
-+    add_input(arguments.inputs[i], &package_names, &n_package_names);
-+
-+  if (package_names == NULL || n_package_names < 1)
-+    grub_util_error ("%s", _("Invalid input\n"));
-+
-+  qsort (package_names, n_package_names, sizeof (char *),
-+	 package_version_compare);
-+
-+  /* send sorted list to stdout */
-+  for (i = 0; i < n_package_names; i++)
-+    {
-+      fprintf (stdout, "%s\n", package_names[i]);
-+      free (package_names[i]);
-+    }
-+
-+  free (package_names);
-+  for (i = 0; i < arguments.ninputs; i++)
-+    free (arguments.inputs[i]);
-+
-+  free (arguments.inputs);
-+
-+  return 0;
-+}
-diff --git a/docs/man/grub-rpm-sort.h2m b/docs/man/grub-rpm-sort.h2m
-new file mode 100644
-index 0000000000..fe711ae102
---- /dev/null
-+++ b/docs/man/grub-rpm-sort.h2m
-@@ -0,0 +1,2 @@
-+[NAME]
-+grub-rpm-sort \- sort input according to RPM version compare
-diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 0f6505bf3b..42c2ea9ba5 100644
---- a/util/grub-mkconfig_lib.in
-+++ b/util/grub-mkconfig_lib.in
-@@ -33,6 +33,9 @@ fi
- if test "x$grub_mkrelpath" = x; then
-   grub_mkrelpath="${bindir}/@grub_mkrelpath@"
- fi
-+if test "x$grub_rpm_sort" = x; then
-+  grub_rpm_sort="${sbindir}/@grub_rpm_sort@"
-+fi
- 
- if command -v gettext >/dev/null; then
-   :
-@@ -218,6 +221,12 @@ version_sort ()
-    esac
- }
- 
-+if [ "x$grub_rpm_sort" != x -a -x "$grub_rpm_sort" ]; then
-+  kernel_sort="$grub_rpm_sort"
-+else
-+  kernel_sort=version_sort
-+fi
-+
- version_test_numeric ()
- {
-   version_test_numeric_a="$1"
-@@ -234,7 +243,7 @@ version_test_numeric ()
-     version_test_numeric_a="$version_test_numeric_b"
-     version_test_numeric_b="$version_test_numeric_c"
-   fi
--  if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then
-+  if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | "$kernel_sort" | head -n 1 | grep -qx "$version_test_numeric_b" ; then
-     return 0
-   else
-     return 1
diff --git a/0039-Make-grub_fatal-also-backtrace.patch b/0033-Make-grub_fatal-also-backtrace.patch
similarity index 89%
rename from 0039-Make-grub_fatal-also-backtrace.patch
rename to 0033-Make-grub_fatal-also-backtrace.patch
index f876575f..1cfe7639 100644
--- a/0039-Make-grub_fatal-also-backtrace.patch
+++ b/0033-Make-grub_fatal-also-backtrace.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Make grub_fatal() also backtrace.
 
 ---
  grub-core/Makefile.core.def     |  3 ++
- grub-core/kern/misc.c           |  8 +++++-
+ grub-core/kern/misc.c           |  6 ++++
  grub-core/lib/arm64/backtrace.c | 62 +++++++++++++++++++++++++++++++++++++++++
  grub-core/lib/backtrace.c       |  2 ++
  grub-core/lib/i386/backtrace.c  | 14 +++++++++-
- 5 files changed, 87 insertions(+), 2 deletions(-)
+ 5 files changed, 86 insertions(+), 1 deletion(-)
  create mode 100644 grub-core/lib/arm64/backtrace.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index c15e91943b..058c88ac3a 100644
+index 47c0fc755a2..63f053b3add 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -188,6 +188,9 @@ kernel = {
+@@ -199,6 +199,9 @@ kernel = {
  
    softdiv = lib/division.c;
  
@@ -27,19 +27,19 @@ index c15e91943b..058c88ac3a 100644
    i386_xen = kern/i386/dl.c;
    i386_xen_pvh = kern/i386/dl.c;
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 63b586d09c..a3e215155b 100644
+index 11037dc0227..465a8e74ea7 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -24,6 +24,7 @@
- #include <grub/term.h>
- #include <grub/env.h>
+@@ -26,6 +26,7 @@
  #include <grub/i18n.h>
+ #include <grub/types.h>
+ #include <grub/charset.h>
 +#include <grub/backtrace.h>
  
  union printf_arg
  {
-@@ -1199,8 +1200,13 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected)
- static void __attribute__ ((noreturn))
+@@ -1301,6 +1302,11 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected)
+ void __attribute__ ((noreturn))
  grub_abort (void)
  {
 +#ifndef GRUB_UTIL
@@ -48,14 +48,11 @@ index 63b586d09c..a3e215155b 100644
 +#endif
 +#endif
    grub_printf ("\nAborted.");
--  
-+
+ 
  #ifndef GRUB_UTIL
-   if (grub_term_inputs)
- #endif
 diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
 new file mode 100644
-index 0000000000..1079b5380e
+index 00000000000..1079b5380e1
 --- /dev/null
 +++ b/grub-core/lib/arm64/backtrace.c
 @@ -0,0 +1,62 @@
@@ -122,7 +119,7 @@ index 0000000000..1079b5380e
 +}
 +
 diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c
-index 825a8800e2..c0ad6ab8be 100644
+index 825a8800e25..c0ad6ab8be1 100644
 --- a/grub-core/lib/backtrace.c
 +++ b/grub-core/lib/backtrace.c
 @@ -29,6 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -142,7 +139,7 @@ index 825a8800e2..c0ad6ab8be 100644
  }
  
 diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
-index c3e03c7275..c67273db3a 100644
+index c3e03c7275c..c67273db3ae 100644
 --- a/grub-core/lib/i386/backtrace.c
 +++ b/grub-core/lib/i386/backtrace.c
 @@ -15,11 +15,23 @@
diff --git a/0040-Make-our-info-pages-say-grub2-where-appropriate.patch b/0034-Make-our-info-pages-say-grub2-where-appropriate.patch
similarity index 80%
rename from 0040-Make-our-info-pages-say-grub2-where-appropriate.patch
rename to 0034-Make-our-info-pages-say-grub2-where-appropriate.patch
index afba285d..992bb439 100644
--- a/0040-Make-our-info-pages-say-grub2-where-appropriate.patch
+++ b/0034-Make-our-info-pages-say-grub2-where-appropriate.patch
@@ -9,11 +9,11 @@ time.
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  docs/grub-dev.texi |   4 +-
- docs/grub.texi     | 321 ++++++++++++++++++++++++++++-------------------------
- 2 files changed, 171 insertions(+), 154 deletions(-)
+ docs/grub.texi     | 357 ++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 189 insertions(+), 172 deletions(-)
 
 diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index 6c629a23e2..19f708ee66 100644
+index 1276c59302a..04c6678cb6b 100644
 --- a/docs/grub-dev.texi
 +++ b/docs/grub-dev.texi
 @@ -1,7 +1,7 @@
@@ -35,7 +35,7 @@ index 6c629a23e2..19f708ee66 100644
  
  @setchapternewpage odd
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 69f08d289f..0615d0ed97 100644
+index 974bc0ddb07..c30701b4e1f 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1,7 +1,7 @@
@@ -72,31 +72,7 @@ index 69f08d289f..0615d0ed97 100644
  @end direntry
  
  @setchapternewpage odd
-@@ -103,15 +103,15 @@ This edition documents version @value{VERSION}.
- * Platform-specific operations:: Platform-specific operations
- * Supported kernels::           The list of supported kernels
- * Troubleshooting::             Error messages produced by GRUB
--* Invoking grub-install::       How to use the GRUB installer
--* Invoking grub-mkconfig::      Generate a GRUB configuration file
--* Invoking grub-mkpasswd-pbkdf2::
-+* Invoking grub2-install::       How to use the GRUB installer
-+* Invoking grub2-mkconfig::      Generate a GRUB configuration file
-+* Invoking grub2-mkpasswd-pbkdf2::
-                                 Generate GRUB password hashes
--* Invoking grub-mkrelpath::     Make system path relative to its root
--* Invoking grub-mkrescue::      Make a GRUB rescue image
--* Invoking grub-mount::         Mount a file system using GRUB
--* Invoking grub-probe::         Probe device information for GRUB
--* Invoking grub-script-check::  Check GRUB script file for syntax errors
-+* Invoking grub2-mkrelpath::     Make system path relative to its root
-+* Invoking grub2-mkrescue::      Make a GRUB rescue image
-+* Invoking grub2-mount::         Mount a file system using GRUB
-+* Invoking grub2-probe::         Probe device information for GRUB
-+* Invoking grub2-script-check::  Check GRUB script file for syntax errors
- * Obtaining and Building GRUB:: How to obtain and build GRUB
- * Reporting bugs::              Where you should send a bug report
- * Future::                      Some future plans on GRUB
-@@ -230,7 +230,7 @@ surprising.
+@@ -223,7 +223,7 @@ surprising.
  
  @item
  @file{grub.cfg} is typically automatically generated by
@@ -105,7 +81,7 @@ index 69f08d289f..0615d0ed97 100644
  easier to handle versioned kernel upgrades.
  
  @item
-@@ -244,7 +244,7 @@ scripting language: variables, conditionals, and loops are available.
+@@ -237,7 +237,7 @@ scripting language: variables, conditionals, and loops are available.
  @item
  A small amount of persistent storage is available across reboots, using the
  @command{save_env} and @command{load_env} commands in GRUB and the
@@ -114,7 +90,7 @@ index 69f08d289f..0615d0ed97 100644
  (@pxref{Environment block}).
  
  @item
-@@ -549,7 +549,7 @@ On OS which have device nodes similar to Unix-like OS GRUB tools use the
+@@ -542,7 +542,7 @@ On OS which have device nodes similar to Unix-like OS GRUB tools use the
  OS name. E.g. for GNU/Linux:
  
  @example
@@ -123,7 +99,7 @@ index 69f08d289f..0615d0ed97 100644
  @end example
  
  On AROS we use another syntax. For volumes:
-@@ -572,7 +572,7 @@ For disks we use syntax:
+@@ -565,7 +565,7 @@ For disks we use syntax:
  E.g.
  
  @example
@@ -132,7 +108,7 @@ index 69f08d289f..0615d0ed97 100644
  @end example
  
  On Windows we use UNC path. For volumes it's typically
-@@ -599,7 +599,7 @@ For disks it's
+@@ -592,7 +592,7 @@ For disks it's
  E.g.
  
  @example
@@ -141,7 +117,7 @@ index 69f08d289f..0615d0ed97 100644
  @end example
  
  Beware that you may need to further escape the backslashes depending on your
-@@ -609,7 +609,7 @@ When compiled with cygwin support then cygwin drive names are automatically
+@@ -602,7 +602,7 @@ When compiled with cygwin support then cygwin drive names are automatically
  when needed. E.g.
  
  @example
@@ -150,7 +126,7 @@ index 69f08d289f..0615d0ed97 100644
  @end example
  
  @node Installation
-@@ -622,7 +622,7 @@ from the source tarball, or as a package for your OS.
+@@ -615,7 +615,7 @@ from the source tarball, or as a package for your OS.
  
  After you have done that, you need to install the boot loader on a
  drive (floppy or hard disk) by using the utility
@@ -159,7 +135,7 @@ index 69f08d289f..0615d0ed97 100644
  
  GRUB comes with boot images, which are normally put in the directory
  @file{/usr/lib/grub/<cpu>-<platform>} (for BIOS-based machines
-@@ -633,22 +633,22 @@ loader needs to find them (usually @file{/boot}) will be called
+@@ -626,22 +626,22 @@ loader needs to find them (usually @file{/boot}) will be called
  the @dfn{boot directory}.
  
  @menu
@@ -187,7 +163,7 @@ index 69f08d289f..0615d0ed97 100644
  
  The usage is basically very simple. You only need to specify one
  argument to the program, namely, where to install the boot loader. The
-@@ -657,13 +657,13 @@ For example, under Linux the following will install GRUB into the MBR
+@@ -650,13 +650,13 @@ For example, under Linux the following will install GRUB into the MBR
  of the first IDE disk:
  
  @example
@@ -203,7 +179,7 @@ index 69f08d289f..0615d0ed97 100644
  @end example
  
  But all the above examples assume that GRUB should put images under
-@@ -677,7 +677,7 @@ boot floppy with a filesystem. Here is an example:
+@@ -670,7 +670,7 @@ boot floppy with a filesystem. Here is an example:
  # @kbd{mke2fs /dev/fd0}
  # @kbd{mount -t ext2 /dev/fd0 /mnt}
  # @kbd{mkdir /mnt/boot}
@@ -212,7 +188,7 @@ index 69f08d289f..0615d0ed97 100644
  # @kbd{umount /mnt}
  @end group
  @end example
-@@ -689,30 +689,37 @@ floppy instead of exposing the USB drive as a hard disk (they call it
+@@ -682,30 +682,37 @@ floppy instead of exposing the USB drive as a hard disk (they call it
  @example
  # @kbd{losetup /dev/loop0 /dev/sdb1}
  # @kbd{mount /dev/loop0 /mnt/usb}
@@ -254,7 +230,7 @@ index 69f08d289f..0615d0ed97 100644
  @end example
  
  @node Making a GRUB bootable CD-ROM
-@@ -732,10 +739,10 @@ usually also need to include a configuration file @file{grub.cfg} and some
+@@ -725,10 +732,10 @@ usually also need to include a configuration file @file{grub.cfg} and some
  other GRUB modules.
  
  To make a simple generic GRUB rescue CD, you can use the
@@ -267,7 +243,7 @@ index 69f08d289f..0615d0ed97 100644
  @end example
  
  You will often need to include other files in your image. To do this, first
-@@ -758,7 +765,7 @@ directory @file{iso/}.
+@@ -751,7 +758,7 @@ directory @file{iso/}.
  Finally, make the image:
  
  @example
@@ -276,7 +252,7 @@ index 69f08d289f..0615d0ed97 100644
  @end example
  
  This produces a file named @file{grub.iso}, which then can be burned
-@@ -774,7 +781,7 @@ storage devices.
+@@ -767,7 +774,7 @@ storage devices.
  @node Device map
  @section The map between BIOS drives and OS devices
  
@@ -285,7 +261,7 @@ index 69f08d289f..0615d0ed97 100644
  etc.) read it to map BIOS drives to OS devices.  This file consists of lines
  like this:
  
-@@ -1254,23 +1261,23 @@ need to write the whole thing by hand.
+@@ -1269,23 +1276,23 @@ need to write the whole thing by hand.
  @node Simple configuration
  @section Simple configuration handling
  
@@ -314,7 +290,7 @@ index 69f08d289f..0615d0ed97 100644
  valid POSIX shell input; normally, it will just be a sequence of
  @samp{KEY=value} lines, but if the value contains spaces or other special
  characters then it must be quoted.  For example:
-@@ -1308,7 +1315,7 @@ works it's not recommended since titles often contain unstable device names
+@@ -1323,7 +1330,7 @@ works it's not recommended since titles often contain unstable device names
  and may be translated
  
  If you set this to @samp{saved}, then the default menu entry will be that
@@ -323,7 +299,7 @@ index 69f08d289f..0615d0ed97 100644
  the environment block, which may not be available in all situations
  (@pxref{Environment block}).
  
-@@ -1319,7 +1326,7 @@ If this option is set to @samp{true}, then, when an entry is selected, save
+@@ -1334,7 +1341,7 @@ If this option is set to @samp{true}, then, when an entry is selected, save
  it as a new default entry for use by future runs of GRUB.  This is only
  useful if @samp{GRUB_DEFAULT=saved}; it is a separate option because
  @samp{GRUB_DEFAULT=saved} is useful without this option, in conjunction with
@@ -332,7 +308,7 @@ index 69f08d289f..0615d0ed97 100644
  This option relies on the environment block, which may not be available in
  all situations (@pxref{Environment block}).
  
-@@ -1449,7 +1456,7 @@ intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode
+@@ -1481,15 +1488,15 @@ intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode
  @end example
  
  @item GRUB_DISABLE_LINUX_UUID
@@ -341,7 +317,17 @@ index 69f08d289f..0615d0ed97 100644
  universally-unique identifiers (UUIDs) to identify the root filesystem to
  the Linux kernel, using a @samp{root=UUID=...} kernel parameter.  This is
  usually more reliable, but in some cases it may not be appropriate.  To
-@@ -1471,7 +1478,7 @@ If this option is set to @samp{true}, disable the generation of recovery
+ disable the use of UUIDs, set this option to @samp{true}.
+ 
+ @item GRUB_DISABLE_LINUX_PARTUUID
+-If @command{grub-mkconfig} cannot identify the root filesystem via its
+-universally-unique indentifier (UUID), @command{grub-mkconfig} can use the UUID
++If @command{grub2-mkconfig} cannot identify the root filesystem via its
++universally-unique indentifier (UUID), @command{grub2-mkconfig} can use the UUID
+ of the partition containing the filesystem to identify the root filesystem to
+ the Linux kernel via a @samp{root=PARTUUID=...} kernel parameter.  This is not
+ as reliable as using the filesystem UUID, but is more reliable than using the
+@@ -1503,7 +1510,7 @@ If this option is set to @samp{true}, disable the generation of recovery
  mode menu entries.
  
  @item GRUB_DISABLE_UUID
@@ -350,7 +336,7 @@ index 69f08d289f..0615d0ed97 100644
  universally-unique identifiers (UUIDs) to identify various filesystems to
  search for files.  This is usually more reliable, but in some cases it may
  not be appropriate.  To disable this use of UUIDs, set this option to
-@@ -1482,12 +1489,12 @@ not be appropriate.  To disable this use of UUIDs, set this option to
+@@ -1514,12 +1521,12 @@ not be appropriate.  To disable this use of UUIDs, set this option to
  @item GRUB_VIDEO_BACKEND
  If graphical video support is required, either because the @samp{gfxterm}
  graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
@@ -366,7 +352,7 @@ index 69f08d289f..0615d0ed97 100644
  
  @item GRUB_GFXMODE
  Set the resolution used on the @samp{gfxterm} graphical terminal.  Note that
-@@ -1519,7 +1526,7 @@ boot sequence.  If you have problems, set this option to @samp{text} and
+@@ -1552,7 +1559,7 @@ boot sequence.  If you have problems, set this option to @samp{text} and
  GRUB will tell Linux to boot in normal text mode.
  
  @item GRUB_DISABLE_OS_PROBER
@@ -375,7 +361,7 @@ index 69f08d289f..0615d0ed97 100644
  @command{os-prober} program, if installed, to discover other operating
  systems installed on the same system and generate appropriate menu entries
  for them.  Set this option to @samp{true} to disable this.
-@@ -1529,7 +1536,7 @@ List of space-separated FS UUIDs of filesystems to be ignored from os-prober
+@@ -1562,7 +1569,7 @@ List of space-separated FS UUIDs of filesystems to be ignored from os-prober
  output. For efi chainloaders it's <UUID>@@<EFI FILE>
  
  @item GRUB_DISABLE_SUBMENU
@@ -384,7 +370,7 @@ index 69f08d289f..0615d0ed97 100644
  the kernel with highest version number and put all other found kernels
  or alternative menu entries for recovery mode in submenu. For entries returned
  by @command{os-prober} first entry will be put on top level and all others
-@@ -1537,11 +1544,11 @@ in submenu. If this option is set to @samp{true}, flat menu with all entries
+@@ -1570,11 +1577,11 @@ in submenu. If this option is set to @samp{true}, flat menu with all entries
  on top level will be generated instead. Changing this option will require
  changing existing values of @samp{GRUB_DEFAULT}, @samp{fallback} (@pxref{fallback})
  and @samp{default} (@pxref{default}) environment variables as well as saved
@@ -399,7 +385,7 @@ index 69f08d289f..0615d0ed97 100644
  check for encrypted disks and generate additional commands needed to access
  them during boot.  Note that in this case unattended boot is not possible
  because GRUB will wait for passphrase to unlock encrypted container.
-@@ -1600,7 +1607,7 @@ confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
+@@ -1633,7 +1640,7 @@ confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
  
  @end table
  
@@ -408,7 +394,48 @@ index 69f08d289f..0615d0ed97 100644
  edit the scripts in @file{/etc/grub.d} directly.
  @file{/etc/grub.d/40_custom} is particularly useful for adding entire custom
  menu entries; simply type the menu entries you want to add at the end of
-@@ -1862,7 +1869,7 @@ images as well.
+@@ -1641,14 +1648,14 @@ that file, making sure to leave at least the first two lines intact.
+ 
+ @node Root Identifcation Heuristics
+ @section Root Identifcation Heuristics
+-If the target operating system uses the Linux kernel, @command{grub-mkconfig}
++If the target operating system uses the Linux kernel, @command{grub2-mkconfig}
+ attempts to identify the root file system via a heuristic algoirthm.  This
+ algorithm selects the identification method of the root file system by
+ considering three factors.  The first is if an initrd for the target operating
+ system is also present.  The second is @samp{GRUB_DISABLE_LINUX_UUID} and if set
+-to @samp{true}, prevents @command{grub-mkconfig} from identifying the root file
++to @samp{true}, prevents @command{grub2-mkconfig} from identifying the root file
+ system by its UUID.  The third is @samp{GRUB_DISABLE_LINUX_PARTUUID} and if set
+-to @samp{true}, prevents @command{grub-mkconfig} from identifying the root file
++to @samp{true}, prevents @command{grub2-mkconfig} from identifying the root file
+ system via the UUID of its enclosing partition.  If the variables are assigned
+ any other value, that value is considered equivalent to @samp{false}.  The
+ variables are also considered to be set to @samp{false} if they are not set.
+@@ -1658,18 +1665,18 @@ filesystem to the initrd.  Most initrd images determine the root file system by
+ checking the Linux kernel's command-line for the @samp{root} key and use its
+ value as the identification method of the root file system.  To improve the
+ reliability of booting, most initrd images also allow the root file system to be
+-identified by its UUID.  Because of this behavior, the @command{grub-mkconfig}
++identified by its UUID.  Because of this behavior, the @command{grub2-mkconfig}
+ command will set @samp{root} to @samp{root=UUID=...} to provide the initrd with
+ the filesystem UUID of the root file system.
+ 
+ If no initrd is detected or @samp{GRUB_DISABLE_LINUX_UUID} is set to @samp{true}
+-then @command{grub-command} will identify the root filesystem by setting the
++then @command{grub2-command} will identify the root filesystem by setting the
+ kernel command-line variable @samp{root} to @samp{root=PARTUUID=...} unless
+ @samp{GRUB_DISABLE_LINUX_PARTUUID} is also set to @samp{true}.  If
+ @samp{GRUB_DISABLE_LINUX_PARTUUID} is also set to @samp{true},
+-@command{grub-command} will identify by its Linux device name.
++@command{grub2-command} will identify by its Linux device name.
+ 
+-The following table summarizes the behavior of the @command{grub-mkconfig}
++The following table summarizes the behavior of the @command{grub2-mkconfig}
+ command.
+ 
+ @multitable {detected} {GRUB_DISABLE_LINUX_PARTUUID} {GRUB_DISABLE_LINUX_UUID} {Linux Root}
+@@ -1898,7 +1905,7 @@ images as well.
  Mount this partition on/mnt/boot and disable GRUB in all OSes and manually
  install self-compiled latest GRUB with:
  
@@ -417,7 +444,7 @@ index 69f08d289f..0615d0ed97 100644
  
  In all the OSes install GRUB tools but disable installing GRUB in bootsector,
  so you'll have menu.lst and grub.cfg available for use. Also disable os-prober
-@@ -1872,20 +1879,20 @@ use by setting:
+@@ -1908,20 +1915,20 @@ use by setting:
  
  in /etc/default/grub
  
@@ -441,7 +468,7 @@ index 69f08d289f..0615d0ed97 100644
  @}
  
  menuentry "Windows XP" @{
-@@ -1948,15 +1955,15 @@ GRUB supports embedding a configuration file directly into the core image,
+@@ -1984,15 +1991,15 @@ GRUB supports embedding a configuration file directly into the core image,
  so that it is loaded before entering normal mode.  This is useful, for
  example, when it is not straightforward to find the real configuration file,
  or when you need to debug problems with loading that file.
@@ -460,7 +487,7 @@ index 69f08d289f..0615d0ed97 100644
  
  After the embedded configuration file (if any) is executed, GRUB will load
  the @samp{normal} module (@pxref{normal}), which will then read the real
-@@ -1991,13 +1998,13 @@ included in the core image:
+@@ -2027,13 +2034,13 @@ included in the core image:
  @example
  @group
  search.fs_label grub root
@@ -478,7 +505,7 @@ index 69f08d289f..0615d0ed97 100644
      else
          echo "Could not find an example configuration file!"
      fi
-@@ -2521,7 +2528,7 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
+@@ -2557,7 +2564,7 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
  @end group
  @end example
  
@@ -487,7 +514,7 @@ index 69f08d289f..0615d0ed97 100644
  server.
  
  The grub.cfg file is placed in the same directory as the path output by
-@@ -2715,7 +2722,7 @@ team are:
+@@ -2760,7 +2767,7 @@ team are:
  @end table
  
  To take full advantage of this function, install GRUB into the MBR
@@ -496,7 +523,7 @@ index 69f08d289f..0615d0ed97 100644
  
  If you have a laptop which has a similar feature and not in the above list
  could you figure your address and contribute?
-@@ -2776,7 +2783,7 @@ bytes.
+@@ -2821,7 +2828,7 @@ bytes.
  The sole function of @file{boot.img} is to read the first sector of the core
  image from a local disk and jump to it.  Because of the size restriction,
  @file{boot.img} cannot understand any file system structure, so
@@ -505,7 +532,7 @@ index 69f08d289f..0615d0ed97 100644
  core image into @file{boot.img} when installing GRUB.
  
  @item diskboot.img
-@@ -2806,7 +2813,7 @@ images.
+@@ -2851,7 +2858,7 @@ images.
  
  @item core.img
  This is the core image of GRUB.  It is built dynamically from the kernel
@@ -514,7 +541,7 @@ index 69f08d289f..0615d0ed97 100644
  program.  Usually, it contains enough modules to access @file{/boot/grub},
  and loads everything else (including menu handling, the ability to load
  target operating systems, and so on) from the file system at run-time.  The
-@@ -2858,7 +2865,7 @@ GRUB 2 has no single Stage 2 image.  Instead, it loads modules from
+@@ -2903,7 +2910,7 @@ GRUB 2 has no single Stage 2 image.  Instead, it loads modules from
  In GRUB 2, images for booting from CD-ROM drives are now constructed using
  @file{cdboot.img} and @file{core.img}, making sure that the core image
  contains the @samp{iso9660} module.  It is usually best to use the
@@ -523,7 +550,7 @@ index 69f08d289f..0615d0ed97 100644
  
  @item nbgrub
  There is as yet no equivalent for @file{nbgrub} in GRUB 2; it was used by
-@@ -3014,8 +3021,8 @@ There are two ways to specify files, by @dfn{absolute file name} and by
+@@ -3071,8 +3078,8 @@ There are two ways to specify files, by @dfn{absolute file name} and by
  
  An absolute file name resembles a Unix absolute file name, using
  @samp{/} for the directory separator (not @samp{\} as in DOS). One
@@ -534,7 +561,7 @@ index 69f08d289f..0615d0ed97 100644
  disk. If you omit the device name in an absolute file name, GRUB uses
  GRUB's @dfn{root device} implicitly. So if you set the root device to,
  say, @samp{(hd1,1)} by the command @samp{set root=(hd1,1)} (@pxref{set}),
-@@ -3023,8 +3030,8 @@ then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
+@@ -3080,8 +3087,8 @@ then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
  
  On ZFS filesystem the first path component must be
  @var{volume}@samp{@@}[@var{snapshot}].
@@ -545,7 +572,7 @@ index 69f08d289f..0615d0ed97 100644
  @samp{snap-129}.  Trailing @samp{@@} after volume name is mandatory even if
  snapshot name is omitted.
  
-@@ -3427,7 +3434,7 @@ The more recent release of Minix would then be identified as
+@@ -3500,7 +3507,7 @@ The more recent release of Minix would then be identified as
  @samp{other>minix>minix-3.4.0}.
  
  This variable is often set by @samp{GRUB_DEFAULT} (@pxref{Simple
@@ -554,7 +581,7 @@ index 69f08d289f..0615d0ed97 100644
  
  
  @node fallback
-@@ -3517,7 +3524,7 @@ If this variable is set, it names the language code that the
+@@ -3590,7 +3597,7 @@ If this variable is set, it names the language code that the
  example, French would be named as @samp{fr}, and Simplified Chinese as
  @samp{zh_CN}.
  
@@ -563,7 +590,7 @@ index 69f08d289f..0615d0ed97 100644
  reasonable default for this variable based on the system locale.
  
  
-@@ -3525,10 +3532,10 @@ reasonable default for this variable based on the system locale.
+@@ -3598,10 +3605,10 @@ reasonable default for this variable based on the system locale.
  @subsection locale_dir
  
  If this variable is set, it names the directory where translation files may
@@ -576,7 +603,7 @@ index 69f08d289f..0615d0ed97 100644
  default for this variable if internationalization is needed and any
  translation files are available.
  
-@@ -3646,7 +3653,7 @@ input.  The default is not to pause output.
+@@ -3738,7 +3745,7 @@ input.  The default is not to pause output.
  
  The location of the @samp{/boot/grub} directory as an absolute file name
  (@pxref{File name syntax}).  This is normally set by GRUB at startup based
@@ -585,7 +612,7 @@ index 69f08d289f..0615d0ed97 100644
  dynamically loaded from this directory, so it must be set correctly in order
  for many parts of GRUB to work.
  
-@@ -3737,17 +3744,17 @@ GRUB provides an ``environment block'' which can be used to save a small
+@@ -3850,17 +3857,17 @@ GRUB provides an ``environment block'' which can be used to save a small
  amount of state.
  
  The environment block is a preallocated 1024-byte file, which normally lives
@@ -605,8 +632,8 @@ index 69f08d289f..0615d0ed97 100644
 +@command{grub2-mkconfig} uses this facility to implement
  @samp{GRUB_SAVEDEFAULT} (@pxref{Simple configuration}).
  
- 
-@@ -4476,7 +4483,7 @@ Translate @var{string} into the current language.
+ @node Modules
+@@ -4922,7 +4929,7 @@ Translate @var{string} into the current language.
  
  The current language code is stored in the @samp{lang} variable in GRUB's
  environment (@pxref{lang}).  Translation files in MO format are read from
@@ -615,7 +642,7 @@ index 69f08d289f..0615d0ed97 100644
  @end deffn
  
  
-@@ -4871,7 +4878,7 @@ Define a user named @var{user} with password @var{clear-password}.
+@@ -5274,7 +5281,7 @@ Define a user named @var{user} with password @var{clear-password}.
  
  @deffn Command password_pbkdf2 user hashed-password
  Define a user named @var{user} with password hash @var{hashed-password}.
@@ -624,7 +651,7 @@ index 69f08d289f..0615d0ed97 100644
  to generate password hashes.  @xref{Security}.
  @end deffn
  
-@@ -5814,8 +5821,8 @@ The @samp{password} (@pxref{password}) and @samp{password_pbkdf2}
+@@ -6400,8 +6407,8 @@ The @samp{password} (@pxref{password}) and @samp{password_pbkdf2}
  which has an associated password.  @samp{password} sets the password in
  plain text, requiring @file{grub.cfg} to be secure; @samp{password_pbkdf2}
  sets the password hashed using the Password-Based Key Derivation Function
@@ -635,7 +662,7 @@ index 69f08d289f..0615d0ed97 100644
  
  In order to enable authentication support, the @samp{superusers} environment
  variable must be set to a list of usernames, separated by any of spaces,
-@@ -5860,7 +5867,7 @@ menuentry "May be run by user1 or a superuser" --users user1 @{
+@@ -6446,7 +6453,7 @@ menuentry "May be run by user1 or a superuser" --users user1 @{
  @end group
  @end example
  
@@ -644,11 +671,13 @@ index 69f08d289f..0615d0ed97 100644
  generating configuration files with authentication.  You can use
  @file{/etc/grub.d/40_custom} to add simple superuser authentication, by
  adding @kbd{set superusers=} and @kbd{password} or @kbd{password_pbkdf2}
-@@ -5887,7 +5894,17 @@ may halt or otherwise impact the boot process.
+@@ -6472,8 +6479,18 @@ validation fails, then file @file{foo} cannot be opened.  This failure
+ may halt or otherwise impact the boot process.
  
  An initial trusted public key can be embedded within the GRUB @file{core.img}
- using the @code{--pubkey} option to @command{grub-install}
+-using the @code{--pubkey} option to @command{grub-install}
 -(@pxref{Invoking grub-install}).
++using the @code{--pubkey} option to @command{grub2-install}
 +(@pxref{Invoking grub2-install}).
 +
 +@comment Unfortunately --pubkey is not yet supported by grub2-install,
@@ -663,7 +692,7 @@ index 69f08d289f..0615d0ed97 100644
  
  GRUB uses GPG-style detached signatures (meaning that a file
  @file{foo.sig} will be produced when file @file{foo} is signed), and
-@@ -5907,8 +5924,8 @@ gpg --detach-sign /path/to/file
+@@ -6493,8 +6510,8 @@ gpg --detach-sign /path/to/file
  For successful validation of all of GRUB's subcomponents and the
  loaded OS kernel, they must all be signed.  One way to accomplish this
  is the following (after having already produced the desired
@@ -674,7 +703,7 @@ index 69f08d289f..0615d0ed97 100644
  
  @example
  @group
-@@ -5930,7 +5947,7 @@ See also: @ref{check_signatures}, @ref{verify_detached}, @ref{trust},
+@@ -6516,7 +6533,7 @@ See also: @ref{check_signatures}, @ref{verify_detached}, @ref{trust},
  Note that internally signature enforcement is controlled by setting
  the environment variable @code{check_signatures} equal to
  @code{enforce}.  Passing one or more @code{--pubkey} options to
@@ -683,7 +712,16 @@ index 69f08d289f..0615d0ed97 100644
  equal to @code{enforce} in @file{core.img} prior to processing any
  configuration files.
  
-@@ -6388,10 +6405,10 @@ Required files are:
+@@ -6564,7 +6581,7 @@ UTF-8 strings as comma-separated values (CSV). See
+ @uref{https://github.com/rhboot/shim/blob/main/SBAT.md} for more details.
+ 
+ To add a data section containing the SBAT information into the binary, the
+-@option{--sbat} option of @command{grub-mkimage} command should be used. The content
++@option{--sbat} option of @command{grub2-mkimage} command should be used. The content
+ of a CSV file, encoded with UTF-8, is copied as is to the .sbat data section into
+ the generated EFI binary. The CSV file can be stored anywhere on the file system.
+ 
+@@ -6975,10 +6992,10 @@ Required files are:
  
  GRUB's normal start-up procedure involves setting the @samp{prefix}
  environment variable to a value set in the core image by
@@ -696,7 +734,7 @@ index 69f08d289f..0615d0ed97 100644
  things GRUB is supposed to do.
  
  If, instead, you only get a rescue shell, this usually means that GRUB
-@@ -6417,8 +6434,8 @@ normal
+@@ -7004,8 +7021,8 @@ normal
  
  However, any problem that leaves you in the rescue shell probably means that
  GRUB was not correctly installed.  It may be more useful to try to reinstall
@@ -707,7 +745,7 @@ index 69f08d289f..0615d0ed97 100644
  
  @itemize @bullet{}
  @item
-@@ -6430,7 +6447,7 @@ is usually better to use UUIDs or file system labels and avoid depending on
+@@ -7017,7 +7034,7 @@ is usually better to use UUIDs or file system labels and avoid depending on
  drive ordering entirely.
  
  @item
@@ -716,14 +754,34 @@ index 69f08d289f..0615d0ed97 100644
  to a partition but GRUB has already been installed in the master boot
  record, then the GRUB installation in the partition will be ignored.
  
-@@ -6461,21 +6478,21 @@ entry which claims partition start at block 0. This change will not hamper
- bootability on other machines.
+@@ -7052,33 +7069,33 @@ bootability on other machines.
+ @chapter User-space utilities
+ 
+ @menu
+-* Invoking grub-install::       How to use the GRUB installer
+-* Invoking grub-mkconfig::      Generate a GRUB configuration file
+-* Invoking grub-mkpasswd-pbkdf2::
++* Invoking grub2-install::       How to use the GRUB installer
++* Invoking grub2-mkconfig::      Generate a GRUB configuration file
++* Invoking grub2-mkpasswd-pbkdf2::
+                                 Generate GRUB password hashes
+-* Invoking grub-mkrelpath::     Make system path relative to its root
+-* Invoking grub-mkrescue::      Make a GRUB rescue image
+-* Invoking grub-mount::         Mount a file system using GRUB
+-* Invoking grub-probe::         Probe device information for GRUB
+-* Invoking grub-script-check::  Check GRUB script file for syntax errors
++* Invoking grub2-mkrelpath::     Make system path relative to its root
++* Invoking grub2-mkrescue::      Make a GRUB rescue image
++* Invoking grub2-mount::         Mount a file system using GRUB
++* Invoking grub2-probe::         Probe device information for GRUB
++* Invoking grub2-script-check::  Check GRUB script file for syntax errors
+ @end menu
  
  
 -@node Invoking grub-install
--@chapter Invoking grub-install
+-@section Invoking grub-install
 +@node Invoking grub2-install
-+@chapter Invoking grub2-install
++@section Invoking grub2-install
  
 -The program @command{grub-install} generates a GRUB core image using
 -@command{grub-mkimage} and installs it on your system.  You must specify the
@@ -744,7 +802,7 @@ index 69f08d289f..0615d0ed97 100644
  
  @table @option
  @item --help
-@@ -6491,13 +6508,13 @@ separate partition or a removable disk.
+@@ -7094,13 +7111,13 @@ separate partition or a removable disk.
  If this option is not specified then it defaults to @file{/boot}, so
  
  @example
@@ -760,7 +818,7 @@ index 69f08d289f..0615d0ed97 100644
  @end example
  
  Here is an example in which you have a separate @dfn{boot} partition which is 
-@@ -6505,16 +6522,16 @@ mounted on
+@@ -7108,16 +7125,16 @@ mounted on
  @file{/mnt/boot}:
  
  @example
@@ -780,14 +838,14 @@ index 69f08d289f..0615d0ed97 100644
  extra space in the bootloader embedding area for Reed-Solomon
  error-correcting codes. This enables GRUB to still boot successfully
  if some blocks are corrupted.  The exact amount of protection offered
-@@ -6527,17 +6544,17 @@ installation}) where GRUB does not reside in any unpartitioned space
+@@ -7130,17 +7147,17 @@ installation}) where GRUB does not reside in any unpartitioned space
  outside of the MBR.  Disable the Reed-Solomon codes with this option.
  @end table
  
 -@node Invoking grub-mkconfig
--@chapter Invoking grub-mkconfig
+-@section Invoking grub-mkconfig
 +@node Invoking grub2-mkconfig
-+@chapter Invoking grub2-mkconfig
++@section Invoking grub2-mkconfig
  
 -The program @command{grub-mkconfig} generates a configuration file for GRUB
 +The program @command{grub2-mkconfig} generates a configuration file for GRUB
@@ -795,7 +853,7 @@ index 69f08d289f..0615d0ed97 100644
  
  @example
 -grub-mkconfig -o /boot/grub/grub.cfg
-+grub-mkconfig -o /boot/grub2/grub.cfg
++grub2-mkconfig -o /boot/grub2/grub.cfg
  @end example
  
 -@command{grub-mkconfig} accepts the following options:
@@ -803,21 +861,22 @@ index 69f08d289f..0615d0ed97 100644
  
  @table @option
  @item --help
-@@ -6553,17 +6570,17 @@ it to standard output.
+@@ -7156,17 +7173,17 @@ it to standard output.
  @end table
  
  
 -@node Invoking grub-mkpasswd-pbkdf2
--@chapter Invoking grub-mkpasswd-pbkdf2
+-@section Invoking grub-mkpasswd-pbkdf2
 +@node Invoking grub2-mkpasswd-pbkdf2
-+@chapter Invoking grub2-mkpasswd-pbkdf2
++@section Invoking grub2-mkpasswd-pbkdf2
  
 -The program @command{grub-mkpasswd-pbkdf2} generates password hashes for
 +The program @command{grub2-mkpasswd-pbkdf2} generates password hashes for
  GRUB (@pxref{Security}).
  
  @example
- grub-mkpasswd-pbkdf2
+-grub-mkpasswd-pbkdf2
++grub2-mkpasswd-pbkdf2
  @end example
  
 -@command{grub-mkpasswd-pbkdf2} accepts the following options:
@@ -825,14 +884,14 @@ index 69f08d289f..0615d0ed97 100644
  
  @table @option
  @item -c @var{number}
-@@ -6581,23 +6598,23 @@ Length of the salt.  Defaults to 64.
+@@ -7184,23 +7201,23 @@ Length of the salt.  Defaults to 64.
  @end table
  
  
 -@node Invoking grub-mkrelpath
--@chapter Invoking grub-mkrelpath
+-@section Invoking grub-mkrelpath
 +@node Invoking grub2-mkrelpath
-+@chapter Invoking grub2-mkrelpath
++@section Invoking grub2-mkrelpath
  
 -The program @command{grub-mkrelpath} makes a file system path relative to
 +The program @command{grub2-mkrelpath} makes a file system path relative to
@@ -855,21 +914,22 @@ index 69f08d289f..0615d0ed97 100644
  
  @table @option
  @item --help
-@@ -6608,17 +6625,17 @@ Print the version number of GRUB and exit.
+@@ -7211,17 +7228,17 @@ Print the version number of GRUB and exit.
  @end table
  
  
 -@node Invoking grub-mkrescue
--@chapter Invoking grub-mkrescue
+-@section Invoking grub-mkrescue
 +@node Invoking grub2-mkrescue
-+@chapter Invoking grub2-mkrescue
++@section Invoking grub2-mkrescue
  
 -The program @command{grub-mkrescue} generates a bootable GRUB rescue image
 +The program @command{grub2-mkrescue} generates a bootable GRUB rescue image
  (@pxref{Making a GRUB bootable CD-ROM}).
  
  @example
- grub-mkrescue -o grub.iso
+-grub-mkrescue -o grub.iso
++grub2-mkrescue -o grub.iso
  @end example
  
 -All arguments not explicitly listed as @command{grub-mkrescue} options are
@@ -877,8 +937,12 @@ index 69f08d289f..0615d0ed97 100644
  passed on directly to @command{xorriso} in @command{mkisofs} emulation mode.
  Options passed to @command{xorriso} will normally be interpreted as
  @command{mkisofs} options; if the option @samp{--} is used, then anything
-@@ -6633,7 +6650,7 @@ mkdir -p disk/boot/grub
- grub-mkrescue -o grub.iso disk
+@@ -7233,10 +7250,10 @@ commonly used to add extra files to the image:
+ @example
+ mkdir -p disk/boot/grub
+ @r{(add extra files to @file{disk/boot/grub})}
+-grub-mkrescue -o grub.iso disk
++grub2-mkrescue -o grub.iso disk
  @end example
  
 -@command{grub-mkrescue} accepts the following options:
@@ -886,7 +950,7 @@ index 69f08d289f..0615d0ed97 100644
  
  @table @option
  @item --help
-@@ -6661,15 +6678,15 @@ Use @var{file} as the @command{xorriso} program, rather than the built-in
+@@ -7264,15 +7281,15 @@ Use @var{file} as the @command{xorriso} program, rather than the built-in
  default.
  
  @item --grub-mkimage=@var{file}
@@ -897,16 +961,16 @@ index 69f08d289f..0615d0ed97 100644
  
  
 -@node Invoking grub-mount
--@chapter Invoking grub-mount
+-@section Invoking grub-mount
 +@node Invoking grub2-mount
-+@chapter Invoking grub2-mount
++@section Invoking grub2-mount
  
 -The program @command{grub-mount} performs a read-only mount of any file
 +The program @command{grub2-mount} performs a read-only mount of any file
  system or file system image that GRUB understands, using GRUB's file system
  drivers via FUSE.  (It is only available if FUSE development files were
  present when GRUB was built.)  This has a number of uses:
-@@ -6701,13 +6718,13 @@ even if nobody has yet written a FUSE module specifically for that file
+@@ -7304,13 +7321,13 @@ even if nobody has yet written a FUSE module specifically for that file
  system type.
  @end itemize
  
@@ -914,7 +978,8 @@ index 69f08d289f..0615d0ed97 100644
 +Using @command{grub2-mount} is normally as simple as:
  
  @example
- grub-mount /dev/sda1 /mnt
+-grub-mount /dev/sda1 /mnt
++grub2-mount /dev/sda1 /mnt
  @end example
  
 -@command{grub-mount} must be given one or more images and a mount point as
@@ -922,7 +987,7 @@ index 69f08d289f..0615d0ed97 100644
  non-option arguments (if it is given more than one image, it will treat them
  as a RAID set), and also accepts the following options:
  
-@@ -6729,13 +6746,13 @@ Show debugging output for conditions matching @var{string}.
+@@ -7332,13 +7349,13 @@ Show debugging output for conditions matching @var{string}.
  @item -K prompt|@var{file}
  @itemx --zfs-key=prompt|@var{file}
  Load a ZFS encryption key.  If you use @samp{prompt} as the argument,
@@ -938,22 +1003,33 @@ index 69f08d289f..0615d0ed97 100644
  root of the supplied file system.
  
  If @var{device} is just a number, then it will be treated as a partition
-@@ -6753,10 +6770,10 @@ Print verbose messages.
+@@ -7347,7 +7364,7 @@ an entire disk in @file{disk.img}, then you can use this command to mount
+ its second partition:
+ 
+ @example
+-grub-mount -r 2 disk.img mount-point
++grub2-mount -r 2 disk.img mount-point
+ @end example
+ 
+ @item -v
+@@ -7356,18 +7373,18 @@ Print verbose messages.
  @end table
  
  
 -@node Invoking grub-probe
--@chapter Invoking grub-probe
+-@section Invoking grub-probe
 +@node Invoking grub2-probe
-+@chapter Invoking grub2-probe
++@section Invoking grub2-probe
  
 -The program @command{grub-probe} probes device information for a given path
 +The program @command{grub2-probe} probes device information for a given path
  or device.
  
  @example
-@@ -6764,7 +6781,7 @@ grub-probe --target=fs /boot/grub
- grub-probe --target=drive --device /dev/sda1
+-grub-probe --target=fs /boot/grub
+-grub-probe --target=drive --device /dev/sda1
++grub2-probe --target=fs /boot/grub
++grub2-probe --target=drive --device /dev/sda1
  @end example
  
 -@command{grub-probe} must be given a path or device as a non-option
@@ -961,7 +1037,7 @@ index 69f08d289f..0615d0ed97 100644
  argument, and also accepts the following options:
  
  @table @option
-@@ -6777,16 +6794,16 @@ Print the version number of GRUB and exit.
+@@ -7380,16 +7397,16 @@ Print the version number of GRUB and exit.
  @item -d
  @itemx --device
  If this option is given, then the non-option argument is a system device
@@ -981,14 +1057,14 @@ index 69f08d289f..0615d0ed97 100644
  
  @item -t @var{target}
  @itemx --target=@var{target}
-@@ -6839,19 +6856,19 @@ Print verbose messages.
+@@ -7442,19 +7459,19 @@ Print verbose messages.
  @end table
  
  
 -@node Invoking grub-script-check
--@chapter Invoking grub-script-check
+-@section Invoking grub-script-check
 +@node Invoking grub2-script-check
-+@chapter Invoking grub2-script-check
++@section Invoking grub2-script-check
  
 -The program @command{grub-script-check} takes a GRUB script file
 +The program @command{grub2-script-check} takes a GRUB script file
@@ -998,7 +1074,7 @@ index 69f08d289f..0615d0ed97 100644
  
  @example
 -grub-script-check /boot/grub/grub.cfg
-+grub-script-check /boot/grub2/grub.cfg
++grub2-script-check /boot/grub2/grub.cfg
  @end example
  
 -@command{grub-script-check} accepts the following options:
diff --git a/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0035-macos-just-build-chainloader-entries-don-t-try-any-x.patch
similarity index 98%
rename from 0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch
rename to 0035-macos-just-build-chainloader-entries-don-t-try-any-x.patch
index 8d3139d6..3246b116 100644
--- a/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch
+++ b/0035-macos-just-build-chainloader-entries-don-t-try-any-x.patch
@@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 18 insertions(+), 60 deletions(-)
 
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 1b91c102f3..4b27bd2015 100644
+index f300e46fc6a..d7d423b2eaf 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -42,68 +42,25 @@ if [ -z "${OSPROBED}" ] ; then
@@ -104,7 +104,7 @@ index 1b91c102f3..4b27bd2015 100644
  }
  EOF
  }
-@@ -292,11 +249,12 @@ EOF
+@@ -296,11 +253,12 @@ EOF
        echo "$title_correction_code"
      ;;
      macosx)
diff --git a/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0036-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
similarity index 94%
rename from 0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
rename to 0036-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
index 57d2391a..ad004426 100644
--- a/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
+++ b/0036-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
@@ -19,12 +19,12 @@ variable and loading the config file from the subvolume.
 
 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
 ---
- grub-core/fs/btrfs.c | 552 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ grub-core/fs/btrfs.c | 558 ++++++++++++++++++++++++++++++++++++++++++++++++---
  include/grub/btrfs.h |   1 +
- 2 files changed, 533 insertions(+), 20 deletions(-)
+ 2 files changed, 536 insertions(+), 23 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 63203034df..f1fff7385b 100644
+index ba0c583526d..f14fe9c1bda 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -38,6 +38,9 @@
@@ -89,7 +89,7 @@ index 63203034df..f1fff7385b 100644
  static grub_disk_addr_t superblock_sectors[] = { 64 * 2, 64 * 1024 * 2,
    256 * 1048576 * 2, 1048576ULL * 1048576ULL * 2
  };
-@@ -1173,6 +1195,62 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
+@@ -1252,6 +1274,62 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
    return GRUB_ERR_NONE;
  }
  
@@ -152,7 +152,7 @@ index 63203034df..f1fff7385b 100644
  static struct grub_btrfs_data *
  grub_btrfs_mount (grub_device_t dev)
  {
-@@ -1208,6 +1286,13 @@ grub_btrfs_mount (grub_device_t dev)
+@@ -1287,6 +1365,13 @@ grub_btrfs_mount (grub_device_t dev)
    data->devices_attached[0].dev = dev;
    data->devices_attached[0].id = data->sblock.this_device.device_id;
  
@@ -166,7 +166,7 @@ index 63203034df..f1fff7385b 100644
    return data;
  }
  
-@@ -1673,6 +1758,91 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key,
+@@ -1784,6 +1869,91 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key,
    return GRUB_ERR_NONE;
  }
  
@@ -258,7 +258,7 @@ index 63203034df..f1fff7385b 100644
  static grub_err_t
  find_path (struct grub_btrfs_data *data,
  	   const char *path, struct grub_btrfs_key *key,
-@@ -1691,14 +1861,26 @@ find_path (struct grub_btrfs_data *data,
+@@ -1802,14 +1972,26 @@ find_path (struct grub_btrfs_data *data,
    char *origpath = NULL;
    unsigned symlinks_max = 32;
  
@@ -289,15 +289,18 @@ index 63203034df..f1fff7385b 100644
    while (1)
      {
        while (path[0] == '/')
-@@ -1871,9 +2053,21 @@ find_path (struct grub_btrfs_data *data,
+@@ -1982,13 +2164,25 @@ find_path (struct grub_btrfs_data *data,
  	  path = path_alloc = tmp;
  	  if (path[0] == '/')
  	    {
 -	      err = get_root (data, key, tree, type);
 -	      if (err)
--		return err;
 +	      if (data->fs_tree)
-+		{
+ 		{
+-		  grub_free (direl);
+-		  grub_free (path_alloc);
+-		  grub_free (origpath);
+-		  return err;
 +		  *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
 +		  *tree = data->fs_tree;
 +		  /* This is a tree root, so everything starts at objectid 256 */
@@ -309,12 +312,16 @@ index 63203034df..f1fff7385b 100644
 +		{
 +		  err = get_root (data, key, tree, type);
 +		  if (err)
-+		    return err;
-+		}
++                    {
++                      grub_free (direl);
++                      grub_free (path_alloc);
++                      grub_free (origpath);
++                      return err;
++                    }
+ 		}
  	    }
  	  continue;
- 	}
-@@ -2114,18 +2308,10 @@ grub_btrfs_read (grub_file_t file, char *buf, grub_size_t len)
+@@ -2256,18 +2450,10 @@ grub_btrfs_read (grub_file_t file, char *buf, grub_size_t len)
  				 data->tree, file->offset, buf, len);
  }
  
@@ -336,7 +343,7 @@ index 63203034df..f1fff7385b 100644
  			  grub_be_to_cpu16 (data->sblock.uuid[0]),
  			  grub_be_to_cpu16 (data->sblock.uuid[1]),
  			  grub_be_to_cpu16 (data->sblock.uuid[2]),
-@@ -2134,6 +2320,20 @@ grub_btrfs_uuid (grub_device_t device, char **uuid)
+@@ -2276,6 +2462,20 @@ grub_btrfs_uuid (grub_device_t device, char **uuid)
  			  grub_be_to_cpu16 (data->sblock.uuid[5]),
  			  grub_be_to_cpu16 (data->sblock.uuid[6]),
  			  grub_be_to_cpu16 (data->sblock.uuid[7]));
@@ -357,7 +364,7 @@ index 63203034df..f1fff7385b 100644
  
    grub_btrfs_unmount (data);
  
-@@ -2190,6 +2390,242 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)),
+@@ -2396,6 +2596,242 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)),
  }
  #endif
  
@@ -600,7 +607,7 @@ index 63203034df..f1fff7385b 100644
  static struct grub_fs grub_btrfs_fs = {
    .name = "btrfs",
    .fs_dir = grub_btrfs_dir,
-@@ -2205,12 +2641,88 @@ static struct grub_fs grub_btrfs_fs = {
+@@ -2411,12 +2847,88 @@ static struct grub_fs grub_btrfs_fs = {
  #endif
  };
  
@@ -690,7 +697,7 @@ index 63203034df..f1fff7385b 100644
 +
 +// vim: si et sw=2:
 diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h
-index 9d93fb6c18..234ad97677 100644
+index 9d93fb6c182..234ad976771 100644
 --- a/include/grub/btrfs.h
 +++ b/include/grub/btrfs.h
 @@ -29,6 +29,7 @@ enum
diff --git a/0037-btrfs-fix-a-bad-null-check.patch b/0037-btrfs-fix-a-bad-null-check.patch
new file mode 100644
index 00000000..093ca650
--- /dev/null
+++ b/0037-btrfs-fix-a-bad-null-check.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jan 2024 15:41:52 -0500
+Subject: [PATCH] btrfs: fix a bad null check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+current gcc complains:
+
+  grub-core/fs/btrfs.c: In function ‘grub_cmd_btrfs_info’:
+  grub-core/fs/btrfs.c:2745:7: error: the comparison will always evaluate as ‘true’ for the address of ‘label’ will never be NULL [-Werror=address]
+   2745 |   if (data->sblock.label)
+        |       ^~~~
+  grub-core/fs/btrfs.c:92:8: note: ‘label’ declared here
+     92 |   char label[0x100];
+        |        ^~~~~
+  cc1: all warnings being treated as errors
+
+Obviously this check should be on the first data byte instead of the
+symbol itself.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/fs/btrfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
+index f14fe9c1bda..8e2b1e9f7bc 100644
+--- a/grub-core/fs/btrfs.c
++++ b/grub-core/fs/btrfs.c
+@@ -2625,7 +2625,7 @@ grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc,
+       return grub_error (GRUB_ERR_BAD_ARGUMENT, "failed to open fs");
+     }
+ 
+-  if (data->sblock.label)
++  if (data->sblock.label[0])
+     grub_printf("Label: '%s' ", data->sblock.label);
+   else
+     grub_printf("Label: none ");
diff --git a/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch
deleted file mode 100644
index 15b21114..00000000
--- a/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Masahiro Matsuya <mmatsuya@redhat.com>
-Date: Sat, 29 Oct 2016 08:35:26 +0900
-Subject: [PATCH] bz1374141 fix incorrect mask for ppc64
-
-The netmask configured in firmware is not respected on ppc64 (big endian).
-When 255.255.252.0 is set as netmask in firmware, the following is the value of bootpath string in grub_ieee1275_parse_bootpath().
-
- /vdevice/l-lan@30000002:speed=auto,duplex=auto,192.168.88.10,,192.168.89.113,192.168.88.1,5,5,255.255.252.0,512
-
-The netmask in this bootpath is no problem, since it's a value specified in firmware. But,
-The value of 'subnet_mask.ipv4' was set with 0xfffffc00, and __builtin_ctz (~grub_le_to_cpu32 (subnet_mask.ipv4)) returned 16 (not 22).
-As a result, 16 was used for netmask wrongly.
-
-1111 1111 1111 1111 1111 1100 0000 0000 # subnet_mask.ipv4 (=0xfffffc00)
-0000 0000 1111 1100 1111 1111 1111 1111 # grub_le_to_cpu32 (subnet_mask.ipv4)
-1111 1111 0000 0011 0000 0000 0000 0000 # ~grub_le_to_cpu32 (subnet_mask.ipv4)
-
-And, the count of zero with __builtin_ctz can be 16.
-This patch changes it as below.
-
-1111 1111 1111 1111 1111 1100 0000 0000 # subnet_mask.ipv4 (=0xfffffc00)
-0000 0000 1111 1100 1111 1111 1111 1111 # grub_le_to_cpu32 (subnet_mask.ipv4)
-1111 1111 1111 1111 1111 1100 0000 0000 # grub_swap_bytes32(grub_le_to_cpu32 (subnet_mask.ipv4))
-0000 0000 0000 0000 0000 0011 1111 1111 # ~grub_swap_bytes32(grub_le_to_cpu32 (subnet_mask.ipv4))
-
-The count of zero with __builtin_clz can be 22. (clz counts the number of one bits preceding the most significant zero bit)
-
-Signed-off-by: Masahiro Matsuya <mmatsuya@redhat.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- grub-core/net/drivers/ieee1275/ofnet.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
-index ac4e62a95c..3860b6f78d 100644
---- a/grub-core/net/drivers/ieee1275/ofnet.c
-+++ b/grub-core/net/drivers/ieee1275/ofnet.c
-@@ -220,8 +220,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
-                                  flags);
-       inter->vlantag = vlantag;
-       grub_net_add_ipv4_local (inter,
--                          __builtin_ctz (~grub_le_to_cpu32 (subnet_mask.ipv4)));
--
-+                          __builtin_clz (~grub_swap_bytes32(grub_le_to_cpu32 (subnet_mask.ipv4))));
-     }
- 
-   if (gateway_addr.ipv4 != 0)
diff --git a/0043-export-btrfs_subvol-and-btrfs_subvolid.patch b/0038-export-btrfs_subvol-and-btrfs_subvolid.patch
similarity index 91%
rename from 0043-export-btrfs_subvol-and-btrfs_subvolid.patch
rename to 0038-export-btrfs_subvol-and-btrfs_subvolid.patch
index 719866e1..d35f598e 100644
--- a/0043-export-btrfs_subvol-and-btrfs_subvolid.patch
+++ b/0038-export-btrfs_subvol-and-btrfs_subvolid.patch
@@ -12,10 +12,10 @@ Signed-off-by: Michael Chang <mchang@suse.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index f1fff7385b..ad1b56b716 100644
+index 8e2b1e9f7bc..14e38a4df02 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -2714,6 +2714,8 @@ GRUB_MOD_INIT (btrfs)
+@@ -2920,6 +2920,8 @@ GRUB_MOD_INIT (btrfs)
                                 subvol_set_env);
    grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env,
                                 subvolid_set_env);
diff --git a/0044-grub2-btrfs-03-follow_default.patch b/0039-grub2-btrfs-03-follow_default.patch
similarity index 90%
rename from 0044-grub2-btrfs-03-follow_default.patch
rename to 0039-grub2-btrfs-03-follow_default.patch
index 621f029e..bbe2fbc0 100644
--- a/0044-grub2-btrfs-03-follow_default.patch
+++ b/0039-grub2-btrfs-03-follow_default.patch
@@ -10,10 +10,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 76 insertions(+), 31 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index ad1b56b716..113c1f746c 100644
+index 14e38a4df02..d47f9ab0352 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -1256,6 +1256,7 @@ grub_btrfs_mount (grub_device_t dev)
+@@ -1335,6 +1335,7 @@ grub_btrfs_mount (grub_device_t dev)
  {
    struct grub_btrfs_data *data;
    grub_err_t err;
@@ -21,7 +21,7 @@ index ad1b56b716..113c1f746c 100644
  
    if (!dev->disk)
      {
-@@ -1286,11 +1287,14 @@ grub_btrfs_mount (grub_device_t dev)
+@@ -1365,11 +1366,14 @@ grub_btrfs_mount (grub_device_t dev)
    data->devices_attached[0].dev = dev;
    data->devices_attached[0].id = data->sblock.this_device.device_id;
  
@@ -40,7 +40,7 @@ index ad1b56b716..113c1f746c 100644
      }
  
    return data;
-@@ -1855,24 +1859,39 @@ find_path (struct grub_btrfs_data *data,
+@@ -1966,24 +1970,39 @@ find_path (struct grub_btrfs_data *data,
    grub_size_t allocated = 0;
    struct grub_btrfs_dir_item *direl = NULL;
    struct grub_btrfs_key key_out;
@@ -87,7 +87,7 @@ index ad1b56b716..113c1f746c 100644
      }
    else
      {
-@@ -1883,15 +1902,23 @@ find_path (struct grub_btrfs_data *data,
+@@ -1994,15 +2013,23 @@ find_path (struct grub_btrfs_data *data,
  
    while (1)
      {
@@ -120,7 +120,7 @@ index ad1b56b716..113c1f746c 100644
  
        if (*type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)
  	{
-@@ -1902,7 +1929,9 @@ find_path (struct grub_btrfs_data *data,
+@@ -2013,7 +2040,9 @@ find_path (struct grub_btrfs_data *data,
  
        if (ctokenlen == 1 && ctoken[0] == '.')
  	{
@@ -131,7 +131,7 @@ index ad1b56b716..113c1f746c 100644
  	  continue;
  	}
        if (ctokenlen == 2 && ctoken[0] == '.' && ctoken[1] == '.')
-@@ -1933,8 +1962,9 @@ find_path (struct grub_btrfs_data *data,
+@@ -2044,8 +2073,9 @@ find_path (struct grub_btrfs_data *data,
  	  *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
  	  key->object_id = key_out.offset;
  
@@ -143,7 +143,7 @@ index ad1b56b716..113c1f746c 100644
  	  continue;
  	}
  
-@@ -2003,7 +2033,9 @@ find_path (struct grub_btrfs_data *data,
+@@ -2114,7 +2144,9 @@ find_path (struct grub_btrfs_data *data,
  	  return err;
  	}
  
@@ -154,7 +154,7 @@ index ad1b56b716..113c1f746c 100644
        if (cdirel->type == GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK)
  	{
  	  struct grub_btrfs_inode inode;
-@@ -2053,14 +2085,26 @@ find_path (struct grub_btrfs_data *data,
+@@ -2164,14 +2196,26 @@ find_path (struct grub_btrfs_data *data,
  	  path = path_alloc = tmp;
  	  if (path[0] == '/')
  	    {
@@ -188,7 +188,7 @@ index ad1b56b716..113c1f746c 100644
  		}
  	      else
  		{
-@@ -2716,6 +2760,7 @@ GRUB_MOD_INIT (btrfs)
+@@ -2922,6 +2966,7 @@ GRUB_MOD_INIT (btrfs)
                                 subvolid_set_env);
    grub_env_export ("btrfs_subvol");
    grub_env_export ("btrfs_subvolid");
diff --git a/0045-grub2-btrfs-04-grub2-install.patch b/0040-grub2-btrfs-04-grub2-install.patch
similarity index 87%
rename from 0045-grub2-btrfs-04-grub2-install.patch
rename to 0040-grub2-btrfs-04-grub2-install.patch
index 6b2bc78e..c7b56564 100644
--- a/0045-grub2-btrfs-04-grub2-install.patch
+++ b/0040-grub2-btrfs-04-grub2-install.patch
@@ -9,16 +9,16 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  grub-core/osdep/linux/getroot.c |  7 +++++++
  grub-core/osdep/unix/config.c   | 17 +++++++++++++++--
  util/config.c                   | 10 ++++++++++
- util/grub-install.c             | 15 +++++++++++++++
+ util/grub-install.c             | 14 ++++++++++++++
  util/grub-mkrelpath.c           |  6 ++++++
  include/grub/emu/config.h       |  1 +
- 6 files changed, 54 insertions(+), 2 deletions(-)
+ 6 files changed, 53 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 001b818fe5..caf9b1ccd3 100644
+index 7dd775d2ad9..7c29b3523b4 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
-@@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_path)
+@@ -373,6 +373,7 @@ get_btrfs_fs_prefix (const char *mount_path)
    return NULL;
  }
  
@@ -26,7 +26,7 @@ index 001b818fe5..caf9b1ccd3 100644
  
  char **
  grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
-@@ -519,6 +520,12 @@ again:
+@@ -516,6 +517,12 @@ again:
  	{
  	  ret = grub_find_root_devices_from_btrfs (dir);
  	  fs_prefix = get_btrfs_fs_prefix (entries[i].enc_path);
@@ -40,7 +40,7 @@ index 001b818fe5..caf9b1ccd3 100644
        else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0)
  	{
 diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
-index 7d6325138c..46a881530c 100644
+index 0b1f7618d21..0ce0e309ac0 100644
 --- a/grub-core/osdep/unix/config.c
 +++ b/grub-core/osdep/unix/config.c
 @@ -82,6 +82,19 @@ grub_util_load_config (struct grub_util_config *cfg)
@@ -75,7 +75,7 @@ index 7d6325138c..46a881530c 100644
    argv[2] = script;
    argv[3] = '\0';
 diff --git a/util/config.c b/util/config.c
-index ebcdd8f5e2..f044a880a7 100644
+index ebcdd8f5e22..f044a880a76 100644
 --- a/util/config.c
 +++ b/util/config.c
 @@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct grub_util_config *cfg, int simple)
@@ -96,19 +96,19 @@ index ebcdd8f5e2..f044a880a7 100644
  			sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0)
  	{
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 0fbe7f78c6..0f66f36d23 100644
+index 7dc5657bb67..ec3ed49674b 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
-@@ -827,6 +827,8 @@ fill_core_services (const char *core_services)
-   free (sysv_plist);
+@@ -843,6 +843,8 @@ try_open (const char *path)
  }
+ #endif
  
 +extern int use_relative_path_on_btrfs;
 +
  int
  main (int argc, char *argv[])
  {
-@@ -860,6 +862,9 @@ main (int argc, char *argv[])
+@@ -876,6 +878,9 @@ main (int argc, char *argv[])
  
    grub_util_load_config (&config);
  
@@ -118,11 +118,10 @@ index 0fbe7f78c6..0f66f36d23 100644
    if (!bootloader_id && config.grub_distributor)
      {
        char *ptr;
-@@ -1352,6 +1357,16 @@ main (int argc, char *argv[])
-       fprintf (load_cfg_f, "set debug='%s'\n",
- 	      debug_image);
+@@ -1366,6 +1371,15 @@ main (int argc, char *argv[])
+       relative_grubdir = xstrdup ("/");
      }
-+
+ 
 +  if (config.is_suse_btrfs_snapshot_enabled
 +      && grub_strncmp(grub_fs->name, "btrfs", sizeof ("btrfs") - 1) == 0)
 +    {
@@ -136,7 +135,7 @@ index 0fbe7f78c6..0f66f36d23 100644
    char *install_drive = NULL;
  
 diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
-index 47a241a391..5db7a9a7d9 100644
+index 47a241a391b..5db7a9a7d97 100644
 --- a/util/grub-mkrelpath.c
 +++ b/util/grub-mkrelpath.c
 @@ -40,9 +40,12 @@ struct arguments
@@ -163,7 +162,7 @@ index 47a241a391..5db7a9a7d9 100644
        if (state->arg_num == 0)
  	arguments->pathname = xstrdup (arg);
 diff --git a/include/grub/emu/config.h b/include/grub/emu/config.h
-index 875d5896ce..c9a7e5f4ad 100644
+index 875d5896ce1..c9a7e5f4ade 100644
 --- a/include/grub/emu/config.h
 +++ b/include/grub/emu/config.h
 @@ -37,6 +37,7 @@ struct grub_util_config
diff --git a/0046-grub2-btrfs-05-grub2-mkconfig.patch b/0041-grub2-btrfs-05-grub2-mkconfig.patch
similarity index 92%
rename from 0046-grub2-btrfs-05-grub2-mkconfig.patch
rename to 0041-grub2-btrfs-05-grub2-mkconfig.patch
index 06d15a7c..f1187fdc 100644
--- a/0046-grub2-btrfs-05-grub2-mkconfig.patch
+++ b/0041-grub2-btrfs-05-grub2-mkconfig.patch
@@ -13,10 +13,10 @@ Signed-off-by: Michael Chang <mchang@suse.com>
  5 files changed, 38 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 005f093809..535c0f0249 100644
+index 28e92515795..884e4d363ca 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -252,7 +252,8 @@ export GRUB_DEFAULT \
+@@ -256,7 +256,8 @@ export GRUB_DEFAULT \
    GRUB_BADRAM \
    GRUB_OS_PROBER_SKIP_LIST \
    GRUB_DISABLE_SUBMENU \
@@ -27,10 +27,10 @@ index 005f093809..535c0f0249 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 42c2ea9ba5..fafeac9506 100644
+index 33e1750aebb..0ba0e0e1c65 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
-@@ -52,7 +52,11 @@ grub_warn ()
+@@ -49,7 +49,11 @@ grub_warn ()
  
  make_system_path_relative_to_its_root ()
  {
@@ -43,7 +43,7 @@ index 42c2ea9ba5..fafeac9506 100644
  
  is_path_readable_by_grub ()
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 858b526c92..de727e6ee6 100644
+index c2d8b093762..3e1b77265db 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@"
@@ -90,10 +90,10 @@ index 858b526c92..de727e6ee6 100644
 +EOF
 +fi
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 292e333324..7bb3a211a7 100644
+index e8ab4082f87..48ff32c1da4 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -66,10 +66,14 @@ fi
+@@ -68,10 +68,14 @@ fi
  
  case x"$GRUB_FS" in
      xbtrfs)
@@ -109,10 +109,10 @@ index 292e333324..7bb3a211a7 100644
      xzfs)
  	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index ada20775a1..e9e73b815f 100644
+index 98ee5bc58dc..efcded0fbb4 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
-@@ -73,10 +73,14 @@ fi
+@@ -75,10 +75,14 @@ fi
  
  case x"$GRUB_FS" in
      xbtrfs)
diff --git a/0047-grub2-btrfs-06-subvol-mount.patch b/0042-grub2-btrfs-06-subvol-mount.patch
similarity index 94%
rename from 0047-grub2-btrfs-06-subvol-mount.patch
rename to 0042-grub2-btrfs-06-subvol-mount.patch
index 8cdf247d..7ddae569 100644
--- a/0047-grub2-btrfs-06-subvol-mount.patch
+++ b/0042-grub2-btrfs-06-subvol-mount.patch
@@ -13,7 +13,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  4 files changed, 392 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 113c1f746c..d323746ecf 100644
+index d47f9ab0352..d44a1c73b8a 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -41,6 +41,7 @@
@@ -37,7 +37,7 @@ index 113c1f746c..d323746ecf 100644
  
  static grub_err_t
  read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb)
-@@ -1223,9 +1230,26 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
+@@ -1302,9 +1309,26 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
    grub_err_t err;
    grub_uint64_t tree = 0;
    grub_uint8_t type;
@@ -64,10 +64,10 @@ index 113c1f746c..d323746ecf 100644
    if (err)
        return grub_error(GRUB_ERR_FILE_NOT_FOUND, "couldn't locate %s\n", path);
  
-@@ -2199,11 +2223,20 @@ grub_btrfs_dir (grub_device_t device, const char *path,
-   int r = 0;
+@@ -2316,11 +2340,20 @@ grub_btrfs_dir (grub_device_t device, const char *path,
    grub_uint64_t tree;
    grub_uint8_t type;
+   grub_size_t est_size = 0;
 +  char *new_path = NULL;
  
    if (!data)
@@ -86,7 +86,7 @@ index 113c1f746c..d323746ecf 100644
    if (err)
      {
        grub_btrfs_unmount (data);
-@@ -2305,11 +2338,21 @@ grub_btrfs_open (struct grub_file *file, const char *name)
+@@ -2447,11 +2480,21 @@ grub_btrfs_open (struct grub_file *file, const char *name)
    struct grub_btrfs_inode inode;
    grub_uint8_t type;
    struct grub_btrfs_key key_in;
@@ -109,7 +109,7 @@ index 113c1f746c..d323746ecf 100644
    if (err)
      {
        grub_btrfs_unmount (data);
-@@ -2480,6 +2523,150 @@ grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc,
+@@ -2686,6 +2729,150 @@ grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc,
    return 0;
  }
  
@@ -260,7 +260,7 @@ index 113c1f746c..d323746ecf 100644
  static grub_err_t
  get_fs_root(struct grub_btrfs_data *data, grub_uint64_t tree,
              grub_uint64_t objectid, grub_uint64_t offset,
-@@ -2686,6 +2873,7 @@ static struct grub_fs grub_btrfs_fs = {
+@@ -2892,6 +3079,7 @@ static struct grub_fs grub_btrfs_fs = {
  };
  
  static grub_command_t cmd_info;
@@ -268,7 +268,7 @@ index 113c1f746c..d323746ecf 100644
  static grub_extcmd_t cmd_list_subvols;
  
  static char *
-@@ -2749,6 +2937,9 @@ GRUB_MOD_INIT (btrfs)
+@@ -2955,6 +3143,9 @@ GRUB_MOD_INIT (btrfs)
    cmd_info = grub_register_command("btrfs-info", grub_cmd_btrfs_info,
  				   "DEVICE",
  				   "Print BtrFS info about DEVICE.");
@@ -279,10 +279,10 @@ index 113c1f746c..d323746ecf 100644
  					 grub_cmd_btrfs_list_subvols, 0,
  					 "[-p|-n] [-o var] DEVICE",
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index caf9b1ccd3..28790307e0 100644
+index 7c29b3523b4..74a48c03026 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
-@@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key
+@@ -103,6 +103,14 @@ struct btrfs_ioctl_search_key
    grub_uint32_t unused[9];
  };
  
@@ -297,7 +297,7 @@ index caf9b1ccd3..28790307e0 100644
  struct btrfs_ioctl_search_args {
    struct btrfs_ioctl_search_key key;
    grub_uint64_t buf[(4096 - sizeof(struct btrfs_ioctl_search_key))
-@@ -378,6 +386,109 @@ get_btrfs_fs_prefix (const char *mount_path)
+@@ -375,6 +383,109 @@ get_btrfs_fs_prefix (const char *mount_path)
  
  int use_relative_path_on_btrfs = 0;
  
@@ -407,7 +407,7 @@ index caf9b1ccd3..28790307e0 100644
  char **
  grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
  {
-@@ -519,12 +630,15 @@ again:
+@@ -516,12 +627,15 @@ again:
        else if (grub_strcmp (entries[i].fstype, "btrfs") == 0)
  	{
  	  ret = grub_find_root_devices_from_btrfs (dir);
@@ -426,7 +426,7 @@ index caf9b1ccd3..28790307e0 100644
  	    }
  	}
        else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0)
-@@ -1150,6 +1264,34 @@ grub_util_get_grub_dev_os (const char *os_dev)
+@@ -1147,6 +1261,34 @@ grub_util_get_grub_dev_os (const char *os_dev)
    return grub_dev;
  }
  
@@ -462,10 +462,10 @@ index caf9b1ccd3..28790307e0 100644
  grub_make_system_path_relative_to_its_root_os (const char *path)
  {
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 0f66f36d23..84ed6e88ec 100644
+index ec3ed49674b..d3ec2570d1d 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
-@@ -1569,6 +1569,55 @@ main (int argc, char *argv[])
+@@ -1615,6 +1615,55 @@ main (int argc, char *argv[])
        prefix_drive = xasprintf ("(%s)", grub_drives[0]);
      }
  
@@ -522,7 +522,7 @@ index 0f66f36d23..84ed6e88ec 100644
    const char *core_name = NULL;
  
 diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h
-index 73fa2d34ab..9c642ae3fe 100644
+index 73fa2d34abb..9c642ae3fe3 100644
 --- a/include/grub/emu/getroot.h
 +++ b/include/grub/emu/getroot.h
 @@ -53,6 +53,11 @@ char **
diff --git a/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0043-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
similarity index 94%
rename from 0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
rename to 0043-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
index a5db09ae..1b3a969a 100644
--- a/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
+++ b/0043-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
@@ -10,10 +10,10 @@ Ref: bsc#953538
  1 file changed, 31 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index d323746ecf..673ded0352 100644
+index d44a1c73b8a..dba86d19b1a 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -1260,11 +1260,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
+@@ -1339,11 +1339,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
    return GRUB_ERR_NONE;
  }
  
diff --git a/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0044-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
similarity index 97%
rename from 0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
rename to 0044-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
index 99c106d5..add5764e 100644
--- a/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+++ b/0044-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
@@ -10,10 +10,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 238 insertions(+)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 673ded0352..2b21cbaa67 100644
+index dba86d19b1a..87e4dd1a07a 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
-@@ -2887,6 +2887,238 @@ out:
+@@ -3093,6 +3093,238 @@ out:
    return 0;
  }
  
@@ -252,7 +252,7 @@ index 673ded0352..2b21cbaa67 100644
  static struct grub_fs grub_btrfs_fs = {
    .name = "btrfs",
    .fs_dir = grub_btrfs_dir,
-@@ -2905,6 +3137,7 @@ static struct grub_fs grub_btrfs_fs = {
+@@ -3111,6 +3343,7 @@ static struct grub_fs grub_btrfs_fs = {
  static grub_command_t cmd_info;
  static grub_command_t cmd_mount_subvol;
  static grub_extcmd_t cmd_list_subvols;
@@ -260,7 +260,7 @@ index 673ded0352..2b21cbaa67 100644
  
  static char *
  subvolid_set_env (struct grub_env_var *var __attribute__ ((unused)),
-@@ -2975,6 +3208,11 @@ GRUB_MOD_INIT (btrfs)
+@@ -3181,6 +3414,11 @@ GRUB_MOD_INIT (btrfs)
  					 "[-p|-n] [-o var] DEVICE",
  					 "Print list of BtrFS subvolumes on "
  					 "DEVICE.", options);
diff --git a/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0045-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
similarity index 82%
rename from 0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
rename to 0045-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
index d07dd276..b88fbab7 100644
--- a/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
+++ b/0045-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
@@ -10,21 +10,21 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 32 insertions(+), 4 deletions(-)
 
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 585fa6662b..03f9a9d011 100644
+index a5cd99e5afa..8d98203a784 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -24,6 +24,10 @@
- #include <grub/dl.h>
- #include <grub/efi/api.h>
+@@ -36,6 +36,10 @@ struct linux_arch_kernel_header {
+   struct grub_pe_image_header pe_image_header;
+ };
  
 +/* Variables.  */
 +extern grub_efi_system_table_t *EXPORT_VAR(grub_efi_system_table);
 +extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);
 +
  /* Functions.  */
- void *EXPORT_FUNC(grub_efi_locate_protocol) (grub_efi_guid_t *protocol,
+ void *EXPORT_FUNC(grub_efi_locate_protocol) (grub_guid_t *protocol,
  					     void *registration);
-@@ -60,6 +64,33 @@ EXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t *memory_map_size,
+@@ -71,6 +75,33 @@ EXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t *memory_map_size,
  				      grub_efi_uintn_t *descriptor_size,
  				      grub_efi_uint32_t *descriptor_version);
  void grub_efi_memory_fini (void);
@@ -39,7 +39,7 @@ index 585fa6662b..03f9a9d011 100644
 +  grub_efi_status_t status;
 +
 +  b = grub_efi_system_table->boot_services;
-+  status = efi_call_3 (b->allocate_pool, pool_type, buffer_size, buffer);
++  status = b->allocate_pool(pool_type, buffer_size, buffer);
 +  return status;
 +}
 +
@@ -51,14 +51,14 @@ index 585fa6662b..03f9a9d011 100644
 +  grub_efi_status_t status;
 +
 +  b = grub_efi_system_table->boot_services;
-+  status = efi_call_1 (b->free_pool, buffer);
++  status = b->free_pool(buffer);
 +  return status;
 +}
 +
  grub_efi_loaded_image_t *EXPORT_FUNC(grub_efi_get_loaded_image) (grub_efi_handle_t image_handle);
  void EXPORT_FUNC(grub_efi_print_device_path) (grub_efi_device_path_t *dp);
  char *EXPORT_FUNC(grub_efi_get_filename) (grub_efi_device_path_t *dp);
-@@ -115,10 +146,7 @@ void grub_efi_init (void);
+@@ -140,10 +171,7 @@ void grub_efi_init (void);
  void grub_efi_fini (void);
  void grub_efi_set_prefix (void);
  
diff --git a/0046-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0046-Use-grub_efi_.-memory-helpers-where-reasonable.patch
new file mode 100644
index 00000000..0523c643
--- /dev/null
+++ b/0046-Use-grub_efi_.-memory-helpers-where-reasonable.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 1 Jun 2017 10:06:38 -0400
+Subject: [PATCH] Use grub_efi_...() memory helpers where reasonable.
+
+This uses grub_efi_allocate_pool(), grub_efi_free_pool(), and
+grub_efi_free_pages() instead of open-coded efi_call_N() calls, so we
+get more reasonable type checking.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/loader/efi/chainloader.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index 1de98f78313..2036924504b 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -95,7 +95,7 @@ grub_chainloader_boot (void *context)
+     }
+ 
+   if (exit_data)
+-    b->free_pool (exit_data);
++    grub_efi_free_pool (exit_data);
+ 
+   grub_loader_unset ();
+ 
+@@ -419,7 +419,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+   grub_free (file_path);
+ 
+   if (address)
+-    b->free_pages (address, pages);
++    grub_efi_free_pages (address, pages);
+ 
+   if (image_handle != NULL)
+     b->unload_image (image_handle);
diff --git a/0047-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0047-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
new file mode 100644
index 00000000..c852ced5
--- /dev/null
+++ b/0047-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 1 Jun 2017 10:07:50 -0400
+Subject: [PATCH] Add PRIxGRUB_EFI_STATUS and use it.
+
+This avoids syntax checkers getting confused about if it's llx or lx.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ include/grub/efi/api.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
+index c1b869db520..daa9268fdaa 100644
+--- a/include/grub/efi/api.h
++++ b/include/grub/efi/api.h
+@@ -577,7 +577,16 @@ typedef grub_uint64_t grub_efi_uint64_t;
+ typedef grub_uint8_t grub_efi_char8_t;
+ typedef grub_uint16_t grub_efi_char16_t;
+ 
++
+ typedef grub_efi_uintn_t grub_efi_status_t;
++/* Make grub_efi_status_t reasonably printable. */
++#if GRUB_CPU_SIZEOF_VOID_P == 8
++#define PRIxGRUB_EFI_STATUS "lx"
++#define PRIdGRUB_EFI_STATUS "ld"
++#else
++#define PRIxGRUB_EFI_STATUS "llx"
++#define PRIdGRUB_EFI_STATUS "lld"
++#endif
+ 
+ /*
+  * On x86, the EFI calling convention may deviate from the local one, so
diff --git a/0053-don-t-use-int-for-efi-status.patch b/0048-don-t-use-int-for-efi-status.patch
similarity index 88%
rename from 0053-don-t-use-int-for-efi-status.patch
rename to 0048-don-t-use-int-for-efi-status.patch
index 4d48e376..de4367d4 100644
--- a/0053-don-t-use-int-for-efi-status.patch
+++ b/0048-don-t-use-int-for-efi-status.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] don't use int for efi status
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 05d8237a9b..ae9885edb8 100644
+index 885d7c6420e..2bb8a0e7a38 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -167,7 +167,7 @@ grub_reboot (void)
+@@ -177,7 +177,7 @@ grub_reboot (void)
  void
  grub_exit (int retval)
  {
diff --git a/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0049-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
similarity index 96%
rename from 0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
rename to 0049-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
index fb71ea50..44c08198 100644
--- a/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
+++ b/0049-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] make GRUB_MOD_INIT() declare its function prototypes.
  1 file changed, 2 insertions(+)
 
 diff --git a/include/grub/dl.h b/include/grub/dl.h
-index b3753c9ca2..91933b85f2 100644
+index cd1f46c8bad..f2bf50eb98d 100644
 --- a/include/grub/dl.h
 +++ b/include/grub/dl.h
 @@ -54,6 +54,7 @@ grub_mod_fini (void)
diff --git a/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0050-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
similarity index 92%
rename from 0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
rename to 0050-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
index ae8a8c68..8dfb85fd 100644
--- a/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
+++ b/0050-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
@@ -16,10 +16,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 11 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 84ed6e88ec..a2bec7446c 100644
+index d3ec2570d1d..66ef9494d9d 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
-@@ -1190,18 +1190,8 @@ main (int argc, char *argv[])
+@@ -1234,18 +1234,8 @@ main (int argc, char *argv[])
  	  char *d;
  
  	  is_guess = 1;
diff --git a/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0051-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
similarity index 85%
rename from 0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
rename to 0051-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
index cd58ff45..026fe5e8 100644
--- a/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
+++ b/0051-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
@@ -9,10 +9,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index e9e73b815f..c23b064be6 100644
+index efcded0fbb4..4ecf5deea17 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
-@@ -153,6 +153,7 @@ linux_entry_xsm ()
+@@ -156,6 +156,7 @@ linux_entry_xsm ()
          else
              xen_rm_opts="no-real-mode edd=off"
          fi
@@ -20,15 +20,15 @@ index e9e73b815f..c23b064be6 100644
  	${xen_loader}	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
  	echo	'$(echo "$lmessage" | grub_quote)'
  	${module_loader}	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
-@@ -166,6 +167,7 @@ EOF
-     done
-     sed "s/^/$submenu_indentation/" << EOF
+@@ -168,6 +169,7 @@ EOF
+        initrd_path="${rel_dirname}/${i}"
+        sed "s/^/$submenu_indentation/" << EOF
  	echo	'$(echo "$message" | grub_quote)'
 +	insmod ${xen_module}
  	${module_loader}	--nounzip   $(echo $initrd_path)
  EOF
-   fi
-@@ -253,13 +255,16 @@ while [ "x${xen_list}" != "x" ] ; do
+     done
+@@ -269,13 +271,16 @@ for current_xen in ${reverse_sorted_xen_list}; do
  	echo "	submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
      fi
      if ($grub_file --is-arm64-efi $current_xen); then
diff --git a/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch
deleted file mode 100644
index 2a3d27b1..00000000
--- a/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 1 Jun 2017 10:06:38 -0400
-Subject: [PATCH] Use grub_efi_...() memory helpers where reasonable.
-
-This uses grub_efi_allocate_pool(), grub_efi_free_pool(), and
-grub_efi_free_pages() instead of open-coded efi_call_N() calls, so we
-get more reasonable type checking.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/loader/efi/chainloader.c | 24 +++++++++---------------
- 1 file changed, 9 insertions(+), 15 deletions(-)
-
-diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 07c4937898..89ac84cc66 100644
---- a/grub-core/loader/efi/chainloader.c
-+++ b/grub-core/loader/efi/chainloader.c
-@@ -65,7 +65,7 @@ grub_chainloader_unload (void)
- 
-   b = grub_efi_system_table->boot_services;
-   efi_call_1 (b->unload_image, image_handle);
--  efi_call_2 (b->free_pages, address, pages);
-+  grub_efi_free_pages (address, pages);
- 
-   grub_free (file_path);
-   grub_free (cmdline);
-@@ -108,7 +108,7 @@ grub_chainloader_boot (void)
-     }
- 
-   if (exit_data)
--    efi_call_1 (b->free_pool, exit_data);
-+    grub_efi_free_pool (exit_data);
- 
-   grub_loader_unset ();
- 
-@@ -527,10 +527,9 @@ grub_efi_get_media_file_path (grub_efi_device_path_t *dp)
- static grub_efi_boolean_t
- handle_image (void *data, grub_efi_uint32_t datasize)
- {
--  grub_efi_boot_services_t *b;
-   grub_efi_loaded_image_t *li, li_bak;
-   grub_efi_status_t efi_status;
--  char *buffer = NULL;
-+  void *buffer = NULL;
-   char *buffer_aligned = NULL;
-   grub_efi_uint32_t i;
-   struct grub_pe32_section_table *section;
-@@ -541,8 +540,6 @@ handle_image (void *data, grub_efi_uint32_t datasize)
-   int found_entry_point = 0;
-   int rc;
- 
--  b = grub_efi_system_table->boot_services;
--
-   rc = read_header (data, datasize, &context);
-   if (rc < 0)
-     {
-@@ -582,8 +579,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
-   grub_dprintf ("chain", "image size is %08"PRIxGRUB_UINT64_T", datasize is %08x\n",
- 	       context.image_size, datasize);
- 
--  efi_status = efi_call_3 (b->allocate_pool, GRUB_EFI_LOADER_DATA,
--			   buffer_size, &buffer);
-+  efi_status = grub_efi_allocate_pool (GRUB_EFI_LOADER_DATA, buffer_size,
-+				       &buffer);
- 
-   if (efi_status != GRUB_EFI_SUCCESS)
-     {
-@@ -815,14 +812,14 @@ handle_image (void *data, grub_efi_uint32_t datasize)
- 
-   grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
-   grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
--  efi_status = efi_call_1 (b->free_pool, buffer);
-+  efi_status = grub_efi_free_pool (buffer);
- 
-   return 1;
- 
- error_exit:
-   grub_dprintf ("chain", "error_exit: grub_errno: %d\n", grub_errno);
-   if (buffer)
--      efi_call_1 (b->free_pool, buffer);
-+    grub_efi_free_pool (buffer);
- 
-   return 0;
- }
-@@ -830,10 +827,7 @@ error_exit:
- static grub_err_t
- grub_secureboot_chainloader_unload (void)
- {
--  grub_efi_boot_services_t *b;
--
--  b = grub_efi_system_table->boot_services;
--  efi_call_2 (b->free_pages, address, pages);
-+  grub_efi_free_pages (address, pages);
-   grub_free (file_path);
-   grub_free (cmdline);
-   cmdline = 0;
-@@ -1100,7 +1094,7 @@ fail:
-   grub_free (file_path);
- 
-   if (address)
--    efi_call_2 (b->free_pages, address, pages);
-+    grub_efi_free_pages (address, pages);
- 
-   if (cmdline)
-     grub_free (cmdline);
diff --git a/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
deleted file mode 100644
index f649c8c4..00000000
--- a/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 1 Jun 2017 10:07:50 -0400
-Subject: [PATCH] Add PRIxGRUB_EFI_STATUS and use it.
-
-This avoids syntax checkers getting confused about if it's llx or lx.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/loader/efi/chainloader.c | 3 ++-
- include/grub/efi/api.h             | 9 +++++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 89ac84cc66..ac8dfd40c6 100644
---- a/grub-core/loader/efi/chainloader.c
-+++ b/grub-core/loader/efi/chainloader.c
-@@ -810,7 +810,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
-   efi_status = efi_call_2 (entry_point, grub_efi_image_handle,
- 			   grub_efi_system_table);
- 
--  grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
-+  grub_dprintf ("chain", "entry_point returned 0x%"PRIxGRUB_EFI_STATUS"\n",
-+		efi_status);
-   grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
-   efi_status = grub_efi_free_pool (buffer);
- 
-diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 117469450d..9962880147 100644
---- a/include/grub/efi/api.h
-+++ b/include/grub/efi/api.h
-@@ -546,7 +546,16 @@ typedef grub_uint64_t grub_efi_uint64_t;
- typedef grub_uint8_t grub_efi_char8_t;
- typedef grub_uint16_t grub_efi_char16_t;
- 
-+
- typedef grub_efi_uintn_t grub_efi_status_t;
-+/* Make grub_efi_status_t reasonably printable. */
-+#if GRUB_CPU_SIZEOF_VOID_P == 8
-+#define PRIxGRUB_EFI_STATUS "lx"
-+#define PRIdGRUB_EFI_STATUS "ld"
-+#else
-+#define PRIxGRUB_EFI_STATUS "llx"
-+#define PRIdGRUB_EFI_STATUS "lld"
-+#endif
- 
- #define GRUB_EFI_ERROR_CODE(value)	\
-   ((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (value))
diff --git a/0058-align-struct-efi_variable-better.patch b/0052-align-struct-efi_variable-better.patch
similarity index 91%
rename from 0058-align-struct-efi_variable-better.patch
rename to 0052-align-struct-efi_variable-better.patch
index 361cb130..24c32375 100644
--- a/0058-align-struct-efi_variable-better.patch
+++ b/0052-align-struct-efi_variable-better.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] align struct efi_variable better...
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
-index 36d2dedf47..9d93ba88ba 100644
+index 2ff42984545..6363fd522e1 100644
 --- a/include/grub/efiemu/runtime.h
 +++ b/include/grub/efiemu/runtime.h
 @@ -33,5 +33,5 @@ struct efi_variable
@@ -20,10 +20,10 @@ index 36d2dedf47..9d93ba88ba 100644
 +} GRUB_PACKED GRUB_ALIGNED(8);
  #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */
 diff --git a/include/grub/types.h b/include/grub/types.h
-index 0a3ff15913..ba446d9904 100644
+index 064066e2e18..59e030268c2 100644
 --- a/include/grub/types.h
 +++ b/include/grub/types.h
-@@ -29,6 +29,7 @@
+@@ -30,6 +30,7 @@
  #else
  #define GRUB_PACKED __attribute__ ((packed))
  #endif
diff --git a/0059-Add-BLS-support-to-grub-mkconfig.patch b/0053-Add-BLS-support-to-grub-mkconfig.patch
similarity index 95%
rename from 0059-Add-BLS-support-to-grub-mkconfig.patch
rename to 0053-Add-BLS-support-to-grub-mkconfig.patch
index 4c3f56f9..6b60ee76 100644
--- a/0059-Add-BLS-support-to-grub-mkconfig.patch
+++ b/0053-Add-BLS-support-to-grub-mkconfig.patch
@@ -24,7 +24,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
 [iwienand@redhat.com: skip machine ID check when updating entries]
 Signed-off-by: Ian Wienand <iwienand@redhat.com>
-[rharwood: commit message composits, drop man pages]
+[rharwood: use sort(1), commit message composits, drop man pages]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  util/grub-mkconfig.in     |   9 +-
@@ -33,7 +33,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  3 files changed, 243 insertions(+), 6 deletions(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 535c0f0249..f55339a3f6 100644
+index 884e4d363ca..bec52e052fc 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -50,6 +50,8 @@ grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@"
@@ -63,7 +63,7 @@ index 535c0f0249..f55339a3f6 100644
      -*)
  	gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
  	usage
-@@ -253,7 +259,8 @@ export GRUB_DEFAULT \
+@@ -257,7 +263,8 @@ export GRUB_DEFAULT \
    GRUB_OS_PROBER_SKIP_LIST \
    GRUB_DISABLE_SUBMENU \
    GRUB_DEFAULT_DTB \
@@ -74,7 +74,7 @@ index 535c0f0249..f55339a3f6 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index fafeac9506..d8bb406936 100644
+index 0ba0e0e1c65..c2e107b41ab 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -30,6 +30,9 @@ fi
@@ -87,7 +87,7 @@ index fafeac9506..d8bb406936 100644
  if test "x$grub_mkrelpath" = x; then
    grub_mkrelpath="${bindir}/@grub_mkrelpath@"
  fi
-@@ -125,8 +128,19 @@ EOF
+@@ -122,8 +125,19 @@ EOF
    fi
  }
  
@@ -107,7 +107,7 @@ index fafeac9506..d8bb406936 100644
    old_ifs="$IFS"
    IFS='
  '
-@@ -161,18 +175,18 @@ prepare_grub_to_access_device ()
+@@ -158,18 +172,18 @@ prepare_grub_to_access_device ()
    # otherwise set root as per value in device.map.
    fs_hint="`"${grub_probe}" --device $@ --target=compatibility_hint`"
    if [ "x$fs_hint" != x ]; then
@@ -131,10 +131,10 @@ index fafeac9506..d8bb406936 100644
    fi
    IFS="$old_ifs"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 7bb3a211a7..f1548a2605 100644
+index 48ff32c1da4..cd9aea0cc01 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -82,6 +82,218 @@ case x"$GRUB_FS" in
+@@ -84,6 +84,218 @@ case x"$GRUB_FS" in
  	;;
  esac
  
@@ -207,7 +207,7 @@ index 7bb3a211a7..f1548a2605 100644
 +        bls="${bls%.conf}"
 +        bls="${bls##*/}"
 +        echo "${bls}"
-+    done | ${kernel_sort} 2>/dev/null | tac)) || :
++    done | sort -Vr 2>/dev/null)) || :
 +
 +    echo "${files[@]}"
 +}
@@ -353,7 +353,7 @@ index 7bb3a211a7..f1548a2605 100644
  mktitle ()
  {
    local title_type
-@@ -121,6 +333,7 @@ linux_entry ()
+@@ -123,6 +335,7 @@ linux_entry ()
    if [ -z "$boot_device_id" ]; then
        boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
    fi
@@ -361,15 +361,15 @@ index 7bb3a211a7..f1548a2605 100644
    if [ x$type != xsimple ] ; then
        title=$(mktitle "$type" "$version")
        if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
-@@ -231,6 +444,7 @@ is_top_level=true
- while [ "x$list" != "x" ] ; do
-   linux=`version_find_latest $list`
+@@ -243,6 +456,7 @@ fi
+ is_top_level=true
+ for linux in ${reverse_sorted_list}; do
    gettext_printf "Found linux image: %s\n" "$linux" >&2
 +
    basename=`basename $linux`
    dirname=`dirname $linux`
    rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -269,7 +483,9 @@ while [ "x$list" != "x" ] ; do
+@@ -283,7 +497,9 @@ for linux in ${reverse_sorted_list}; do
      for i in ${initrd}; do
        initrd_display="${initrd_display} ${dirname}/${i}"
      done
diff --git a/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0054-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
similarity index 89%
rename from 0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
rename to 0054-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
index 1ac900c1..4b925a58 100644
--- a/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
+++ b/0054-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
@@ -12,10 +12,10 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index a3e215155b..c60601b699 100644
+index 465a8e74ea7..b1d399d37d7 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -1201,7 +1201,7 @@ static void __attribute__ ((noreturn))
+@@ -1303,7 +1303,7 @@ void __attribute__ ((noreturn))
  grub_abort (void)
  {
  #ifndef GRUB_UTIL
diff --git a/0062-Add-grub2-switch-to-blscfg.patch b/0055-Add-grub2-switch-to-blscfg.patch
similarity index 97%
rename from 0062-Add-grub2-switch-to-blscfg.patch
rename to 0055-Add-grub2-switch-to-blscfg.patch
index e3144df6..76732205 100644
--- a/0062-Add-grub2-switch-to-blscfg.patch
+++ b/0055-Add-grub2-switch-to-blscfg.patch
@@ -20,10 +20,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 util/grub-switch-to-blscfg.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 43a1c7453b..a90879fa9b 100644
+index 84a17ef5cfa..acbcc8c208c 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1365,6 +1365,13 @@ program = {
+@@ -1387,6 +1387,13 @@ program = {
    ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };
  
@@ -39,14 +39,14 @@ index 43a1c7453b..a90879fa9b 100644
    mansection = 1;
 diff --git a/docs/man/grub-switch-to-blscfg.h2m b/docs/man/grub-switch-to-blscfg.h2m
 new file mode 100644
-index 0000000000..fa341426a5
+index 00000000000..fa341426a50
 --- /dev/null
 +++ b/docs/man/grub-switch-to-blscfg.h2m
 @@ -0,0 +1,2 @@
 +[NAME]
 +grub-switch-to-blscfg \- switch to using BLS config files
 diff --git a/util/grub-set-password.in b/util/grub-set-password.in
-index 5ebf50576d..c0b5ebbfdc 100644
+index 5ebf50576d6..c0b5ebbfdc5 100644
 --- a/util/grub-set-password.in
 +++ b/util/grub-set-password.in
 @@ -1,6 +1,6 @@
@@ -59,7 +59,7 @@ index 5ebf50576d..c0b5ebbfdc 100644
  else
 diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
 new file mode 100644
-index 0000000000..a851424beb
+index 00000000000..a851424beb2
 --- /dev/null
 +++ b/util/grub-switch-to-blscfg.in
 @@ -0,0 +1,317 @@
@@ -129,7 +129,7 @@ index 0000000000..a851424beb
 +# Print the usage.
 +usage () {
 +    gettext_printf "Usage: %s\n" "$self"
-+    gettext "Switch to BLS config files.\n"; echo
++    gettext "Switch to BLS config files."; echo
 +    echo
 +    print_option_help "-h, --help" "$(gettext "print this message and exit")"
 +    print_option_help "-V, --version" "$(gettext "print the version information and exit")"
@@ -381,10 +381,10 @@ index 0000000000..a851424beb
 +# Bye.
 +exit 0
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index f1548a2605..c02c1f0820 100644
+index cd9aea0cc01..b8bc37e92aa 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -138,7 +138,7 @@ blsdir="/boot/loader/entries"
+@@ -140,7 +140,7 @@ blsdir="/boot/loader/entries"
  
  get_sorted_bls()
  {
diff --git a/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0056-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
similarity index 87%
rename from 0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
rename to 0056-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
index a9162990..7b261665 100644
--- a/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
+++ b/0056-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] normal: don't draw our startup message if debug is set
  1 file changed, 3 insertions(+)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 55558cc0b9..af9792c963 100644
+index 3463f444f74..b5fa6156549 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -430,6 +430,9 @@ grub_normal_reader_init (int nested)
@@ -20,4 +20,4 @@ index 55558cc0b9..af9792c963 100644
 +
    msg_formatted = grub_xasprintf (_("Minimal BASH-like line editing is supported. For "
  				    "the first word, TAB lists possible command completions. Anywhere "
- 				    "else TAB lists possible device or file completions. %s"),
+ 				    "else TAB lists possible device or file completions. To enable "
diff --git a/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
deleted file mode 100644
index beef0f3a..00000000
--- a/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 7 Nov 2017 17:12:17 -0500
-Subject: [PATCH] Make pmtimer tsc calibration not take 51 seconds to fail.
-
-On my laptop running at 2.4GHz, if I run a VM where tsc calibration
-using pmtimer will fail presuming a broken pmtimer, it takes ~51 seconds
-to do so (as measured with the stopwatch on my phone), with a tsc delta
-of 0x1cd1c85300, or around 125 billion cycles.
-
-If instead of trying to wait for 5-200ms to show up on the pmtimer, we try
-to wait for 5-200us, it decides it's broken in ~0x2626aa0 TSCs, aka ~2.4
-million cycles, or more or less instantly.
-
-Additionally, this reading the pmtimer was returning 0xffffffff anyway,
-and that's obviously an invalid return.  I've added a check for that and
-0 so we don't bother waiting for the test if what we're seeing is dead
-pins with no response at all.
-
-If "debug" is includes "pmtimer", you will see one of the following
-three outcomes.  If pmtimer gives all 0 or all 1 bits, you will see:
-
-kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 1
-kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 2
-kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 3
-kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 4
-kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 5
-kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 6
-kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 7
-kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 8
-kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 9
-kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 10
-kern/i386/tsc_pmtimer.c:78: timer is broken; giving up.
-
-This outcome was tested using qemu+kvm with UEFI (OVMF) firmware and
-these options: -machine pc-q35-2.10 -cpu Broadwell-noTSX
-
-If pmtimer gives any other bit patterns but is not actually marching
-forward fast enough to use for clock calibration, you will see:
-
-kern/i386/tsc_pmtimer.c:121: pmtimer delta is 0x0 (1904 iterations)
-kern/i386/tsc_pmtimer.c:124: tsc delta is implausible: 0x2626aa0
-
-This outcome was tested using grub compiled with GRUB_PMTIMER_IGNORE_BAD_READS
-defined (so as not to trip the bad read test) using qemu+kvm with UEFI
-(OVMF) firmware, and these options: -machine pc-q35-2.10 -cpu Broadwell-noTSX
-
-If pmtimer actually works, you'll see something like:
-
-kern/i386/tsc_pmtimer.c:121: pmtimer delta is 0x0 (1904 iterations)
-kern/i386/tsc_pmtimer.c:124: tsc delta is implausible: 0x2626aa0
-
-This outcome was tested using qemu+kvm with UEFI (OVMF) firmware, and
-these options: -machine pc-i440fx-2.4 -cpu Broadwell-noTSX
-
-I've also tested this outcome on a real Intel Xeon E3-1275v3 on an Intel
-Server Board S1200V3RPS using the SDV.RP.B8 "Release" build here:
-https://firmware.intel.com/sites/default/files/UEFIDevKit_S1200RP_vB8.zip
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/kern/i386/tsc_pmtimer.c | 109 +++++++++++++++++++++++++++++++-------
- 1 file changed, 89 insertions(+), 20 deletions(-)
-
-diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c
-index c9c3616997..ca15c3aacd 100644
---- a/grub-core/kern/i386/tsc_pmtimer.c
-+++ b/grub-core/kern/i386/tsc_pmtimer.c
-@@ -28,40 +28,101 @@
- #include <grub/acpi.h>
- #include <grub/cpu/io.h>
- 
-+/*
-+ * Define GRUB_PMTIMER_IGNORE_BAD_READS if you're trying to test a timer that's
-+ * present but doesn't keep time well.
-+ */
-+// #define GRUB_PMTIMER_IGNORE_BAD_READS
-+
- grub_uint64_t
- grub_pmtimer_wait_count_tsc (grub_port_t pmtimer,
- 			     grub_uint16_t num_pm_ticks)
- {
-   grub_uint32_t start;
--  grub_uint32_t last;
--  grub_uint32_t cur, end;
-+  grub_uint64_t cur, end;
-   grub_uint64_t start_tsc;
-   grub_uint64_t end_tsc;
--  int num_iter = 0;
-+  unsigned int num_iter = 0;
-+#ifndef GRUB_PMTIMER_IGNORE_BAD_READS
-+  int bad_reads = 0;
-+#endif
- 
--  start = grub_inl (pmtimer) & 0xffffff;
--  last = start;
-+  /*
-+   * Some timers are 24-bit and some are 32-bit, but it doesn't make much
-+   * difference to us.  Caring which one we have isn't really worth it since
-+   * the low-order digits will give us enough data to calibrate TSC.  So just
-+   * mask the top-order byte off.
-+   */
-+  cur = start = grub_inl (pmtimer) & 0xffffffUL;
-   end = start + num_pm_ticks;
-   start_tsc = grub_get_tsc ();
-   while (1)
-     {
--      cur = grub_inl (pmtimer) & 0xffffff;
--      if (cur < last)
--	cur |= 0x1000000;
--      num_iter++;
-+      cur &= 0xffffffffff000000ULL;
-+      cur |= grub_inl (pmtimer) & 0xffffffUL;
-+
-+      end_tsc = grub_get_tsc();
-+
-+#ifndef GRUB_PMTIMER_IGNORE_BAD_READS
-+      /*
-+       * If we get 10 reads in a row that are obviously dead pins, there's no
-+       * reason to do this thousands of times.
-+       */
-+      if (cur == 0xffffffUL || cur == 0)
-+	{
-+	  bad_reads++;
-+	  grub_dprintf ("pmtimer",
-+			"pmtimer: 0x%"PRIxGRUB_UINT64_T" bad_reads: %d\n",
-+			cur, bad_reads);
-+	  grub_dprintf ("pmtimer", "timer is broken; giving up.\n");
-+
-+	  if (bad_reads == 10)
-+	    return 0;
-+	}
-+#endif
-+
-+      if (cur < start)
-+	cur += 0x1000000;
-+
-       if (cur >= end)
- 	{
--	  end_tsc = grub_get_tsc ();
-+	  grub_dprintf ("pmtimer", "pmtimer delta is 0x%"PRIxGRUB_UINT64_T"\n",
-+			cur - start);
-+	  grub_dprintf ("pmtimer", "tsc delta is 0x%"PRIxGRUB_UINT64_T"\n",
-+			end_tsc - start_tsc);
- 	  return end_tsc - start_tsc;
- 	}
--      /* Check for broken PM timer.
--	 50000000 TSCs is between 5 ms (10GHz) and 200 ms (250 MHz)
--	 if after this time we still don't have 1 ms on pmtimer, then
--	 pmtimer is broken.
-+
-+      /*
-+       * Check for broken PM timer.  1ms at 10GHz should be 1E+7 TSCs; at
-+       * 250MHz it should be 2.5E6.  So if after 4E+7 TSCs on a 10GHz machine,
-+       * we should have seen pmtimer show 4ms of change (i.e. cur =~
-+       * start+14320); on a 250MHz machine that should be 16ms (start+57280).
-+       * If after this a time we still don't have 1ms on pmtimer, then pmtimer
-+       * is broken.
-+       *
-+       * Likewise, if our code is perfectly efficient and introduces no delays
-+       * whatsoever, on a 10GHz system we should see a TSC delta of 3580 in
-+       * ~3580 iterations.  On a 250MHz machine that should be ~900 iterations.
-+       *
-+       * With those factors in mind, there are two limits here.  There's a hard
-+       * limit here at 8x our desired pm timer delta, picked as an arbitrarily
-+       * large value that's still not a lot of time to humans, because if we
-+       * get that far this is either an implausibly fast machine or the pmtimer
-+       * is not running.  And there's another limit on 4x our 10GHz tsc delta
-+       * without seeing cur converge on our target value.
-        */
--      if ((num_iter & 0xffffff) == 0 && grub_get_tsc () - start_tsc > 5000000) {
--	return 0;
--      }
-+      if ((++num_iter > (grub_uint32_t)num_pm_ticks << 3UL) ||
-+	  end_tsc - start_tsc > 40000000)
-+	{
-+	  grub_dprintf ("pmtimer",
-+			"pmtimer delta is 0x%"PRIxGRUB_UINT64_T" (%u iterations)\n",
-+			cur - start, num_iter);
-+	  grub_dprintf ("pmtimer",
-+			"tsc delta is implausible: 0x%"PRIxGRUB_UINT64_T"\n",
-+			end_tsc - start_tsc);
-+	  return 0;
-+	}
-     }
- }
- 
-@@ -74,12 +135,20 @@ grub_tsc_calibrate_from_pmtimer (void)
- 
-   fadt = grub_acpi_find_fadt ();
-   if (!fadt)
--    return 0;
-+    {
-+      grub_dprintf ("pmtimer", "No FADT found; not using pmtimer.\n");
-+      return 0;
-+    }
-   pmtimer = fadt->pmtimer;
-   if (!pmtimer)
--    return 0;
-+    {
-+      grub_dprintf ("pmtimer", "FADT does not specify pmtimer; skipping.\n");
-+      return 0;
-+    }
- 
--  /* It's 3.579545 MHz clock. Wait 1 ms.  */
-+  /*
-+   * It's 3.579545 MHz clock. Wait 1 ms.
-+   */
-   tsc_diff = grub_pmtimer_wait_count_tsc (pmtimer, 3580);
-   if (tsc_diff == 0)
-     return 0;
diff --git a/0065-Work-around-some-minor-include-path-weirdnesses.patch b/0057-Work-around-some-minor-include-path-weirdnesses.patch
similarity index 97%
rename from 0065-Work-around-some-minor-include-path-weirdnesses.patch
rename to 0057-Work-around-some-minor-include-path-weirdnesses.patch
index c7ae8d01..460d7927 100644
--- a/0065-Work-around-some-minor-include-path-weirdnesses.patch
+++ b/0057-Work-around-some-minor-include-path-weirdnesses.patch
@@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 
 diff --git a/include/grub/arm/efi/console.h b/include/grub/arm/efi/console.h
 new file mode 100644
-index 0000000000..1592f6f76b
+index 00000000000..1592f6f76b5
 --- /dev/null
 +++ b/include/grub/arm/efi/console.h
 @@ -0,0 +1,24 @@
@@ -47,7 +47,7 @@ index 0000000000..1592f6f76b
 +#endif /* ! GRUB_ARM_EFI_CONSOLE_H */
 diff --git a/include/grub/arm64/efi/console.h b/include/grub/arm64/efi/console.h
 new file mode 100644
-index 0000000000..9568933938
+index 00000000000..95689339384
 --- /dev/null
 +++ b/include/grub/arm64/efi/console.h
 @@ -0,0 +1,24 @@
@@ -77,7 +77,7 @@ index 0000000000..9568933938
 +#endif /* ! GRUB_ARM64_EFI_CONSOLE_H */
 diff --git a/include/grub/i386/efi/console.h b/include/grub/i386/efi/console.h
 new file mode 100644
-index 0000000000..9231375cb0
+index 00000000000..9231375cb07
 --- /dev/null
 +++ b/include/grub/i386/efi/console.h
 @@ -0,0 +1,24 @@
@@ -107,7 +107,7 @@ index 0000000000..9231375cb0
 +#endif /* ! GRUB_I386_EFI_CONSOLE_H */
 diff --git a/include/grub/x86_64/efi/console.h b/include/grub/x86_64/efi/console.h
 new file mode 100644
-index 0000000000..dba9d8678d
+index 00000000000..dba9d8678d0
 --- /dev/null
 +++ b/include/grub/x86_64/efi/console.h
 @@ -0,0 +1,24 @@
diff --git a/0066-Make-it-possible-to-enabled-build-id-sha1.patch b/0058-Make-it-possible-to-enabled-build-id-sha1.patch
similarity index 93%
rename from 0066-Make-it-possible-to-enabled-build-id-sha1.patch
rename to 0058-Make-it-possible-to-enabled-build-id-sha1.patch
index 592635aa..201081d5 100644
--- a/0066-Make-it-possible-to-enabled-build-id-sha1.patch
+++ b/0058-Make-it-possible-to-enabled-build-id-sha1.patch
@@ -10,10 +10,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 27 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 4f1676967e..b809c00784 100644
+index 3602b4ab62b..fcfbcbb664d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1443,7 +1443,15 @@ grub_PROG_TARGET_CC
+@@ -1540,7 +1540,15 @@ grub_PROG_TARGET_CC
  if test "x$TARGET_APPLE_LINKER" != x1 ; then
  grub_PROG_OBJCOPY_ABSOLUTE
  fi
@@ -30,7 +30,7 @@ index 4f1676967e..b809c00784 100644
    if test "$platform" != emu && test "x$TARGET_APPLE_LINKER" != x1 ; then
      if test ! -z "$TARGET_IMG_LDSCRIPT"; then
 diff --git a/acinclude.m4 b/acinclude.m4
-index 6e14bb553c..21238fcfd0 100644
+index fa7840f09af..0231e64e337 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -136,6 +136,25 @@ if test "x$grub_cv_prog_ld_build_id_none" = xyes; then
diff --git a/0063-make-better-backtraces.patch b/0059-make-better-backtraces.patch
similarity index 93%
rename from 0063-make-better-backtraces.patch
rename to 0059-make-better-backtraces.patch
index ffdb8953..d7f64a66 100644
--- a/0063-make-better-backtraces.patch
+++ b/0059-make-better-backtraces.patch
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/kern/i386/backtrace.c         | 125 ++++++++++++++++++++++++++++++++
  grub-core/kern/i386/pc/init.c           |   4 +-
  grub-core/kern/ieee1275/init.c          |   1 -
- grub-core/kern/misc.c                   |  13 ++--
+ grub-core/kern/misc.c                   |  11 +--
  grub-core/kern/mm.c                     |   6 +-
  grub-core/lib/arm64/backtrace.c         |  62 ----------------
  grub-core/lib/i386/backtrace.c          |  78 --------------------
@@ -29,7 +29,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/kern/ia64/efi/startup.S       |   3 +-
  grub-core/kern/sparc64/ieee1275/crt0.S  |   3 +-
  grub-core/Makefile.am                   |   1 +
- 24 files changed, 414 insertions(+), 167 deletions(-)
+ 24 files changed, 413 insertions(+), 166 deletions(-)
  rename grub-core/{lib => commands}/backtrace.c (98%)
  create mode 100644 grub-core/kern/arm64/backtrace.c
  create mode 100644 grub-core/kern/backtrace.c
@@ -38,7 +38,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  delete mode 100644 grub-core/lib/i386/backtrace.c
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index a90879fa9b..48512bc631 100644
+index acbcc8c208c..1079add5bbe 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -51,6 +51,12 @@ library = {
@@ -55,10 +55,10 @@ index a90879fa9b..48512bc631 100644
  
  library = {
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 5354f9613d..4b7c45a7b0 100644
+index 63f053b3add..6645fbae34f 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -142,6 +142,12 @@ kernel = {
+@@ -153,6 +153,12 @@ kernel = {
    common = kern/rescue_reader.c;
    common = kern/term.c;
    common = kern/verifiers.c;
@@ -71,7 +71,7 @@ index 5354f9613d..4b7c45a7b0 100644
  
    noemu = kern/compiler-rt.c;
    noemu = kern/mm.c;
-@@ -188,9 +194,6 @@ kernel = {
+@@ -199,9 +205,6 @@ kernel = {
  
    softdiv = lib/division.c;
  
@@ -81,7 +81,7 @@ index 5354f9613d..4b7c45a7b0 100644
    i386 = kern/i386/dl.c;
    i386_xen = kern/i386/dl.c;
    i386_xen_pvh = kern/i386/dl.c;
-@@ -2398,15 +2401,12 @@ module = {
+@@ -2455,15 +2458,12 @@ module = {
  
  module = {
    name = backtrace;
@@ -103,7 +103,7 @@ diff --git a/grub-core/lib/backtrace.c b/grub-core/commands/backtrace.c
 similarity index 98%
 rename from grub-core/lib/backtrace.c
 rename to grub-core/commands/backtrace.c
-index c0ad6ab8be..8b5ec3913b 100644
+index c0ad6ab8be1..8b5ec3913b5 100644
 --- a/grub-core/lib/backtrace.c
 +++ b/grub-core/commands/backtrace.c
 @@ -54,7 +54,7 @@ grub_cmd_backtrace (grub_command_t cmd __attribute__ ((unused)),
@@ -116,7 +116,7 @@ index c0ad6ab8be..8b5ec3913b 100644
  }
  
 diff --git a/grub-core/gdb/cstub.c b/grub-core/gdb/cstub.c
-index b64acd70fe..99281472d3 100644
+index b64acd70fee..99281472d36 100644
 --- a/grub-core/gdb/cstub.c
 +++ b/grub-core/gdb/cstub.c
 @@ -215,7 +215,6 @@ grub_gdb_trap (int trap_no)
@@ -129,7 +129,7 @@ index b64acd70fe..99281472d3 100644
  
 diff --git a/grub-core/kern/arm64/backtrace.c b/grub-core/kern/arm64/backtrace.c
 new file mode 100644
-index 0000000000..019c6fdfef
+index 00000000000..019c6fdfef2
 --- /dev/null
 +++ b/grub-core/kern/arm64/backtrace.c
 @@ -0,0 +1,94 @@
@@ -229,7 +229,7 @@ index 0000000000..019c6fdfef
 +}
 diff --git a/grub-core/kern/backtrace.c b/grub-core/kern/backtrace.c
 new file mode 100644
-index 0000000000..4a82e865cc
+index 00000000000..4a82e865cc6
 --- /dev/null
 +++ b/grub-core/kern/backtrace.c
 @@ -0,0 +1,97 @@
@@ -331,10 +331,10 @@ index 0000000000..4a82e865cc
 +    grub_backtrace (skip + 1);
 +}
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 7afb9e6f72..88d2077709 100644
+index 0bf40caa61a..931f6e41442 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
-@@ -124,6 +124,50 @@ grub_dl_resolve_symbol (const char *name)
+@@ -115,6 +115,50 @@ grub_dl_resolve_symbol (const char *name)
    return 0;
  }
  
@@ -385,7 +385,7 @@ index 7afb9e6f72..88d2077709 100644
  /* Register a symbol with the name NAME and the address ADDR.  */
  grub_err_t
  grub_dl_register_symbol (const char *name, void *addr, int isfunc,
-@@ -336,6 +380,7 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
+@@ -330,6 +374,7 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
    const char *str;
    Elf_Word size, entsize;
  
@@ -395,7 +395,7 @@ index 7afb9e6f72..88d2077709 100644
         i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
 diff --git a/grub-core/kern/i386/backtrace.c b/grub-core/kern/i386/backtrace.c
 new file mode 100644
-index 0000000000..2413f9a57d
+index 00000000000..2413f9a57db
 --- /dev/null
 +++ b/grub-core/kern/i386/backtrace.c
 @@ -0,0 +1,125 @@
@@ -525,7 +525,7 @@ index 0000000000..2413f9a57d
 +#endif
 +}
 diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c
-index 27bc68b8a5..b51d0abfa6 100644
+index 326d491c586..fe7ad14d45c 100644
 --- a/grub-core/kern/i386/pc/init.c
 +++ b/grub-core/kern/i386/pc/init.c
 @@ -153,7 +153,7 @@ compact_mem_regions (void)
@@ -537,7 +537,7 @@ index 27bc68b8a5..b51d0abfa6 100644
  
  /* Helper for grub_machine_init.  */
  static int
-@@ -217,7 +217,7 @@ grub_machine_init (void)
+@@ -226,7 +226,7 @@ grub_machine_init (void)
    /* This has to happen before any BIOS calls. */
    grub_via_workaround_init ();
  
@@ -547,27 +547,23 @@ index 27bc68b8a5..b51d0abfa6 100644
    /* Initialize the console as early as possible.  */
    grub_console_init ();
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 0cd2a62723..937c1bc44c 100644
+index 51c1e1c9d9f..c4d6962197b 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
-@@ -63,7 +63,6 @@
- #define HEAP_MAX_ADDR		(unsigned long) (32 * 1024 * 1024)
- #endif
+@@ -70,7 +70,6 @@
+  */
+ #define RUNTIME_MIN_SPACE (128UL * 1024 * 1024)
  
 -extern char _start[];
  extern char _end[];
  
  #ifdef __sparc__
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index c60601b699..a432a6be54 100644
+index b1d399d37d7..779586658cb 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -1197,15 +1197,15 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected)
- 
- 
- /* Abort GRUB. This function does not return.  */
--static void __attribute__ ((noreturn))
-+static inline void __attribute__ ((noreturn))
+@@ -1302,12 +1302,12 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected)
+ void __attribute__ ((noreturn))
  grub_abort (void)
  {
 -#ifndef GRUB_UTIL
@@ -584,7 +580,7 @@ index c60601b699..a432a6be54 100644
  
  #ifndef GRUB_UTIL
    if (grub_term_inputs)
-@@ -1232,6 +1232,7 @@ grub_fatal (const char *fmt, ...)
+@@ -1334,6 +1334,7 @@ grub_fatal (const char *fmt, ...)
  {
    va_list ap;
  
@@ -593,10 +589,10 @@ index c60601b699..a432a6be54 100644
    grub_vprintf (_(fmt), ap);
    va_end (ap);
 diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
-index c070afc621..d8c8377578 100644
+index 027a25cd1f0..1aeeba9e27e 100644
 --- a/grub-core/kern/mm.c
 +++ b/grub-core/kern/mm.c
-@@ -97,13 +97,13 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r)
+@@ -144,13 +144,13 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r)
        break;
  
    if (! *r)
@@ -615,7 +611,7 @@ index c070afc621..d8c8377578 100644
  
 diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
 deleted file mode 100644
-index 1079b5380e..0000000000
+index 1079b5380e1..00000000000
 --- a/grub-core/lib/arm64/backtrace.c
 +++ /dev/null
 @@ -1,62 +0,0 @@
@@ -683,7 +679,7 @@ index 1079b5380e..0000000000
 -
 diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
 deleted file mode 100644
-index c67273db3a..0000000000
+index c67273db3ae..00000000000
 --- a/grub-core/lib/i386/backtrace.c
 +++ /dev/null
 @@ -1,78 +0,0 @@
@@ -766,7 +762,7 @@ index c67273db3a..0000000000
 -}
 -
 diff --git a/include/grub/backtrace.h b/include/grub/backtrace.h
-index 395519762f..275cf85e2d 100644
+index 395519762f0..275cf85e2d3 100644
 --- a/include/grub/backtrace.h
 +++ b/include/grub/backtrace.h
 @@ -19,8 +19,14 @@
@@ -787,10 +783,10 @@ index 395519762f..275cf85e2d 100644
  
  #endif
 diff --git a/include/grub/dl.h b/include/grub/dl.h
-index 91933b85f2..2f76e6b043 100644
+index f2bf50eb98d..8a3d188d1d1 100644
 --- a/include/grub/dl.h
 +++ b/include/grub/dl.h
-@@ -259,6 +259,8 @@ grub_dl_is_persistent (grub_dl_t mod)
+@@ -258,6 +258,8 @@ grub_dl_is_persistent (grub_dl_t mod)
  
  #endif
  
@@ -800,7 +796,7 @@ index 91933b85f2..2f76e6b043 100644
  				    int isfunc, grub_dl_t mod);
  
 diff --git a/include/grub/kernel.h b/include/grub/kernel.h
-index abbca5ea33..300a9766cd 100644
+index abbca5ea335..300a9766cda 100644
 --- a/include/grub/kernel.h
 +++ b/include/grub/kernel.h
 @@ -111,6 +111,9 @@ grub_addr_t grub_modules_get_end (void);
@@ -814,7 +810,7 @@ index abbca5ea33..300a9766cd 100644
  void grub_main (void) __attribute__ ((noreturn));
  
 diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S
-index 9f8265315a..f3bc41f9d0 100644
+index 9f8265315a9..f3bc41f9d0f 100644
 --- a/grub-core/kern/arm/efi/startup.S
 +++ b/grub-core/kern/arm/efi/startup.S
 @@ -23,6 +23,8 @@
@@ -827,7 +823,7 @@ index 9f8265315a..f3bc41f9d0 100644
  	/*
  	 *  EFI_SYSTEM_TABLE and EFI_HANDLE are passed in r1/r0.
 diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S
-index 3946fe8e18..5679a1d00a 100644
+index 3946fe8e183..5679a1d00ad 100644
 --- a/grub-core/kern/arm/startup.S
 +++ b/grub-core/kern/arm/startup.S
 @@ -48,6 +48,8 @@
@@ -840,7 +836,7 @@ index 3946fe8e18..5679a1d00a 100644
  	b	codestart
  	
 diff --git a/grub-core/kern/arm64/efi/startup.S b/grub-core/kern/arm64/efi/startup.S
-index 666a7ee3c9..41676bdb2b 100644
+index 666a7ee3c92..41676bdb2b8 100644
 --- a/grub-core/kern/arm64/efi/startup.S
 +++ b/grub-core/kern/arm64/efi/startup.S
 @@ -19,7 +19,9 @@
@@ -854,7 +850,7 @@ index 666a7ee3c9..41676bdb2b 100644
  	/*
  	 *  EFI_SYSTEM_TABLE and EFI_HANDLE are passed in x1/x0.
 diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S
-index 0d89858d9b..939f182fc7 100644
+index 0d89858d9b3..939f182fc74 100644
 --- a/grub-core/kern/i386/qemu/startup.S
 +++ b/grub-core/kern/i386/qemu/startup.S
 @@ -24,7 +24,8 @@
@@ -868,7 +864,7 @@ index 0d89858d9b..939f182fc7 100644
  	jmp	codestart
  
 diff --git a/grub-core/kern/ia64/efi/startup.S b/grub-core/kern/ia64/efi/startup.S
-index d75c6d7cc7..8f2a593e52 100644
+index d75c6d7cc74..8f2a593e529 100644
 --- a/grub-core/kern/ia64/efi/startup.S
 +++ b/grub-core/kern/ia64/efi/startup.S
 @@ -24,8 +24,9 @@
@@ -883,7 +879,7 @@ index d75c6d7cc7..8f2a593e52 100644
  	alloc loc0=ar.pfs,2,4,0,0
  	mov loc1=rp
 diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
-index 03b916f053..701bf63abc 100644
+index 03b916f0534..701bf63abcf 100644
 --- a/grub-core/kern/sparc64/ieee1275/crt0.S
 +++ b/grub-core/kern/sparc64/ieee1275/crt0.S
 @@ -22,7 +22,8 @@
@@ -897,7 +893,7 @@ index 03b916f053..701bf63abc 100644
  	ba	codestart
  	 mov  %o4, %o0
 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 80e7a83edf..f512573c0d 100644
+index f18550c1c98..b7192a3da82 100644
 --- a/grub-core/Makefile.am
 +++ b/grub-core/Makefile.am
 @@ -66,6 +66,7 @@ CLEANFILES += grub_script.yy.c grub_script.yy.h
diff --git a/0060-Fixup-for-newer-compiler.patch b/0060-Fixup-for-newer-compiler.patch
new file mode 100644
index 00000000..b0c1966d
--- /dev/null
+++ b/0060-Fixup-for-newer-compiler.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 10 May 2018 13:40:19 -0400
+Subject: [PATCH] Fixup for newer compiler
+
+---
+ grub-core/fs/btrfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
+index 87e4dd1a07a..ad35e75750b 100644
+--- a/grub-core/fs/btrfs.c
++++ b/grub-core/fs/btrfs.c
+@@ -218,7 +218,7 @@ struct grub_btrfs_inode
+   grub_uint64_t size;
+   grub_uint8_t dummy2[0x70];
+   struct grub_btrfs_time mtime;
+-} GRUB_PACKED;
++} GRUB_PACKED  __attribute__ ((aligned(8)));
+ 
+ struct grub_btrfs_extent_data
+ {
diff --git a/0061-Add-linux-and-initrd-commands-for-grub-emu.patch b/0061-Add-linux-and-initrd-commands-for-grub-emu.patch
deleted file mode 100644
index 419fde38..00000000
--- a/0061-Add-linux-and-initrd-commands-for-grub-emu.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Raymund Will <rw@suse.com>
-Date: Tue, 6 Feb 2018 09:09:00 +0100
-Subject: [PATCH] Add linux and initrd commands for grub-emu
-
-When using grub-emu, the linux and initrd commands are used as arguments
-to the kexec command line tool, to allow booting the selected menu entry.
-
-Signed-off-by: Raymund Will <rw@suse.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- grub-core/Makefile.core.def  |   1 -
- grub-core/kern/emu/main.c    |   4 +
- grub-core/kern/emu/misc.c    |  18 ++++-
- grub-core/loader/emu/linux.c | 172 +++++++++++++++++++++++++++++++++++++++++++
- include/grub/emu/exec.h      |   4 +-
- include/grub/emu/hostfile.h  |   3 +-
- include/grub/emu/misc.h      |   3 +
- grub-core/Makefile.am        |   1 +
- 8 files changed, 202 insertions(+), 4 deletions(-)
- create mode 100644 grub-core/loader/emu/linux.c
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 058c88ac3a..5354f9613d 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -1826,7 +1826,6 @@ module = {
- 
-   common = loader/linux.c;
-   common = lib/cmdline.c;
--  enable = noemu;
- 
-   efi = loader/efi/linux.c;
- };
-diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 55ea5a11cc..846fe9715e 100644
---- a/grub-core/kern/emu/main.c
-+++ b/grub-core/kern/emu/main.c
-@@ -107,6 +107,7 @@ static struct argp_option options[] = {
-    N_("use GRUB files in the directory DIR [default=%s]"), 0},
-   {"verbose",     'v', 0,      0, N_("print verbose messages."), 0},
-   {"hold",     'H', N_("SECS"),      OPTION_ARG_OPTIONAL, N_("wait until a debugger will attach"), 0},
-+  {"kexec",       'X', 0,      0, N_("try the untryable."), 0},
-   { 0, 0, 0, 0, 0, 0 }
- };
- 
-@@ -164,6 +165,9 @@ argp_parser (int key, char *arg, struct argp_state *state)
-     case 'v':
-       verbosity++;
-       break;
-+    case 'X':
-+      grub_util_set_kexecute();
-+      break;
- 
-     case ARGP_KEY_ARG:
-       {
-diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 0ff13bcaf8..eeea092752 100644
---- a/grub-core/kern/emu/misc.c
-+++ b/grub-core/kern/emu/misc.c
-@@ -39,6 +39,7 @@
- #include <grub/emu/misc.h>
- 
- int verbosity;
-+int kexecute;
- 
- void
- grub_util_warn (const char *fmt, ...)
-@@ -82,7 +83,7 @@ grub_util_error (const char *fmt, ...)
-   vfprintf (stderr, fmt, ap);
-   va_end (ap);
-   fprintf (stderr, ".\n");
--  exit (1);
-+  grub_exit (1);
- }
- 
- void *
-@@ -154,6 +155,9 @@ void
- __attribute__ ((noreturn))
- grub_exit (int rc)
- {
-+#if defined (GRUB_KERNEL)
-+  grub_reboot();
-+#endif
-   exit (rc < 0 ? 1 : rc);
- }
- #endif
-@@ -215,3 +219,15 @@ grub_util_load_image (const char *path, char *buf)
- 
-   fclose (fp);
- }
-+
-+void
-+grub_util_set_kexecute(void)
-+{
-+  kexecute++;
-+}
-+
-+int
-+grub_util_get_kexecute(void)
-+{
-+  return kexecute;
-+}
-diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c
-new file mode 100644
-index 0000000000..fda9e00d24
---- /dev/null
-+++ b/grub-core/loader/emu/linux.c
-@@ -0,0 +1,172 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
-+ *
-+ *  GRUB is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  GRUB is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <grub/loader.h>
-+#include <grub/dl.h>
-+#include <grub/command.h>
-+#include <grub/time.h>
-+
-+#include <grub/emu/exec.h>
-+#include <grub/emu/hostfile.h>
-+#include <grub/emu/misc.h>
-+
-+GRUB_MOD_LICENSE ("GPLv3+");
-+
-+static grub_dl_t my_mod;
-+
-+static char *kernel_path;
-+static char *initrd_path;
-+static char *boot_cmdline;
-+
-+static grub_err_t
-+grub_linux_boot (void)
-+{
-+  grub_err_t rc = GRUB_ERR_NONE;
-+  char *initrd_param;
-+  const char *kexec[] = { "kexec", "-l", kernel_path, boot_cmdline, NULL, NULL };
-+  const char *systemctl[] = { "systemctl", "kexec", NULL };
-+  int kexecute = grub_util_get_kexecute();
-+
-+  if (initrd_path) {
-+    initrd_param = grub_xasprintf("--initrd=%s", initrd_path);
-+    kexec[3] = initrd_param;
-+    kexec[4] = boot_cmdline;
-+  } else {
-+    initrd_param = grub_xasprintf("%s", "");
-+  }
-+
-+  grub_printf("%serforming 'kexec -l %s %s %s'\n",
-+	(kexecute) ? "P" : "Not p",
-+	kernel_path, initrd_param, boot_cmdline);
-+
-+  if (kexecute)
-+    rc = grub_util_exec(kexec);
-+
-+  grub_free(initrd_param);
-+
-+  if (rc != GRUB_ERR_NONE) {
-+    grub_error (rc, N_("Error trying to perform kexec load operation."));
-+    grub_sleep (3);
-+    return rc;
-+  }
-+  if (kexecute < 1)
-+    grub_fatal (N_("Use '"PACKAGE"-emu --kexec' to force a system restart."));
-+
-+  grub_printf("Performing 'systemctl kexec' (%s) ",
-+		(kexecute==1) ? "do-or-die" : "just-in-case");
-+  rc = grub_util_exec (systemctl);
-+
-+  if (kexecute == 1)
-+    grub_fatal (N_("Error trying to perform 'systemctl kexec'"));
-+
-+  /* need to check read-only root before resetting hard!? */
-+  grub_printf("Performing 'kexec -e'");
-+  kexec[1] = "-e";
-+  kexec[2] = NULL;
-+  rc = grub_util_exec(kexec);
-+  if ( rc != GRUB_ERR_NONE )
-+    grub_fatal (N_("Error trying to directly perform 'kexec -e'."));
-+
-+  return rc;
-+}
-+
-+static grub_err_t
-+grub_linux_unload (void)
-+{
-+  grub_dl_unref (my_mod);
-+  if ( boot_cmdline != NULL )
-+    grub_free (boot_cmdline);
-+  boot_cmdline = NULL;
-+  return GRUB_ERR_NONE;
-+}
-+
-+static grub_err_t
-+grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[])
-+{
-+  int i;
-+  char *tempstr;
-+
-+  grub_dl_ref (my_mod);
-+
-+  if (argc == 0)
-+    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-+
-+  if ( !grub_util_is_regular(argv[0]) )
-+    return grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("Cannot find kernel file %s"), argv[0]);
-+
-+  if ( kernel_path != NULL )
-+    grub_free(kernel_path);
-+
-+  kernel_path = grub_xasprintf("%s", argv[0]);
-+
-+  if ( boot_cmdline != NULL ) {
-+    grub_free(boot_cmdline);
-+    boot_cmdline = NULL;
-+  }
-+
-+  if ( argc > 1 )
-+  {
-+    boot_cmdline = grub_xasprintf("--command-line=%s", argv[1]);
-+    for ( i = 2; i < argc; i++ ) {
-+      tempstr = grub_xasprintf("%s %s", boot_cmdline, argv[i]);
-+      grub_free(boot_cmdline);
-+      boot_cmdline = tempstr;
-+    }
-+  }
-+
-+  grub_loader_set (grub_linux_boot, grub_linux_unload, 0);
-+
-+  return GRUB_ERR_NONE;
-+}
-+
-+static grub_err_t
-+grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[])
-+{
-+  if (argc == 0)
-+    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-+
-+  if ( !grub_util_is_regular(argv[0]) )
-+    return grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("Cannot find initrd file %s"), argv[0]);
-+
-+  if ( initrd_path != NULL )
-+    grub_free(initrd_path);
-+
-+  initrd_path = grub_xasprintf("%s", argv[0]);
-+
-+  grub_dl_unref (my_mod);
-+
-+  return GRUB_ERR_NONE;
-+}
-+
-+static grub_command_t cmd_linux, cmd_initrd;
-+
-+GRUB_MOD_INIT(linux)
-+{
-+  cmd_linux = grub_register_command ("linux", grub_cmd_linux, 0, N_("Load Linux."));
-+  cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd, 0, N_("Load initrd."));
-+  my_mod = mod;
-+  kernel_path = NULL;
-+  initrd_path = NULL;
-+  boot_cmdline = NULL;
-+}
-+
-+GRUB_MOD_FINI(linux)
-+{
-+  grub_unregister_command (cmd_linux);
-+  grub_unregister_command (cmd_initrd);
-+}
-diff --git a/include/grub/emu/exec.h b/include/grub/emu/exec.h
-index d1073ef86a..1b61b4a2e5 100644
---- a/include/grub/emu/exec.h
-+++ b/include/grub/emu/exec.h
-@@ -23,6 +23,8 @@
- #include <stdarg.h>
- 
- #include <sys/types.h>
-+#include <grub/symbol.h>
-+
- pid_t
- grub_util_exec_pipe (const char *const *argv, int *fd);
- pid_t
-@@ -32,7 +34,7 @@ int
- grub_util_exec_redirect_all (const char *const *argv, const char *stdin_file,
- 			     const char *stdout_file, const char *stderr_file);
- int
--grub_util_exec (const char *const *argv);
-+EXPORT_FUNC(grub_util_exec) (const char *const *argv);
- int
- grub_util_exec_redirect (const char *const *argv, const char *stdin_file,
- 			 const char *stdout_file);
-diff --git a/include/grub/emu/hostfile.h b/include/grub/emu/hostfile.h
-index cfb1e2b566..a61568e36e 100644
---- a/include/grub/emu/hostfile.h
-+++ b/include/grub/emu/hostfile.h
-@@ -22,6 +22,7 @@
- #include <grub/disk.h>
- #include <grub/partition.h>
- #include <sys/types.h>
-+#include <grub/symbol.h>
- #include <grub/osdep/hostfile.h>
- 
- int
-@@ -29,7 +30,7 @@ grub_util_is_directory (const char *path);
- int
- grub_util_is_special_file (const char *path);
- int
--grub_util_is_regular (const char *path);
-+EXPORT_FUNC(grub_util_is_regular) (const char *path);
- 
- char *
- grub_util_path_concat (size_t n, ...);
-diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
-index ff9c48a649..01056954b9 100644
---- a/include/grub/emu/misc.h
-+++ b/include/grub/emu/misc.h
-@@ -57,6 +57,9 @@ void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (
- void EXPORT_FUNC(grub_util_info) (const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 1, 2)));
- void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 1, 2), noreturn));
- 
-+void EXPORT_FUNC(grub_util_set_kexecute) (void);
-+int EXPORT_FUNC(grub_util_get_kexecute) (void) WARN_UNUSED_RESULT;
-+
- grub_uint64_t EXPORT_FUNC (grub_util_get_cpu_time_ms) (void);
- 
- #ifdef HAVE_DEVICE_MAPPER
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index ee88e44e97..80e7a83edf 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -307,6 +307,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/hostdisk.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/hostfile.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/exec.h
- if COND_GRUB_EMU_SDL
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h
- endif
diff --git a/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/0061-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
similarity index 97%
rename from 0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
rename to 0061-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
index 9b78c00c..0e925eef 100644
--- a/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
+++ b/0061-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
@@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/include/grub/kernel.h b/include/grub/kernel.h
-index 300a9766cd..55849777ea 100644
+index 300a9766cda..55849777eaa 100644
 --- a/include/grub/kernel.h
 +++ b/include/grub/kernel.h
 @@ -111,8 +111,10 @@ grub_addr_t grub_modules_get_end (void);
diff --git a/0071-Fixup-for-newer-compiler.patch b/0062-Fixup-for-newer-compiler.patch
similarity index 79%
rename from 0071-Fixup-for-newer-compiler.patch
rename to 0062-Fixup-for-newer-compiler.patch
index 167dca18..0d495c14 100644
--- a/0071-Fixup-for-newer-compiler.patch
+++ b/0062-Fixup-for-newer-compiler.patch
@@ -8,15 +8,15 @@ Subject: [PATCH] Fixup for newer compiler
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 191b1a70c6..5f0ef96985 100644
+index ece9ed8a1bf..6262f21a772 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
-@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
+@@ -41,7 +41,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
  LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC)
  CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
  CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
 -STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
 +STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx -R .note.gnu.property -R .gnu.build.attributes
- 
- CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
- LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
+ if !COND_emu
+ if COND_HAVE_ASM_USCORE
+   LDFLAGS_KERNEL += -Wl,--defsym=_malloc=_grub_malloc -Wl,--defsym=_free=_grub_free
diff --git a/0072-Add-support-for-non-Ethernet-network-cards.patch b/0063-Add-support-for-non-Ethernet-network-cards.patch
similarity index 90%
rename from 0072-Add-support-for-non-Ethernet-network-cards.patch
rename to 0063-Add-support-for-non-Ethernet-network-cards.patch
index fb446288..95ea8fc9 100644
--- a/0072-Add-support-for-non-Ethernet-network-cards.patch
+++ b/0063-Add-support-for-non-Ethernet-network-cards.patch
@@ -23,22 +23,22 @@ Signed-off-by: Andrzej Kacprowski <andrzej.kacprowski@intel.com>
 [msalter: Fix max string calculation in grub_net_hwaddr_to_str]
 Signed-off-by: Mark Salter <msalter@redhat.com>
 ---
- grub-core/net/arp.c                    | 155 ++++++++++++++++++++++-----------
+ grub-core/net/arp.c                    | 156 ++++++++++++++++++++++-----------
  grub-core/net/bootp.c                  |  15 ++--
  grub-core/net/drivers/efi/efinet.c     |   8 +-
  grub-core/net/drivers/emu/emunet.c     |   1 +
  grub-core/net/drivers/i386/pc/pxe.c    |  13 +--
  grub-core/net/drivers/ieee1275/ofnet.c |   2 +
  grub-core/net/drivers/uboot/ubootnet.c |   1 +
- grub-core/net/ethernet.c               |  88 +++++++++----------
+ grub-core/net/ethernet.c               |  89 +++++++++----------
  grub-core/net/icmp6.c                  |  15 ++--
  grub-core/net/ip.c                     |   4 +-
  grub-core/net/net.c                    |  50 ++++++-----
  include/grub/net.h                     |  19 ++--
- 12 files changed, 219 insertions(+), 152 deletions(-)
+ 12 files changed, 220 insertions(+), 153 deletions(-)
 
 diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
-index 54306e3b16..67b409a8ac 100644
+index 1d367436cfc..8bf0a06e193 100644
 --- a/grub-core/net/arp.c
 +++ b/grub-core/net/arp.c
 @@ -31,22 +31,12 @@ enum
@@ -137,7 +137,7 @@ index 54306e3b16..67b409a8ac 100644
  
    nbd = nb.data;
    send_ethernet_packet (inf, &nb, target_mac_addr, GRUB_NET_ETHERTYPE_ARP);
-@@ -114,28 +124,53 @@ grub_err_t
+@@ -114,30 +124,56 @@ grub_err_t
  grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
                        grub_uint16_t *vlantag)
  {
@@ -177,33 +177,36 @@ index 54306e3b16..67b409a8ac 100644
 +
 +  /* The source protocol address. */
    sender_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
-+  grub_memcpy(&sender_addr.ipv4, tmp_ptr, pln);
-+  tmp_ptr += pln;
-+
-+  grub_net_link_layer_add_address (card, &sender_addr, &sender_mac_addr, 1);
-+
-+  /* The target hardware address. */
-+  tmp_ptr += hln;
-+
-+  /* The target protocol address. */
-   target_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
+-  target_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
 -  sender_addr.ipv4 = arp_packet->sender_ip;
 -  target_addr.ipv4 = arp_packet->recv_ip;
+   sender_addr.option = 0;
+   target_addr.option = 0;
 -  if (arp_packet->sender_ip == pending_req)
-+  grub_memcpy(&target_addr.ipv4, tmp_ptr, pln);
-+
-+  if (sender_addr.ipv4 == pending_req)
-     have_pending = 1;
+-    have_pending = 1;
  
 -  sender_mac_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
 -  grub_memcpy (sender_mac_addr.mac, arp_packet->sender_mac,
 -	       sizeof (sender_mac_addr.mac));
--  grub_net_link_layer_add_address (card, &sender_addr, &sender_mac_addr, 1);
--
++  grub_memcpy(&target_addr.ipv4, tmp_ptr, pln);
++  tmp_ptr += pln;
++
+   grub_net_link_layer_add_address (card, &sender_addr, &sender_mac_addr, 1);
+ 
++  /* The target hardware address. */
++  tmp_ptr += hln;
++
++  /* The target protocol address. */
++  target_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
++  grub_memcpy(&target_addr.ipv4, tmp_ptr, pln);
++
++  if (sender_addr.ipv4 == pending_req)
++    have_pending = 1;
++
    FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
    {
      /* Verify vlantag id */
-@@ -148,11 +183,11 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
+@@ -150,11 +186,11 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
  
      /* Am I the protocol address target? */
      if (grub_net_addr_cmp (&inf->address, &target_addr) == 0
@@ -217,7 +220,7 @@ index 54306e3b16..67b409a8ac 100644
  	grub_uint8_t arp_data[128];
  	grub_err_t err;
  
-@@ -161,25 +196,39 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
+@@ -163,25 +199,39 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
  	grub_netbuff_clear (&nb_reply);
  	grub_netbuff_reserve (&nb_reply, 128);
  
@@ -271,10 +274,10 @@ index 54306e3b16..67b409a8ac 100644
  	/* Change operation to REPLY and send packet */
  	send_ethernet_packet (inf, &nb_reply, target, GRUB_NET_ETHERTYPE_ARP);
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index e28fb6a09f..08b6b2b5d6 100644
+index e0aec25233d..76e4c11a46f 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
-@@ -233,7 +233,6 @@ grub_net_configure_by_dhcp_ack (const char *name,
+@@ -325,7 +325,6 @@ grub_net_configure_by_dhcp_ack (const char *name,
  				int is_def, char **device, char **path)
  {
    grub_net_network_level_address_t addr;
@@ -282,7 +285,7 @@ index e28fb6a09f..08b6b2b5d6 100644
    struct grub_net_network_level_interface *inter;
    int mask = -1;
    char server_ip[sizeof ("xxx.xxx.xxx.xxx")];
-@@ -250,12 +249,8 @@ grub_net_configure_by_dhcp_ack (const char *name,
+@@ -343,12 +342,8 @@ grub_net_configure_by_dhcp_ack (const char *name,
    if (path)
      *path = 0;
  
@@ -297,7 +300,7 @@ index e28fb6a09f..08b6b2b5d6 100644
    if (!inter)
      return 0;
  
-@@ -567,7 +562,9 @@ send_dhcp_packet (struct grub_net_network_level_interface *iface)
+@@ -660,7 +655,9 @@ send_dhcp_packet (struct grub_net_network_level_interface *iface)
    grub_memset (pack, 0, sizeof (*pack));
    pack->opcode = 1;
    pack->hw_type = 1;
@@ -308,20 +311,20 @@ index e28fb6a09f..08b6b2b5d6 100644
    err = grub_get_datetime (&date);
    if (err || !grub_datetime2unixtime (&date, &t))
      {
-@@ -580,7 +577,7 @@ send_dhcp_packet (struct grub_net_network_level_interface *iface)
+@@ -673,7 +670,7 @@ send_dhcp_packet (struct grub_net_network_level_interface *iface)
    else
      pack->ident = iface->xid;
  
 -  grub_memcpy (&pack->mac_addr, &iface->hwaddress.mac, 6);
 +  grub_memcpy (&pack->mac_addr, &iface->hwaddress.mac, pack->hw_len);
  
-   grub_netbuff_push (nb, sizeof (*udph));
- 
+   err = grub_netbuff_push (nb, sizeof (*udph));
+   if (err)
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 173fb63153..a673bea807 100644
+index 3e2432fb61c..7deb0a32efd 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -279,6 +279,9 @@ grub_efinet_findcards (void)
+@@ -288,6 +288,9 @@ grub_efinet_findcards (void)
  	/* This should not happen... Why?  */
  	continue;
  
@@ -329,12 +332,12 @@ index 173fb63153..a673bea807 100644
 +	continue;
 +
        if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
- 	  && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
+ 	  && net->start (net) != GRUB_EFI_SUCCESS)
  	continue;
-@@ -315,10 +318,11 @@ grub_efinet_findcards (void)
-       card->name = grub_xasprintf ("efinet%d", i++);
-       card->driver = &efidriver;
-       card->flags = 0;
+@@ -332,10 +335,11 @@ grub_efinet_findcards (void)
+        * such as LoadFile2 for initrd loading.
+        */
+       card->flags = GRUB_NET_CARD_NO_CLOSE_ON_FINI_HW;
 -      card->default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
 +      card->default_address.type = net->mode->if_type;
 +      card->default_address.len = net->mode->hwaddr_size;
@@ -346,7 +349,7 @@ index 173fb63153..a673bea807 100644
        card->efi_handle = *handle;
  
 diff --git a/grub-core/net/drivers/emu/emunet.c b/grub-core/net/drivers/emu/emunet.c
-index b194920861..5b6c5e16a6 100644
+index 5f311d40f49..7461d13bbc2 100644
 --- a/grub-core/net/drivers/emu/emunet.c
 +++ b/grub-core/net/drivers/emu/emunet.c
 @@ -46,6 +46,7 @@ static struct grub_net_card emucard =
@@ -358,7 +361,7 @@ index b194920861..5b6c5e16a6 100644
  		       },
      .flags = 0
 diff --git a/grub-core/net/drivers/i386/pc/pxe.c b/grub-core/net/drivers/i386/pc/pxe.c
-index 3f4152d036..9f8fb4b6d2 100644
+index db17186ee7d..816d1d0eeda 100644
 --- a/grub-core/net/drivers/i386/pc/pxe.c
 +++ b/grub-core/net/drivers/i386/pc/pxe.c
 @@ -386,20 +386,21 @@ GRUB_MOD_INIT(pxe)
@@ -390,7 +393,7 @@ index 3f4152d036..9f8fb4b6d2 100644
  
    grub_pxe_card.default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
 diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
-index 3860b6f78d..bcb3f9ea02 100644
+index 78f03df8e21..c56461ff1ae 100644
 --- a/grub-core/net/drivers/ieee1275/ofnet.c
 +++ b/grub-core/net/drivers/ieee1275/ofnet.c
 @@ -160,6 +160,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
@@ -401,7 +404,7 @@ index 3860b6f78d..bcb3f9ea02 100644
  
    args = bootpath + grub_strlen (devpath) + 1;
    do
-@@ -503,6 +504,7 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
+@@ -491,6 +492,7 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
      grub_memcpy (&lla.mac, pprop, 6);
  
    lla.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
@@ -410,7 +413,7 @@ index 3860b6f78d..bcb3f9ea02 100644
  
    card->txbufsize = ALIGN_UP (card->mtu, 64) + 256;
 diff --git a/grub-core/net/drivers/uboot/ubootnet.c b/grub-core/net/drivers/uboot/ubootnet.c
-index 056052e40d..22ebcbf211 100644
+index b9d5a0cd494..9f3354a1b74 100644
 --- a/grub-core/net/drivers/uboot/ubootnet.c
 +++ b/grub-core/net/drivers/uboot/ubootnet.c
 @@ -131,6 +131,7 @@ GRUB_MOD_INIT (ubootnet)
@@ -422,7 +425,7 @@ index 056052e40d..22ebcbf211 100644
        card->txbufsize = ALIGN_UP (card->mtu, 64) + 256;
        card->txbuf = grub_zalloc (card->txbufsize);
 diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c
-index 4d7ceed6f9..9aae83a5eb 100644
+index 707bbb12cb2..1441a1bacff 100644
 --- a/grub-core/net/ethernet.c
 +++ b/grub-core/net/ethernet.c
 @@ -29,13 +29,6 @@
@@ -447,7 +450,7 @@ index 4d7ceed6f9..9aae83a5eb 100644
 +  grub_uint8_t *eth;
    grub_err_t err;
 -  grub_uint8_t etherhdr_size;
--  grub_uint16_t vlantag_id = VLANTAG_IDENTIFIER;
+-  grub_uint16_t vlantag_id = grub_cpu_to_be16_compile_time (VLANTAG_IDENTIFIER);
 +  grub_uint32_t vlantag = 0;
 +  grub_uint8_t hw_addr_len = inf->card->default_address.len;
 +  grub_uint8_t etherhdr_size = 2 * hw_addr_len + 2;
@@ -487,7 +490,7 @@ index 4d7ceed6f9..9aae83a5eb 100644
    if (!inf->card->opened)
      {
        err = GRUB_ERR_NONE;
-@@ -85,18 +91,6 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
+@@ -85,19 +91,6 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
        inf->card->opened = 1;
      }
  
@@ -499,14 +502,15 @@ index 4d7ceed6f9..9aae83a5eb 100644
 -                   (char *) nb->data + etherhdr_size - 6, 2);
 -
 -      /* Add the tag in the middle */
+-      grub_uint16_t vlan = grub_cpu_to_be16 (inf->vlantag);
 -      grub_memcpy ((char *) nb->data + etherhdr_size - 6, &vlantag_id, 2);
--      grub_memcpy ((char *) nb->data + etherhdr_size - 4, (char *) &(inf->vlantag), 2);
+-      grub_memcpy ((char *) nb->data + etherhdr_size - 4, &vlan, 2);
 -    }
 -
    return inf->card->driver->send (inf->card, nb);
  }
  
-@@ -104,31 +98,40 @@ grub_err_t
+@@ -105,31 +98,40 @@ grub_err_t
  grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
  			       struct grub_net_card *card)
  {
@@ -528,7 +532,7 @@ index 4d7ceed6f9..9aae83a5eb 100644
 -  /* Check if a vlan-tag is present. If so, the ethernet header is 4 bytes */
 -  /* longer than the original one. The vlantag id is extracted and the header */
 -  /* is reseted to the original size. */
--  if (grub_get_unaligned16 (nb->data + etherhdr_size - 2) == VLANTAG_IDENTIFIER)
+-  if (grub_get_unaligned16 (nb->data + etherhdr_size - 2) == grub_cpu_to_be16_compile_time (VLANTAG_IDENTIFIER))
 +  hwaddress.type = card->default_address.type;
 +  hwaddress.len = hw_addr_len;
 +  grub_memcpy (hwaddress.mac, eth, hw_addr_len);
@@ -542,7 +546,7 @@ index 4d7ceed6f9..9aae83a5eb 100644
 +  type = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
 +  if (type == VLANTAG_IDENTIFIER)
      {
--      vlantag = grub_get_unaligned16 (nb->data + etherhdr_size);
+-      vlantag = grub_be_to_cpu16 (grub_get_unaligned16 (nb->data + etherhdr_size));
 +      /* Skip vlan tag */
 +      eth += 2;
 +      vlantag = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
@@ -559,7 +563,7 @@ index 4d7ceed6f9..9aae83a5eb 100644
    err = grub_netbuff_pull (nb, etherhdr_size);
    if (err)
      return err;
-@@ -148,11 +151,6 @@ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
+@@ -149,11 +151,6 @@ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
  	}
      }
  
@@ -572,7 +576,7 @@ index 4d7ceed6f9..9aae83a5eb 100644
      {
        /* ARP packet. */
 diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c
-index 2cbd95dce2..56a3ec5c8e 100644
+index 9a8c4511285..5924fd53aca 100644
 --- a/grub-core/net/icmp6.c
 +++ b/grub-core/net/icmp6.c
 @@ -231,8 +231,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
@@ -612,10 +616,10 @@ index 2cbd95dce2..56a3ec5c8e 100644
  	      }
  	    if (ohdr->type == OPTION_PREFIX && ohdr->len == 4)
 diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index ea5edf8f1f..a5896f6dc2 100644
+index f967618e53f..3c475762cc0 100644
 --- a/grub-core/net/ip.c
 +++ b/grub-core/net/ip.c
-@@ -276,8 +276,8 @@ handle_dgram (struct grub_net_buff *nb,
+@@ -316,8 +316,8 @@ handle_dgram (struct grub_net_buff *nb,
  	  if (inf->card == card
  	      && inf->address.type == GRUB_NET_NETWORK_LEVEL_PROTOCOL_DHCP_RECV
  	      && inf->hwaddress.type == GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET
@@ -627,7 +631,7 @@ index ea5edf8f1f..a5896f6dc2 100644
  	      grub_net_process_dhcp (nb, inf);
  	      grub_netbuff_free (nb);
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 22f2689aae..a46f82362e 100644
+index 20c55257647..fa6b6537142 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -133,8 +133,9 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf,
@@ -650,7 +654,7 @@ index 22f2689aae..a46f82362e 100644
        hw_addr->mac[0] = 0x33;
        hw_addr->mac[1] = 0x33;
        hw_addr->mac[2] = ((grub_be_to_cpu64 (proto_addr->ipv6[1]) >> 24) & 0xff);
-@@ -762,23 +764,23 @@ grub_net_addr_to_str (const grub_net_network_level_address_t *target, char *buf)
+@@ -772,23 +774,23 @@ grub_net_addr_to_str (const grub_net_network_level_address_t *target, char *buf)
  void
  grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str)
  {
@@ -688,8 +692,8 @@ index 22f2689aae..a46f82362e 100644
 -  grub_printf (_("Unsupported hw address type %d\n"), addr->type);
  }
  
- int
-@@ -789,13 +791,17 @@ grub_net_hwaddr_cmp (const grub_net_link_level_address_t *a,
+ void
+@@ -813,13 +815,17 @@ grub_net_hwaddr_cmp (const grub_net_link_level_address_t *a,
      return -1;
    if (a->type > b->type)
      return +1;
@@ -713,7 +717,7 @@ index 22f2689aae..a46f82362e 100644
  
  int
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 8a05ec4fe7..af0404db7e 100644
+index ff901b96e22..1d76fd9a1f5 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -29,7 +29,8 @@
@@ -728,7 +732,7 @@ index 8a05ec4fe7..af0404db7e 100644
      GRUB_NET_OUR_IPV4_HEADER_SIZE = 20,
 @@ -42,15 +43,17 @@ enum
  
- typedef enum grub_link_level_protocol_id 
+ typedef enum grub_link_level_protocol_id
  {
 -  GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET
 +  /* IANA ARP constant to define hardware type. */
@@ -746,7 +750,7 @@ index 8a05ec4fe7..af0404db7e 100644
    };
  } grub_net_link_level_address_t;
  
-@@ -566,11 +569,13 @@ grub_net_addr_cmp (const grub_net_network_level_address_t *a,
+@@ -588,11 +591,13 @@ grub_net_addr_cmp (const grub_net_network_level_address_t *a,
  #define GRUB_NET_MAX_STR_ADDR_LEN sizeof ("XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX")
  
  /*
@@ -762,5 +766,5 @@ index 8a05ec4fe7..af0404db7e 100644
 +	"XX:XX:XX:XX:XX:XX:XX:XX:"\
 +	"XX:XX:XX:XX:XX:XX:XX:XX"))
  
- void
- grub_net_addr_to_str (const grub_net_network_level_address_t *target,
+ /* Max VLAN id = 4094 */
+ #define GRUB_NET_MAX_STR_VLAN_LEN (sizeof ("vlanXXXX"))
diff --git a/0075-efinet-UEFI-IPv6-PXE-support.patch b/0064-efinet-UEFI-IPv6-PXE-support.patch
similarity index 92%
rename from 0075-efinet-UEFI-IPv6-PXE-support.patch
rename to 0064-efinet-UEFI-IPv6-PXE-support.patch
index 988c1784..2d8a3ae4 100644
--- a/0075-efinet-UEFI-IPv6-PXE-support.patch
+++ b/0064-efinet-UEFI-IPv6-PXE-support.patch
@@ -15,12 +15,12 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
  2 files changed, 46 insertions(+), 27 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 8e25680db0..014e5bf980 100644
+index 7deb0a32efd..92bb7444782 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -409,6 +409,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -430,6 +430,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	  grub_print_error ();
- 	if (device && path)
+ 	if (inter && device && path)
  	  grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
 +	if (grub_errno)
 +	  grub_print_error ();
@@ -28,10 +28,10 @@ index 8e25680db0..014e5bf980 100644
      else
        {
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 7614b58dca..91ab528e4d 100644
+index daa9268fdaa..53f5c781ac3 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -1524,31 +1524,6 @@ typedef union
+@@ -1571,31 +1571,6 @@ typedef union
    grub_efi_pxe_dhcpv6_packet_t dhcpv6;
  } grub_efi_pxe_packet_t;
  
@@ -63,7 +63,7 @@ index 7614b58dca..91ab528e4d 100644
  typedef struct grub_efi_pxe_icmp_error
  {
    grub_efi_uint8_t type;
-@@ -1574,6 +1549,48 @@ typedef struct grub_efi_pxe_tftp_error
+@@ -1621,6 +1596,48 @@ typedef struct grub_efi_pxe_tftp_error
    grub_efi_char8_t error_string[127];
  } grub_efi_pxe_tftp_error_t;
  
@@ -112,7 +112,7 @@ index 7614b58dca..91ab528e4d 100644
  typedef struct grub_efi_pxe_mode
  {
    grub_efi_boolean_t started;
-@@ -1605,9 +1622,9 @@ typedef struct grub_efi_pxe_mode
+@@ -1652,9 +1669,9 @@ typedef struct grub_efi_pxe_mode
    grub_efi_pxe_packet_t pxe_bis_reply;
    grub_efi_pxe_ip_filter_t ip_filter;
    grub_efi_uint32_t arp_cache_entries;
diff --git a/0076-grub.texi-Add-net_bootp6-doument.patch b/0065-grub.texi-Add-net_bootp6-doument.patch
similarity index 88%
rename from 0076-grub.texi-Add-net_bootp6-doument.patch
rename to 0065-grub.texi-Add-net_bootp6-doument.patch
index b42e09bf..72863180 100644
--- a/0076-grub.texi-Add-net_bootp6-doument.patch
+++ b/0065-grub.texi-Add-net_bootp6-doument.patch
@@ -12,10 +12,10 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
  1 file changed, 17 insertions(+)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 0615d0ed97..04ed6ac1f0 100644
+index c30701b4e1f..44c4e665a0d 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -5487,6 +5487,7 @@ This command is only available on AArch64 systems.
+@@ -5955,6 +5955,7 @@ Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}).
  * net_add_dns::                 Add a DNS server
  * net_add_route::               Add routing entry
  * net_bootp::                   Perform a bootp/DHCP autoconfiguration
@@ -23,7 +23,7 @@ index 0615d0ed97..04ed6ac1f0 100644
  * net_del_addr::                Remove IP address from interface
  * net_del_dns::                 Remove a DNS server
  * net_del_route::               Remove a route entry
-@@ -5611,6 +5612,22 @@ Sets environment variable @samp{net_}@var{<card>}@samp{_boot_file}
+@@ -6080,6 +6081,22 @@ Sets environment variable @samp{net_}@var{<card>}@samp{_boot_file}
  
  @end deffn
  
diff --git a/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0066-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
similarity index 95%
rename from 0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
rename to 0066-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
index abff9eb2..7109c4e3 100644
--- a/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
+++ b/0066-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
@@ -22,7 +22,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
  2 files changed, 56 insertions(+)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index fe93b80f1c..8fb8918ae7 100644
+index 76e4c11a46f..f56b293ac72 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -20,6 +20,7 @@
@@ -33,7 +33,7 @@ index fe93b80f1c..8fb8918ae7 100644
  #include <grub/net/ip.h>
  #include <grub/net/netbuff.h>
  #include <grub/net/udp.h>
-@@ -500,6 +501,60 @@ grub_net_configure_by_dhcp_ack (const char *name,
+@@ -501,6 +502,60 @@ grub_net_configure_by_dhcp_ack (const char *name,
    if (opt && opt_len)
      grub_env_set_net_property (name, "rootpath", (const char *) opt, opt_len);
  
@@ -95,10 +95,10 @@ index fe93b80f1c..8fb8918ae7 100644
    if (opt && opt_len)
      grub_env_set_net_property (name, "extensionspath", (const char *) opt, opt_len);
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 543251f727..42af7de250 100644
+index 1d76fd9a1f5..868c9a2ef29 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
-@@ -531,6 +531,7 @@ enum
+@@ -533,6 +533,7 @@ enum
      GRUB_NET_DHCP_MESSAGE_TYPE = 53,
      GRUB_NET_DHCP_SERVER_IDENTIFIER = 54,
      GRUB_NET_DHCP_PARAMETER_REQUEST_LIST = 55,
diff --git a/0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch b/0067-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
similarity index 93%
rename from 0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
rename to 0067-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
index f20f5c79..4d843714 100644
--- a/0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
+++ b/0067-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 8fb8918ae7..7baf3540c8 100644
+index f56b293ac72..9cbdc2264c9 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -329,7 +329,7 @@ grub_net_configure_by_dhcp_ack (const char *name,
@@ -26,7 +26,7 @@ index 8fb8918ae7..7baf3540c8 100644
    grub_uint8_t opt_len, overload = 0;
    const char *boot_file = 0, *server_name = 0;
    grub_size_t boot_file_len, server_name_len;
-@@ -505,7 +505,7 @@ grub_net_configure_by_dhcp_ack (const char *name,
+@@ -506,7 +506,7 @@ grub_net_configure_by_dhcp_ack (const char *name,
    if (opt && opt_len)
      {
        grub_env_set_net_property (name, "vendor_class_identifier", (const char *) opt, opt_len);
diff --git a/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
deleted file mode 100644
index ccf34a50..00000000
--- a/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 25 Jun 2015 15:11:36 -0400
-Subject: [PATCH] Make a "gdb" dprintf that tells us load addresses.
-
-This makes a grub_dprintf() call during platform init and during module
-loading that tells us the virtual addresses of the .text and .data
-sections of grub-core/kernel.exec and any modules it loads.
-
-Specifically, it displays them in the gdb "add-symbol-file" syntax, with
-the presumption that there's a variable $grubdir that reflects the path
-to any such binaries.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/kern/dl.c       | 50 +++++++++++++++++++++++++++++++++++++++++++++++
- grub-core/kern/efi/efi.c  |  4 ++--
- grub-core/kern/efi/init.c | 26 +++++++++++++++++++++++-
- include/grub/efi/efi.h    |  2 +-
- 4 files changed, 78 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 88d2077709..9557254035 100644
---- a/grub-core/kern/dl.c
-+++ b/grub-core/kern/dl.c
-@@ -501,6 +501,23 @@ grub_dl_find_section (Elf_Ehdr *e, const char *name)
-       return s;
-   return NULL;
- }
-+static long
-+grub_dl_find_section_index (Elf_Ehdr *e, const char *name)
-+{
-+  Elf_Shdr *s;
-+  const char *str;
-+  unsigned i;
-+
-+  s = (Elf_Shdr *) ((char *) e + e->e_shoff + e->e_shstrndx * e->e_shentsize);
-+  str = (char *) e + s->sh_offset;
-+
-+  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
-+       i < e->e_shnum;
-+       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
-+    if (grub_strcmp (str + s->sh_name, name) == 0)
-+      return (long)i;
-+  return -1;
-+}
- 
- /* Me, Vladimir Serbinenko, hereby I add this module check as per new
-    GNU module policy. Note that this license check is informative only.
-@@ -653,6 +670,37 @@ grub_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
- 
-   return GRUB_ERR_NONE;
- }
-+static void
-+grub_dl_print_gdb_info (grub_dl_t mod, Elf_Ehdr *e)
-+{
-+  void *text, *data = NULL;
-+  long idx;
-+
-+  idx = grub_dl_find_section_index (e, ".text");
-+  if (idx < 0)
-+    return;
-+
-+  text = grub_dl_get_section_addr (mod, idx);
-+  if (!text)
-+    return;
-+
-+  idx = grub_dl_find_section_index (e, ".data");
-+  if (idx >= 0)
-+    data = grub_dl_get_section_addr (mod, idx);
-+
-+  if (data)
-+    grub_qdprintf ("gdb", "add-symbol-file \\\n"
-+		          "/usr/lib/debug/usr/lib/grub/%s-%s/%s.debug "
-+			  "\\\n %p -s .data %p\n",
-+		  GRUB_TARGET_CPU, GRUB_PLATFORM,
-+		  mod->name, text, data);
-+  else
-+    grub_qdprintf ("gdb", "add-symbol-file \\\n"
-+			   "/usr/lib/debug/usr/lib/grub/%s-%s/%s.debug "
-+			   "\\\n%p\n",
-+		  GRUB_TARGET_CPU, GRUB_PLATFORM,
-+		  mod->name, text);
-+}
- 
- /* Load a module from core memory.  */
- grub_dl_t
-@@ -712,6 +760,8 @@ grub_dl_load_core_noinit (void *addr, grub_size_t size)
-   grub_dprintf ("modules", "module name: %s\n", mod->name);
-   grub_dprintf ("modules", "init function: %p\n", mod->init);
- 
-+  grub_dl_print_gdb_info (mod, e);
-+
-   if (grub_dl_add (mod))
-     {
-       grub_dl_unload (mod);
-diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index ae9885edb8..d6a2fb5778 100644
---- a/grub-core/kern/efi/efi.c
-+++ b/grub-core/kern/efi/efi.c
-@@ -296,7 +296,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
- /* Search the mods section from the PE32/PE32+ image. This code uses
-    a PE32 header, but should work with PE32+ as well.  */
- grub_addr_t
--grub_efi_modules_addr (void)
-+grub_efi_section_addr (const char *section_name)
- {
-   grub_efi_loaded_image_t *image;
-   struct grub_pe32_header *header;
-@@ -321,7 +321,7 @@ grub_efi_modules_addr (void)
-        i < coff_header->num_sections;
-        i++, section++)
-     {
--      if (grub_strcmp (section->name, "mods") == 0)
-+      if (grub_strcmp (section->name, section_name) == 0)
- 	break;
-     }
- 
-diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 6d39bd3ad2..2d12e6188f 100644
---- a/grub-core/kern/efi/init.c
-+++ b/grub-core/kern/efi/init.c
-@@ -115,10 +115,33 @@ grub_efi_env_init (void)
-   grub_free (envblk_s.buf);
- }
- 
-+static void
-+grub_efi_print_gdb_info (void)
-+{
-+  grub_addr_t text;
-+  grub_addr_t data;
-+
-+  text = grub_efi_section_addr (".text");
-+  if (!text)
-+    return;
-+
-+  data = grub_efi_section_addr (".data");
-+  if (data)
-+    grub_qdprintf ("gdb",
-+		  "add-symbol-file /usr/lib/debug/usr/lib/grub/%s-%s/"
-+		  "kernel.exec %p -s .data %p\n",
-+		  GRUB_TARGET_CPU, GRUB_PLATFORM, (void *)text, (void *)data);
-+  else
-+    grub_qdprintf ("gdb",
-+		  "add-symbol-file /usr/lib/debug/usr/lib/grub/%s-%s/"
-+		  "kernel.exec %p\n",
-+		  GRUB_TARGET_CPU, GRUB_PLATFORM, (void *)text);
-+}
-+
- void
- grub_efi_init (void)
- {
--  grub_modbase = grub_efi_modules_addr ();
-+  grub_modbase = grub_efi_section_addr ("mods");
-   /* First of all, initialize the console so that GRUB can display
-      messages.  */
-   grub_console_init ();
-@@ -142,6 +165,7 @@ grub_efi_init (void)
- 	      0, 0, 0, NULL);
- 
-   grub_efi_env_init ();
-+  grub_efi_print_gdb_info ();
-   grub_efidisk_init ();
- }
- 
-diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 03f9a9d011..2e0691454b 100644
---- a/include/grub/efi/efi.h
-+++ b/include/grub/efi/efi.h
-@@ -138,7 +138,7 @@ grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh);
- grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, char *args);
- #endif
- 
--grub_addr_t grub_efi_modules_addr (void);
-+grub_addr_t grub_efi_section_addr (const char *section);
- 
- void grub_efi_mm_init (void);
- void grub_efi_mm_fini (void);
diff --git a/0078-efinet-Setting-network-from-UEFI-device-path.patch b/0068-efinet-Setting-network-from-UEFI-device-path.patch
similarity index 89%
rename from 0078-efinet-Setting-network-from-UEFI-device-path.patch
rename to 0068-efinet-Setting-network-from-UEFI-device-path.patch
index f4faf270..71536301 100644
--- a/0078-efinet-Setting-network-from-UEFI-device-path.patch
+++ b/0068-efinet-Setting-network-from-UEFI-device-path.patch
@@ -27,12 +27,12 @@ the same way it used to be.
 Signed-off-by: Michael Chang <mchang@suse.com>
 Signed-off-by: Ken Lin <ken.lin@hpe.com>
 ---
- grub-core/net/drivers/efi/efinet.c | 284 +++++++++++++++++++++++++++++++++++--
+ grub-core/net/drivers/efi/efinet.c | 286 ++++++++++++++++++++++++++++++++++---
  include/grub/efi/api.h             |  11 ++
- 2 files changed, 280 insertions(+), 15 deletions(-)
+ 2 files changed, 281 insertions(+), 16 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 014e5bf980..8171ecaa5e 100644
+index 92bb7444782..eb68de22023 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -26,6 +26,7 @@
@@ -43,7 +43,7 @@ index 014e5bf980..8171ecaa5e 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -331,6 +332,227 @@ grub_efinet_findcards (void)
+@@ -348,6 +349,227 @@ grub_efinet_findcards (void)
    grub_free (handles);
  }
  
@@ -271,7 +271,7 @@ index 014e5bf980..8171ecaa5e 100644
  static void
  grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  			  char **path)
-@@ -346,7 +568,11 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -367,7 +589,11 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
    {
      grub_efi_device_path_t *cdp;
      struct grub_efi_pxe *pxe;
@@ -284,7 +284,7 @@ index 014e5bf980..8171ecaa5e 100644
  
      if (card->driver != &efidriver)
        continue;
-@@ -370,11 +596,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -391,11 +617,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
           */
  	if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
  	    || (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
@@ -307,7 +307,7 @@ index 014e5bf980..8171ecaa5e 100644
  	dup_ldp = grub_efi_find_last_device_path (dup_dp);
  	dup_ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
  	dup_ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
-@@ -387,23 +623,37 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -408,23 +644,37 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  
      pxe = grub_efi_open_protocol (hnd, &pxe_io_guid,
  				  GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
@@ -347,38 +347,45 @@ index 014e5bf980..8171ecaa5e 100644
 +			pxe_mode->dhcp_ack_received ? "yes" : "no",
 +			pxe_mode->dhcp_ack_received ? "" : " cannot continue");
  
- 	grub_net_configure_by_dhcpv6_reply (card->name, card, 0,
- 					    (struct grub_net_dhcp6_packet *)
--					    &pxe_mode->dhcp_ack,
--					    sizeof (pxe_mode->dhcp_ack),
-+					    packet_buf,
-+					    packet_bufsz,
- 					    1, device, path);
+ 	inter = grub_net_configure_by_dhcpv6_reply (card->name, card, 0,
+ 						    (struct grub_net_dhcp6_packet *)
+-						    &pxe_mode->dhcp_ack,
+-						    sizeof (pxe_mode->dhcp_ack),
++						    packet_buf,
++						    packet_bufsz,
+ 						    1, device, path);
  	if (grub_errno)
  	  grub_print_error ();
-@@ -417,11 +667,15 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -438,8 +688,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	grub_dprintf ("efinet", "using ipv4 and dhcp\n");
- 	grub_net_configure_by_dhcp_ack (card->name, card, 0,
- 					(struct grub_net_bootp_packet *)
--					&pxe_mode->dhcp_ack,
--					sizeof (pxe_mode->dhcp_ack),
-+					packet_buf,
-+					packet_bufsz,
- 					1, device, path);
+ 	inter = grub_net_configure_by_dhcp_ack (card->name, card, 0,
+ 						(struct grub_net_bootp_packet *)
+-						&pxe_mode->dhcp_ack,
+-						sizeof (pxe_mode->dhcp_ack),
++						packet_buf,
++						packet_bufsz,
+ 						1, device, path);
+ 
  	grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
+@@ -465,8 +715,12 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+ 		vlan_dp = (grub_efi_device_path_t *) ((grub_efi_uint8_t *) vlan_dp + vlan_dp_len);
+ 	      }
+ 	  }
+-	return;
        }
 +
 +    if (nb)
 +      grub_netbuff_free (nb);
 +
-     return;
++    return;
    }
  }
+ 
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 91ab528e4d..4a51667adb 100644
+index 53f5c781ac3..fa528e73a27 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -864,6 +864,8 @@ struct grub_efi_ipv4_device_path
+@@ -891,6 +891,8 @@ struct grub_efi_ipv4_device_path
    grub_efi_uint16_t remote_port;
    grub_efi_uint16_t protocol;
    grub_efi_uint8_t static_ip_address;
@@ -387,9 +394,9 @@ index 91ab528e4d..4a51667adb 100644
  } GRUB_PACKED;
  typedef struct grub_efi_ipv4_device_path grub_efi_ipv4_device_path_t;
  
-@@ -918,6 +920,15 @@ struct grub_efi_sata_device_path
+@@ -954,6 +956,15 @@ struct grub_efi_vlan_device_path
  } GRUB_PACKED;
- typedef struct grub_efi_sata_device_path grub_efi_sata_device_path_t;
+ typedef struct grub_efi_vlan_device_path grub_efi_vlan_device_path_t;
  
 +#define GRUB_EFI_URI_DEVICE_PATH_SUBTYPE		24
 +
diff --git a/0069-Fixup-for-newer-compiler.patch b/0069-Fixup-for-newer-compiler.patch
deleted file mode 100644
index ed23271e..00000000
--- a/0069-Fixup-for-newer-compiler.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 10 May 2018 13:40:19 -0400
-Subject: [PATCH] Fixup for newer compiler
-
----
- grub-core/fs/btrfs.c         | 2 +-
- include/grub/gpt_partition.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 2b21cbaa67..4cc86e9b79 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -218,7 +218,7 @@ struct grub_btrfs_inode
-   grub_uint64_t size;
-   grub_uint8_t dummy2[0x70];
-   struct grub_btrfs_time mtime;
--} GRUB_PACKED;
-+} GRUB_PACKED  __attribute__ ((aligned(8)));
- 
- struct grub_btrfs_extent_data
- {
-diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
-index 7a93f43291..8212697bf6 100644
---- a/include/grub/gpt_partition.h
-+++ b/include/grub/gpt_partition.h
-@@ -76,7 +76,7 @@ struct grub_gpt_partentry
-   grub_uint64_t end;
-   grub_uint64_t attrib;
-   char name[72];
--} GRUB_PACKED;
-+} GRUB_PACKED  __attribute__ ((aligned(8)));
- 
- grub_err_t
- grub_gpt_partition_map_iterate (grub_disk_t disk,
diff --git a/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0069-efinet-Setting-DNS-server-from-UEFI-protocol.patch
similarity index 84%
rename from 0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch
rename to 0069-efinet-Setting-DNS-server-from-UEFI-protocol.patch
index 2d92ff07..43d2df03 100644
--- a/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch
+++ b/0069-efinet-Setting-DNS-server-from-UEFI-protocol.patch
@@ -29,34 +29,34 @@ Signed-off-by: Michael Chang <mchang@suse.com>
 Signed-off-by: Ken Lin <ken.lin@hpe.com>
 ---
  grub-core/net/drivers/efi/efinet.c | 163 +++++++++++++++++++++++++++++++++++++
- include/grub/efi/api.h             |  75 +++++++++++++++++
- 2 files changed, 238 insertions(+)
+ include/grub/efi/api.h             |  76 +++++++++++++++++
+ 2 files changed, 239 insertions(+)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 8171ecaa5e..715a6168d7 100644
+index eb68de22023..a91df09ee6d 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -33,6 +33,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
  /* GUID.  */
- static grub_efi_guid_t net_io_guid = GRUB_EFI_SIMPLE_NETWORK_GUID;
- static grub_efi_guid_t pxe_io_guid = GRUB_EFI_PXE_GUID;
-+static grub_efi_guid_t ip4_config_guid = GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID;
-+static grub_efi_guid_t ip6_config_guid = GRUB_EFI_IP6_CONFIG_PROTOCOL_GUID;
+ static grub_guid_t net_io_guid = GRUB_EFI_SIMPLE_NETWORK_GUID;
+ static grub_guid_t pxe_io_guid = GRUB_EFI_PXE_GUID;
++static grub_guid_t ip4_config_guid = GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID;
++static grub_guid_t ip6_config_guid = GRUB_EFI_IP6_CONFIG_PROTOCOL_GUID;
  
  static grub_err_t
  send_card_buffer (struct grub_net_card *dev,
-@@ -332,6 +334,125 @@ grub_efinet_findcards (void)
+@@ -349,6 +351,125 @@ grub_efinet_findcards (void)
    grub_free (handles);
  }
  
 +static grub_efi_handle_t
-+grub_efi_locate_device_path (grub_efi_guid_t *protocol, grub_efi_device_path_t *device_path,
++grub_efi_locate_device_path (grub_guid_t *protocol, grub_efi_device_path_t *device_path,
 +			    grub_efi_device_path_t **r_device_path)
 +{
 +  grub_efi_handle_t handle;
 +  grub_efi_status_t status;
 +
-+  status = efi_call_3 (grub_efi_system_table->boot_services->locate_device_path,
++  status = grub_efi_system_table->boot_services->locate_device_path(
 +		      protocol, &device_path, &handle);
 +
 +  if (status != GRUB_EFI_SUCCESS)
@@ -92,9 +92,9 @@ index 8171ecaa5e..715a6168d7 100644
 +  if (!addrs)
 +    return 0;
 +
-+  status = efi_call_4 (conf->get_data, conf,
-+		      GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
-+		      &data_size, addrs);
++  status = conf->get_data(conf,
++			  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
++			  &data_size, addrs);
 +
 +  if (status == GRUB_EFI_BUFFER_TOO_SMALL)
 +    {
@@ -103,9 +103,9 @@ index 8171ecaa5e..715a6168d7 100644
 +      if (!addrs)
 +	return 0;
 +
-+      status = efi_call_4 (conf->get_data,  conf,
-+			  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
-+			  &data_size, addrs);
++      status = conf->get_data(conf,
++			      GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
++			      &data_size, addrs);
 +    }
 +
 +  if (status != GRUB_EFI_SUCCESS)
@@ -142,9 +142,9 @@ index 8171ecaa5e..715a6168d7 100644
 +  if (!addrs)
 +    return 0;
 +
-+  status = efi_call_4 (conf->get_data, conf,
-+		      GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
-+		      &data_size, addrs);
++  status = conf->get_data(conf,
++			  GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
++			  &data_size, addrs);
 +
 +  if (status == GRUB_EFI_BUFFER_TOO_SMALL)
 +    {
@@ -153,9 +153,9 @@ index 8171ecaa5e..715a6168d7 100644
 +      if (!addrs)
 +	return 0;
 +
-+      status = efi_call_4 (conf->get_data,  conf,
-+			  GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
-+			  &data_size, addrs);
++      status = conf->get_data(conf,
++			      GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
++			      &data_size, addrs);
 +    }
 +
 +  if (status != GRUB_EFI_SUCCESS)
@@ -171,7 +171,7 @@ index 8171ecaa5e..715a6168d7 100644
  static struct grub_net_buff *
  grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *use_ipv6)
  {
-@@ -390,6 +511,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
+@@ -407,6 +528,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
        grub_efi_ipv4_device_path_t *ipv4 = (grub_efi_ipv4_device_path_t *) ldp;
        struct grub_net_bootp_packet *bp;
        grub_uint8_t *ptr;
@@ -180,7 +180,7 @@ index 8171ecaa5e..715a6168d7 100644
  
        bp = (struct grub_net_bootp_packet *) nb->tail;
        err = grub_netbuff_put (nb, sizeof (*bp) + 4);
-@@ -451,6 +574,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
+@@ -468,6 +591,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
        *ptr++ = sizeof ("HTTPClient") - 1;
        grub_memcpy (ptr, "HTTPClient", sizeof ("HTTPClient") - 1);
  
@@ -206,7 +206,7 @@ index 8171ecaa5e..715a6168d7 100644
        ptr = nb->tail;
        err = grub_netbuff_put (nb, 1);
        if (err)
-@@ -483,6 +625,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
+@@ -500,6 +642,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
        struct grub_net_dhcp6_option *opt;
        struct grub_net_dhcp6_option_iana *iana;
        struct grub_net_dhcp6_option_iaaddr *iaaddr;
@@ -215,7 +215,7 @@ index 8171ecaa5e..715a6168d7 100644
  
        d6p = (struct grub_net_dhcp6_packet *)nb->tail;
        err = grub_netbuff_put (nb, sizeof(*d6p));
-@@ -546,6 +690,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
+@@ -563,6 +707,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
        opt->len = grub_cpu_to_be16 (uri_len);
        grub_memcpy (opt->data, uri_dp->uri, uri_len);
  
@@ -242,14 +242,13 @@ index 8171ecaa5e..715a6168d7 100644
      }
  
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 4a51667adb..0b490195ad 100644
+index fa528e73a27..248d6a28ff9 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -352,6 +352,15 @@
- #define GRUB_EFI_RNG_PROTOCOL_GUID \
-   { 0x3152bca5, 0xeade, 0x433d, \
+@@ -369,6 +369,16 @@
      { 0x86, 0x2e, 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44 } \
-+
+   }
+ 
 +#define GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID \
 +  { 0x5b446ed1, 0xe30b, 0x4faa, \
 +      { 0x87, 0x1a, 0x36, 0x54, 0xec, 0xa3, 0x60, 0x80 } \
@@ -258,12 +257,14 @@ index 4a51667adb..0b490195ad 100644
 +#define GRUB_EFI_IP6_CONFIG_PROTOCOL_GUID \
 +  { 0x937fe521, 0x95ae, 0x4d1a, \
 +      { 0x89, 0x29, 0x48, 0xbc, 0xd9, 0x0a, 0xd3, 0x1a } \
-   }
- 
- struct grub_efi_sal_system_table
-@@ -1883,6 +1892,72 @@ struct grub_efi_rng_protocol
++  }
++
+ #define LINUX_EFI_INITRD_MEDIA_GUID  \
+   { 0x5568e427, 0x68fc, 0x4f3d, \
+     { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \
+@@ -1963,6 +1973,72 @@ struct grub_efi_load_file2
  };
- typedef struct grub_efi_rng_protocol grub_efi_rng_protocol_t;
+ typedef struct grub_efi_load_file2 grub_efi_load_file2_t;
  
 +enum grub_efi_ip4_config2_data_type {
 +  GRUB_EFI_IP4_CONFIG2_DATA_TYPE_INTERFACEINFO,
@@ -331,6 +332,6 @@ index 4a51667adb..0b490195ad 100644
 +};
 +typedef struct grub_efi_ip6_config_protocol grub_efi_ip6_config_protocol_t;
 +
- #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \
-   || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \
-   || defined(__riscv)
+ struct initrd_media_device_path {
+   grub_efi_vendor_media_device_path_t  vendor;
+   grub_efi_device_path_t               end;
diff --git a/0080-Support-UEFI-networking-protocols.patch b/0070-Support-UEFI-networking-protocols.patch
similarity index 94%
rename from 0080-Support-UEFI-networking-protocols.patch
rename to 0070-Support-UEFI-networking-protocols.patch
index 740a9f87..efa3659a 100644
--- a/0080-Support-UEFI-networking-protocols.patch
+++ b/0070-Support-UEFI-networking-protocols.patch
@@ -33,18 +33,18 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/net/drivers/efi/efinet.c |   27 +
  grub-core/net/efi/dhcp.c           |  397 ++++++++++
  grub-core/net/efi/efi_netfs.c      |   57 ++
- grub-core/net/efi/http.c           |  419 +++++++++++
+ grub-core/net/efi/http.c           |  410 +++++++++++
  grub-core/net/efi/ip4_config.c     |  398 ++++++++++
  grub-core/net/efi/ip6_config.c     |  422 +++++++++++
  grub-core/net/efi/net.c            | 1428 ++++++++++++++++++++++++++++++++++++
  grub-core/net/efi/pxe.c            |  424 +++++++++++
  grub-core/net/net.c                |   74 ++
  util/grub-mknetdir.c               |   23 +-
- include/grub/efi/api.h             |  180 ++++-
+ include/grub/efi/api.h             |  195 ++++-
  include/grub/efi/dhcp.h            |  343 +++++++++
  include/grub/efi/http.h            |  215 ++++++
  include/grub/net/efi.h             |  144 ++++
- 17 files changed, 4620 insertions(+), 41 deletions(-)
+ 17 files changed, 4618 insertions(+), 49 deletions(-)
  create mode 100644 grub-core/net/efi/dhcp.c
  create mode 100644 grub-core/net/efi/efi_netfs.c
  create mode 100644 grub-core/net/efi/http.c
@@ -57,10 +57,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  create mode 100644 include/grub/net/efi.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 4b7c45a7b0..c40170f2dd 100644
+index 6645fbae34f..56eb6a828e8 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -2299,6 +2299,12 @@ module = {
+@@ -2356,6 +2356,12 @@ module = {
    common = hook/datehook.c;
  };
  
@@ -73,7 +73,7 @@ index 4b7c45a7b0..c40170f2dd 100644
  module = {
    name = net;
    common = net/net.c;
-@@ -2312,6 +2318,12 @@ module = {
+@@ -2369,6 +2375,12 @@ module = {
    common = net/ethernet.c;
    common = net/arp.c;
    common = net/netbuff.c;
@@ -87,7 +87,7 @@ index 4b7c45a7b0..c40170f2dd 100644
  
  module = {
 diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c
-index a458c3aca7..1637731535 100644
+index a458c3aca78..1637731535e 100644
 --- a/grub-core/io/bufio.c
 +++ b/grub-core/io/bufio.c
 @@ -139,7 +139,7 @@ grub_bufio_read (grub_file_t file, char *buf, grub_size_t len)
@@ -100,10 +100,10 @@ index a458c3aca7..1637731535 100644
    if (file->offset + res < next_buf)
      {
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index d6a2fb5778..2a446f5031 100644
+index 2bb8a0e7a38..bf16c4307bc 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -755,7 +755,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
+@@ -775,7 +775,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
  	      {
  		grub_efi_ipv4_device_path_t *ipv4
  		  = (grub_efi_ipv4_device_path_t *) dp;
@@ -112,7 +112,7 @@ index d6a2fb5778..2a446f5031 100644
  			     (unsigned) ipv4->local_ip_address[0],
  			     (unsigned) ipv4->local_ip_address[1],
  			     (unsigned) ipv4->local_ip_address[2],
-@@ -768,33 +768,60 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
+@@ -788,33 +788,60 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
  			     (unsigned) ipv4->remote_port,
  			     (unsigned) ipv4->protocol,
  			     (unsigned) ipv4->static_ip_address);
@@ -190,7 +190,7 @@ index d6a2fb5778..2a446f5031 100644
  	      }
  	      break;
  	    case GRUB_EFI_INFINIBAND_DEVICE_PATH_SUBTYPE:
-@@ -834,6 +861,39 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
+@@ -861,6 +888,39 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
  	      dump_vendor_path ("Messaging",
  				(grub_efi_vendor_device_path_t *) dp);
  	      break;
@@ -231,7 +231,7 @@ index d6a2fb5778..2a446f5031 100644
  	      grub_printf ("/UnknownMessaging(%x)", (unsigned) subtype);
  	      break;
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 715a6168d7..e11d759f19 100644
+index a91df09ee6d..225dc896da0 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -27,6 +27,7 @@
@@ -242,7 +242,7 @@ index 715a6168d7..e11d759f19 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -491,6 +492,17 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
+@@ -508,6 +509,17 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
  
    ldp = grub_efi_find_last_device_path (ddp);
  
@@ -260,7 +260,7 @@ index 715a6168d7..e11d759f19 100644
    if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
        || (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
            && GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE))
-@@ -760,6 +772,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -781,6 +793,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
  	    || (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
  		&& GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE
@@ -268,7 +268,7 @@ index 715a6168d7..e11d759f19 100644
  		&& GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_URI_DEVICE_PATH_SUBTYPE))
  	  continue;
  	dup_dp = grub_efi_duplicate_device_path (dp);
-@@ -774,6 +787,15 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -795,6 +808,15 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  	    dup_ldp->length = sizeof (*dup_ldp);
  	  }
  
@@ -284,7 +284,7 @@ index 715a6168d7..e11d759f19 100644
  	dup_ldp = grub_efi_find_last_device_path (dup_dp);
  	dup_ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
  	dup_ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
-@@ -845,6 +867,9 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -889,6 +911,9 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
  
  GRUB_MOD_INIT(efinet)
  {
@@ -294,8 +294,8 @@ index 715a6168d7..e11d759f19 100644
    grub_efinet_findcards ();
    grub_efi_net_config = grub_efi_net_config_real;
  }
-@@ -856,5 +881,7 @@ GRUB_MOD_FINI(efinet)
-   FOR_NET_CARDS_SAFE (card, next) 
+@@ -900,5 +925,7 @@ GRUB_MOD_FINI(efinet)
+   FOR_NET_CARDS_SAFE (card, next)
      if (card->driver == &efidriver)
        grub_net_card_unregister (card);
 +
@@ -304,7 +304,7 @@ index 715a6168d7..e11d759f19 100644
  
 diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c
 new file mode 100644
-index 0000000000..dbef63d8c0
+index 00000000000..ca19902441b
 --- /dev/null
 +++ b/grub-core/net/efi/dhcp.c
 @@ -0,0 +1,397 @@
@@ -385,7 +385,7 @@ index 0000000000..dbef63d8c0
 +  grub_efi_uint32_t option_count = 0;
 +  grub_efi_uint32_t i;
 +
-+  status = efi_call_4 (dhcp4->parse, dhcp4, reply_packet, &option_count, NULL);
++  status = dhcp4->parse(dhcp4, reply_packet, &option_count, NULL);
 +
 +  if (status != GRUB_EFI_BUFFER_TOO_SMALL)
 +    return NULL;
@@ -394,7 +394,7 @@ index 0000000000..dbef63d8c0
 +  if (!option_list)
 +    return NULL;
 +
-+  status = efi_call_4 (dhcp4->parse, dhcp4, reply_packet, &option_count, option_list);
++  status = dhcp4->parse(dhcp4, reply_packet, &option_count, option_list);
 +  if (status != GRUB_EFI_SUCCESS)
 +    {
 +      grub_free (option_list);
@@ -443,13 +443,13 @@ index 0000000000..dbef63d8c0
 +
 +      if (!mode->started)
 +	{
-+	  status = efi_call_2 (pxe->start, pxe, 0);
++	  status = pxe->start(pxe, 0);
 +
 +	  if (status != GRUB_EFI_SUCCESS)
 +	      grub_printf ("Couldn't start PXE\n");
 +	}
 +
-+      status = efi_call_2 (pxe->dhcp, pxe, 0);
++      status = pxe->dhcp(pxe, 0);
 +      if (status != GRUB_EFI_SUCCESS)
 +	{
 +	  grub_printf ("dhcp4 configure failed, %d\n", (int)status);
@@ -500,7 +500,7 @@ index 0000000000..dbef63d8c0
 +      config.option_list = &options;
 +
 +      /* FIXME: What if the dhcp has bounded */
-+      status = efi_call_2 (netdev->dhcp4->configure, netdev->dhcp4, &config);
++      status = netdev->dhcp4->configure(netdev->dhcp4, &config);
 +      grub_free (options);
 +      if (status != GRUB_EFI_SUCCESS)
 +	{
@@ -508,14 +508,14 @@ index 0000000000..dbef63d8c0
 +	  continue;
 +	}
 +
-+      status = efi_call_2 (netdev->dhcp4->start, netdev->dhcp4, NULL);
++      status = netdev->dhcp4->start(netdev->dhcp4, NULL);
 +      if (status != GRUB_EFI_SUCCESS)
 +	{
 +	  grub_printf ("dhcp4 start failed, %d\n", (int)status);
 +	  continue;
 +	}
 +
-+      status = efi_call_2 (netdev->dhcp4->get_mode_data, netdev->dhcp4, &mode);
++      status = netdev->dhcp4->get_mode_data(netdev->dhcp4, &mode);
 +      if (status != GRUB_EFI_SUCCESS)
 +	{
 +	  grub_printf ("dhcp4 get mode failed, %d\n", (int)status);
@@ -616,21 +616,21 @@ index 0000000000..dbef63d8c0
 +      config.rapid_commit = 0;
 +      config.solicit_retransmission = &retrans;
 +
-+      status = efi_call_2 (dev->dhcp6->configure, dev->dhcp6, &config);
++      status = dev->dhcp6->configure(dev->dhcp6, &config);
 +      grub_free (opt);
 +      if (status != GRUB_EFI_SUCCESS)
 +	{
 +	  grub_printf ("dhcp6 configure failed, %d\n", (int)status);
 +	  continue;
 +	}
-+      status = efi_call_1 (dev->dhcp6->start, dev->dhcp6);
++      status = dev->dhcp6->start(dev->dhcp6);
 +      if (status != GRUB_EFI_SUCCESS)
 +	{
 +	  grub_printf ("dhcp6 start failed, %d\n", (int)status);
 +	  continue;
 +	}
 +
-+      status = efi_call_3 (dev->dhcp6->get_mode_data, dev->dhcp6, &mode, NULL);
++      status = dev->dhcp6->get_mode_data(dev->dhcp6, &mode, NULL);
 +      if (status != GRUB_EFI_SUCCESS)
 +	{
 +	  grub_printf ("dhcp4 get mode failed, %d\n", (int)status);
@@ -666,12 +666,12 @@ index 0000000000..dbef63d8c0
 +	grub_efi_dhcp6_packet_option_t **options = NULL;
 +	grub_efi_uint32_t i;
 +
-+	status = efi_call_4 (dev->dhcp6->parse, dev->dhcp6, mode.ia->reply_packet, &count, NULL);
++	status = dev->dhcp6->parse(dev->dhcp6, mode.ia->reply_packet, &count, NULL);
 +
 +	if (status == GRUB_EFI_BUFFER_TOO_SMALL && count)
 +	  {
 +	    options = grub_malloc (count * sizeof(*options));
-+	    status = efi_call_4 (dev->dhcp6->parse, dev->dhcp6, mode.ia->reply_packet, &count, options);
++	    status = dev->dhcp6->parse(dev->dhcp6, mode.ia->reply_packet, &count, options);
 +	  }
 +
 +	if (status != GRUB_EFI_SUCCESS)
@@ -696,8 +696,8 @@ index 0000000000..dbef63d8c0
 +	  grub_free (options);
 +      }
 +
-+      efi_call_1 (b->free_pool, mode.client_id);
-+      efi_call_1 (b->free_pool, mode.ia);
++      b->free_pool(mode.client_id);
++      b->free_pool(mode.ia);
 +    }
 +
 +  return GRUB_ERR_NONE;
@@ -707,7 +707,7 @@ index 0000000000..dbef63d8c0
 +grub_command_func_t grub_efi_net_bootp6 = grub_cmd_efi_bootp6;
 diff --git a/grub-core/net/efi/efi_netfs.c b/grub-core/net/efi/efi_netfs.c
 new file mode 100644
-index 0000000000..ef371d885e
+index 00000000000..ef371d885ea
 --- /dev/null
 +++ b/grub-core/net/efi/efi_netfs.c
 @@ -0,0 +1,57 @@
@@ -770,10 +770,10 @@ index 0000000000..ef371d885e
 +}
 diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
 new file mode 100644
-index 0000000000..3f61fd2fa5
+index 00000000000..de28badccb0
 --- /dev/null
 +++ b/grub-core/net/efi/http.c
-@@ -0,0 +1,419 @@
+@@ -0,0 +1,410 @@
 +
 +#include <grub/efi/api.h>
 +#include <grub/efi/efi.h>
@@ -802,9 +802,9 @@ index 0000000000..3f61fd2fa5
 +
 +      http_config.local_address_is_ipv6 = 1;
 +      sz = sizeof (manual_address);
-+      status = efi_call_4 (dev->ip6_config->get_data, dev->ip6_config,
-+			GRUB_EFI_IP6_CONFIG_DATA_TYPE_MANUAL_ADDRESS,
-+			&sz, &manual_address);
++      status = dev->ip6_config->get_data(dev->ip6_config,
++					 GRUB_EFI_IP6_CONFIG_DATA_TYPE_MANUAL_ADDRESS,
++					 &sz, &manual_address);
 +
 +      if (status == GRUB_EFI_NOT_FOUND)
 +	{
@@ -834,19 +834,19 @@ index 0000000000..3f61fd2fa5
 +      http_config.access_point.ipv4_node = &httpv4_node;
 +    }
 +
-+  status = efi_call_2 (http->configure, http, &http_config);
++  status = http->configure(http, &http_config);
 +
 +  if (status == GRUB_EFI_ALREADY_STARTED)
 +    {
 +      /* XXX: This hangs HTTPS boot */
 +#if 0
-+      if (efi_call_2 (http->configure, http, NULL) != GRUB_EFI_SUCCESS)
++      if (http->configure(http, NULL) != GRUB_EFI_SUCCESS)
 +	{
 +	  grub_error (GRUB_ERR_IO, N_("couldn't reset http instance"));
 +	  grub_print_error ();
 +	  return;
 +	}
-+      status = efi_call_2 (http->configure, http, &http_config);
++      status = http->configure(http, &http_config);
 +#endif
 +      return;
 +    }
@@ -945,12 +945,9 @@ index 0000000000..3f61fd2fa5
 +  request_token.message = &request_message;
 +
 +  request_callback_done = 0;
-+  status = efi_call_5 (b->create_event,
-+                       GRUB_EFI_EVT_NOTIFY_SIGNAL,
-+                       GRUB_EFI_TPL_CALLBACK,
-+                       grub_efi_http_request_callback,
-+                       NULL,
-+                       &request_token.event);
++  status = b->create_event(GRUB_EFI_EVT_NOTIFY_SIGNAL, GRUB_EFI_TPL_CALLBACK,
++			   grub_efi_http_request_callback, NULL,
++			   &request_token.event);
 +
 +  if (status != GRUB_EFI_SUCCESS)
 +    {
@@ -958,17 +955,17 @@ index 0000000000..3f61fd2fa5
 +      return grub_error (GRUB_ERR_IO, "Fail to create an event! status=0x%x\n", status);
 +    }
 +
-+  status = efi_call_2 (http->request, http, &request_token);
++  status = http->request(http, &request_token);
 +
 +  if (status != GRUB_EFI_SUCCESS)
 +    {
-+      efi_call_1 (b->close_event, request_token.event);
++      b->close_event(request_token.event);
 +      grub_free (request_data.url);
 +      return grub_error (GRUB_ERR_IO, "Fail to send a request! status=0x%x\n", status);
 +    }
 +  /* TODO: Add Timeout */
 +  while (!request_callback_done)
-+    efi_call_1(http->poll, http);
++    http->poll(http);
 +
 +  response_data.status_code = GRUB_EFI_HTTP_STATUS_UNSUPPORTED_STATUS;
 +  response_message.data.response = &response_data;
@@ -981,16 +978,13 @@ index 0000000000..3f61fd2fa5
 +  response_message.body = NULL;
 +  response_token.event = NULL;
 +
-+  status = efi_call_5 (b->create_event,
-+              GRUB_EFI_EVT_NOTIFY_SIGNAL,
-+              GRUB_EFI_TPL_CALLBACK,
-+              grub_efi_http_response_callback,
-+              NULL,
-+              &response_token.event);
++  status = b->create_event(GRUB_EFI_EVT_NOTIFY_SIGNAL, GRUB_EFI_TPL_CALLBACK,
++			   grub_efi_http_response_callback, NULL,
++			   &response_token.event);
 +
 +  if (status != GRUB_EFI_SUCCESS)
 +    {
-+      efi_call_1 (b->close_event, request_token.event);
++      b->close_event(request_token.event);
 +      grub_free (request_data.url);
 +      return grub_error (GRUB_ERR_IO, "Fail to create an event! status=0x%x\n", status);
 +    }
@@ -1000,28 +994,28 @@ index 0000000000..3f61fd2fa5
 +
 +  /* wait for HTTP response */
 +  response_callback_done = 0;
-+  status = efi_call_2 (http->response, http, &response_token);
++  status = http->response(http, &response_token);
 +
 +  if (status != GRUB_EFI_SUCCESS)
 +    {
-+      efi_call_1 (b->close_event, response_token.event);
-+      efi_call_1 (b->close_event, request_token.event);
++      b->close_event(response_token.event);
++      b->close_event(request_token.event);
 +      grub_free (request_data.url);
 +      return grub_error (GRUB_ERR_IO, "Fail to receive a response! status=%d\n", (int)status);
 +    }
 +
 +  /* TODO: Add Timeout */
 +  while (!response_callback_done)
-+    efi_call_1 (http->poll, http);
++    http->poll(http);
 +
 +  if (response_message.data.response->status_code != GRUB_EFI_HTTP_STATUS_200_OK)
 +    {
 +      grub_efi_http_status_code_t status_code = response_message.data.response->status_code;
 +
 +      if (response_message.headers)
-+	efi_call_1 (b->free_pool, response_message.headers);
-+      efi_call_1 (b->close_event, response_token.event);
-+      efi_call_1 (b->close_event, request_token.event);
++	b->free_pool(response_message.headers);
++      b->close_event(response_token.event);
++      b->close_event(request_token.event);
 +      grub_free (request_data.url);
 +      if (status_code == GRUB_EFI_HTTP_STATUS_404_NOT_FOUND)
 +	{
@@ -1049,9 +1043,9 @@ index 0000000000..3f61fd2fa5
 +    }
 +
 +  if (response_message.headers)
-+    efi_call_1 (b->free_pool, response_message.headers);
-+  efi_call_1 (b->close_event, response_token.event);
-+  efi_call_1 (b->close_event, request_token.event);
++    b->free_pool(response_message.headers);
++  b->close_event(response_token.event);
++  b->close_event(request_token.event);
 +  grub_free (request_data.url);
 +
 +  return GRUB_ERR_NONE;
@@ -1076,12 +1070,9 @@ index 0000000000..3f61fd2fa5
 +      return -1;
 +    }
 +
-+  efi_call_5 (b->create_event,
-+              GRUB_EFI_EVT_NOTIFY_SIGNAL,
-+              GRUB_EFI_TPL_CALLBACK,
-+              grub_efi_http_response_callback,
-+              NULL,
-+              &response_token.event);
++  b->create_event(GRUB_EFI_EVT_NOTIFY_SIGNAL, GRUB_EFI_TPL_CALLBACK,
++		  grub_efi_http_response_callback, NULL,
++		  &response_token.event);
 +
 +  while (len)
 +    {
@@ -1096,23 +1087,23 @@ index 0000000000..3f61fd2fa5
 +
 +      response_callback_done = 0;
 +
-+      status = efi_call_2 (http->response, http, &response_token);
++      status = http->response(http, &response_token);
 +      if (status != GRUB_EFI_SUCCESS)
 +	{
-+	  efi_call_1 (b->close_event, response_token.event);
++	  b->close_event(response_token.event);
 +	  grub_error (GRUB_ERR_IO, "Error! status=%d\n", (int)status);
 +	  return -1;
 +	}
 +
 +      while (!response_callback_done)
-+	efi_call_1(http->poll, http);
++	http->poll(http);
 +
 +      sum += response_message.body_length;
 +      buf += response_message.body_length;
 +      len -= response_message.body_length;
 +    }
 +
-+  efi_call_1 (b->close_event, response_token.event);
++  b->close_event(response_token.event);
 +
 +  return sum;
 +}
@@ -1195,7 +1186,7 @@ index 0000000000..3f61fd2fa5
 +  };
 diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c
 new file mode 100644
-index 0000000000..b711a5d945
+index 00000000000..1deba25e79e
 --- /dev/null
 +++ b/grub-core/net/efi/ip4_config.c
 @@ -0,0 +1,398 @@
@@ -1305,17 +1296,17 @@ index 0000000000..b711a5d945
 +  if (!interface_info)
 +    return NULL;
 +
-+  status = efi_call_4 (ip4_config->get_data, ip4_config,
-+		GRUB_EFI_IP4_CONFIG2_DATA_TYPE_INTERFACEINFO,
-+		&sz, interface_info);
++  status = ip4_config->get_data(ip4_config,
++				GRUB_EFI_IP4_CONFIG2_DATA_TYPE_INTERFACEINFO,
++				&sz, interface_info);
 +
 +  if (status == GRUB_EFI_BUFFER_TOO_SMALL)
 +    {
 +      grub_free (interface_info);
 +      interface_info = grub_malloc (sz);
-+      status = efi_call_4 (ip4_config->get_data, ip4_config,
-+		    GRUB_EFI_IP4_CONFIG2_DATA_TYPE_INTERFACEINFO,
-+		    &sz, interface_info);
++      status = ip4_config->get_data(ip4_config,
++				    GRUB_EFI_IP4_CONFIG2_DATA_TYPE_INTERFACEINFO,
++				    &sz, interface_info);
 +    }
 +
 +  if (status != GRUB_EFI_SUCCESS)
@@ -1339,9 +1330,9 @@ index 0000000000..b711a5d945
 +  if (!manual_address)
 +    return NULL;
 +
-+  status = efi_call_4 (ip4_config->get_data, ip4_config,
-+		    GRUB_EFI_IP4_CONFIG2_DATA_TYPE_MANUAL_ADDRESS,
-+		    &sz, manual_address);
++  status = ip4_config->get_data(ip4_config,
++				GRUB_EFI_IP4_CONFIG2_DATA_TYPE_MANUAL_ADDRESS,
++				&sz, manual_address);
 +
 +  if (status != GRUB_EFI_SUCCESS)
 +    {
@@ -1546,7 +1537,7 @@ index 0000000000..b711a5d945
 +	}
 +    }
 +
-+  status = efi_call_4 (dev->ip4_config->set_data, dev->ip4_config,
++  status = dev->ip4_config->set_data(dev->ip4_config,
 +		    GRUB_EFI_IP4_CONFIG2_DATA_TYPE_MANUAL_ADDRESS,
 +		    sizeof(*address), address);
 +
@@ -1562,9 +1553,9 @@ index 0000000000..b711a5d945
 +{
 +  grub_efi_status_t status;
 +
-+  status = efi_call_4 (dev->ip4_config->set_data, dev->ip4_config,
-+		GRUB_EFI_IP4_CONFIG2_DATA_TYPE_GATEWAY,
-+		sizeof (address->ip4), &address->ip4);
++  status = dev->ip4_config->set_data(dev->ip4_config,
++				     GRUB_EFI_IP4_CONFIG2_DATA_TYPE_GATEWAY,
++				     sizeof (address->ip4), &address->ip4);
 +
 +  if (status != GRUB_EFI_SUCCESS)
 +    return 0;
@@ -1578,9 +1569,9 @@ index 0000000000..b711a5d945
 +{
 +  grub_efi_status_t status;
 +
-+  status = efi_call_4 (dev->ip4_config->set_data, dev->ip4_config,
-+		GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
-+		sizeof (address->ip4), &address->ip4);
++  status = dev->ip4_config->set_data(dev->ip4_config,
++				     GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
++				     sizeof (address->ip4), &address->ip4);
 +
 +  if (status != GRUB_EFI_SUCCESS)
 +    return 0;
@@ -1599,7 +1590,7 @@ index 0000000000..b711a5d945
 +  };
 diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c
 new file mode 100644
-index 0000000000..017c4d05bc
+index 00000000000..29a03973265
 --- /dev/null
 +++ b/grub-core/net/efi/ip6_config.c
 @@ -0,0 +1,422 @@
@@ -1729,7 +1720,7 @@ index 0000000000..017c4d05bc
 +  sz = sizeof (*interface_info) + sizeof (*interface_info->route_table);
 +  interface_info = grub_malloc (sz);
 +
-+  status = efi_call_4 (ip6_config->get_data, ip6_config,
++  status = ip6_config->get_data(ip6_config,
 +		GRUB_EFI_IP6_CONFIG_DATA_TYPE_INTERFACEINFO,
 +		&sz, interface_info);
 +
@@ -1737,7 +1728,7 @@ index 0000000000..017c4d05bc
 +    {
 +      grub_free (interface_info);
 +      interface_info = grub_malloc (sz);
-+      status = efi_call_4 (ip6_config->get_data, ip6_config,
++      status = ip6_config->get_data(ip6_config,
 +		    GRUB_EFI_IP6_CONFIG_DATA_TYPE_INTERFACEINFO,
 +		    &sz, interface_info);
 +    }
@@ -1763,7 +1754,7 @@ index 0000000000..017c4d05bc
 +  if (!manual_address)
 +    return NULL;
 +
-+  status = efi_call_4 (ip6_config->get_data, ip6_config,
++  status = ip6_config->get_data(ip6_config,
 +		    GRUB_EFI_IP6_CONFIG_DATA_TYPE_MANUAL_ADDRESS,
 +		    &sz, manual_address);
 +
@@ -1974,7 +1965,7 @@ index 0000000000..017c4d05bc
 +	}
 +    }
 +
-+  status = efi_call_4 (dev->ip6_config->set_data, dev->ip6_config,
++  status = dev->ip6_config->set_data(dev->ip6_config,
 +		    GRUB_EFI_IP6_CONFIG_DATA_TYPE_MANUAL_ADDRESS,
 +		    sizeof(*address), address);
 +
@@ -1990,7 +1981,7 @@ index 0000000000..017c4d05bc
 +{
 +  grub_efi_status_t status;
 +
-+  status = efi_call_4 (dev->ip6_config->set_data, dev->ip6_config,
++  status = dev->ip6_config->set_data(dev->ip6_config,
 +		GRUB_EFI_IP6_CONFIG_DATA_TYPE_GATEWAY,
 +		sizeof (address->ip6), &address->ip6);
 +
@@ -2006,7 +1997,7 @@ index 0000000000..017c4d05bc
 +
 +  grub_efi_status_t status;
 +
-+  status = efi_call_4 (dev->ip6_config->set_data, dev->ip6_config,
++  status = dev->ip6_config->set_data(dev->ip6_config,
 +		GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
 +		sizeof (address->ip6), &address->ip6);
 +
@@ -2027,7 +2018,7 @@ index 0000000000..017c4d05bc
 +  };
 diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
 new file mode 100644
-index 0000000000..86bce6535d
+index 00000000000..1a19ee27144
 --- /dev/null
 +++ b/grub-core/net/efi/net.c
 @@ -0,0 +1,1428 @@
@@ -2050,15 +2041,15 @@ index 0000000000..86bce6535d
 +
 +#define GRUB_EFI_IP6_PREFIX_LENGTH 64
 +
-+static grub_efi_guid_t ip4_config_guid = GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID;
-+static grub_efi_guid_t ip6_config_guid = GRUB_EFI_IP6_CONFIG_PROTOCOL_GUID;
-+static grub_efi_guid_t http_service_binding_guid = GRUB_EFI_HTTP_SERVICE_BINDING_PROTOCOL_GUID;
-+static grub_efi_guid_t http_guid = GRUB_EFI_HTTP_PROTOCOL_GUID;
-+static grub_efi_guid_t pxe_io_guid = GRUB_EFI_PXE_GUID;
-+static grub_efi_guid_t dhcp4_service_binding_guid = GRUB_EFI_DHCP4_SERVICE_BINDING_PROTOCOL_GUID;
-+static grub_efi_guid_t dhcp4_guid = GRUB_EFI_DHCP4_PROTOCOL_GUID;
-+static grub_efi_guid_t dhcp6_service_binding_guid = GRUB_EFI_DHCP6_SERVICE_BINDING_PROTOCOL_GUID;
-+static grub_efi_guid_t dhcp6_guid = GRUB_EFI_DHCP6_PROTOCOL_GUID;
++static grub_guid_t ip4_config_guid = GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID;
++static grub_guid_t ip6_config_guid = GRUB_EFI_IP6_CONFIG_PROTOCOL_GUID;
++static grub_guid_t http_service_binding_guid = GRUB_EFI_HTTP_SERVICE_BINDING_PROTOCOL_GUID;
++static grub_guid_t http_guid = GRUB_EFI_HTTP_PROTOCOL_GUID;
++static grub_guid_t pxe_io_guid = GRUB_EFI_PXE_GUID;
++static grub_guid_t dhcp4_service_binding_guid = GRUB_EFI_DHCP4_SERVICE_BINDING_PROTOCOL_GUID;
++static grub_guid_t dhcp4_guid = GRUB_EFI_DHCP4_PROTOCOL_GUID;
++static grub_guid_t dhcp6_service_binding_guid = GRUB_EFI_DHCP6_SERVICE_BINDING_PROTOCOL_GUID;
++static grub_guid_t dhcp6_guid = GRUB_EFI_DHCP6_PROTOCOL_GUID;
 +
 +struct grub_efi_net_device *net_devices;
 +
@@ -2073,13 +2064,13 @@ index 0000000000..86bce6535d
 +#define efi_net_interface(m,...) efi_net_interface_ ## m (net_interface, ## __VA_ARGS__)
 +
 +static grub_efi_handle_t
-+grub_efi_locate_device_path (grub_efi_guid_t *protocol, grub_efi_device_path_t *device_path,
++grub_efi_locate_device_path (grub_guid_t *protocol, grub_efi_device_path_t *device_path,
 +                            grub_efi_device_path_t **r_device_path)
 +{
 +  grub_efi_handle_t handle;
 +  grub_efi_status_t status;
 +
-+  status = efi_call_3 (grub_efi_system_table->boot_services->locate_device_path,
++  status = grub_efi_system_table->boot_services->locate_device_path(
 +                      protocol, &device_path, &handle);
 +
 +  if (status != GRUB_EFI_SUCCESS)
@@ -2721,7 +2712,7 @@ index 0000000000..86bce6535d
 +}
 +
 +static grub_efi_handle_t
-+grub_efi_service_binding (grub_efi_handle_t dev, grub_efi_guid_t *service_binding_guid)
++grub_efi_service_binding (grub_efi_handle_t dev, grub_guid_t *service_binding_guid)
 +{
 +  grub_efi_service_binding_t *service;
 +  grub_efi_status_t status;
@@ -2734,7 +2725,7 @@ index 0000000000..86bce6535d
 +      return NULL;
 +    }
 +
-+  status = efi_call_2 (service->create_child, service, &child_dev);
++  status = service->create_child(service, &child_dev);
 +  if (status != GRUB_EFI_SUCCESS)
 +    {
 +      grub_error (GRUB_ERR_IO, N_("Failed to create child device of http service %x"), status);
@@ -2944,7 +2935,7 @@ index 0000000000..86bce6535d
 +    {
 +      grub_efi_ip4_config2_policy_t ip4_policy = GRUB_EFI_IP4_CONFIG2_POLICY_STATIC;
 +
-+      if (efi_call_4 (dev->ip4_config->set_data, dev->ip4_config,
++      if (dev->ip4_config->set_data(dev->ip4_config,
 +		    GRUB_EFI_IP4_CONFIG2_DATA_TYPE_POLICY,
 +		    sizeof (ip4_policy), &ip4_policy) != GRUB_EFI_SUCCESS)
 +	grub_dprintf ("efinetfs", "could not set GRUB_EFI_IP4_CONFIG2_POLICY_STATIC on dev `%s'", dev->card_name);
@@ -2953,7 +2944,7 @@ index 0000000000..86bce6535d
 +	{
 +	  grub_efi_ip6_config_policy_t ip6_policy = GRUB_EFI_IP6_CONFIG_POLICY_MANUAL;
 +
-+	  if (efi_call_4 (dev->ip6_config->set_data, dev->ip6_config,
++	  if (dev->ip6_config->set_data(dev->ip6_config,
 +		    GRUB_EFI_IP6_CONFIG_DATA_TYPE_POLICY,
 +		    sizeof (ip6_policy), &ip6_policy) != GRUB_EFI_SUCCESS)
 +	    grub_dprintf ("efinetfs", "could not set GRUB_EFI_IP6_CONFIG_POLICY_MANUAL on dev `%s'", dev->card_name);
@@ -3461,7 +3452,7 @@ index 0000000000..86bce6535d
 +}
 diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c
 new file mode 100644
-index 0000000000..531949cba5
+index 00000000000..b84f86ea470
 --- /dev/null
 +++ b/grub-core/net/efi/pxe.c
 @@ -0,0 +1,424 @@
@@ -3484,7 +3475,7 @@ index 0000000000..531949cba5
 +  if (!manual_address)
 +    return NULL;
 +
-+  status = efi_call_4 (ip6_config->get_data, ip6_config,
++  status = ip6_config->get_data(ip6_config,
 +		    GRUB_EFI_IP6_CONFIG_DATA_TYPE_MANUAL_ADDRESS,
 +		    &sz, manual_address);
 +
@@ -3509,7 +3500,7 @@ index 0000000000..531949cba5
 +  if (!manual_address)
 +    return NULL;
 +
-+  status = efi_call_4 (ip4_config->get_data, ip4_config,
++  status = ip4_config->get_data(ip4_config,
 +		    GRUB_EFI_IP4_CONFIG2_DATA_TYPE_MANUAL_ADDRESS,
 +		    &sz, manual_address);
 +
@@ -3532,7 +3523,7 @@ index 0000000000..531949cba5
 +  if (!mode->started)
 +    {
 +      grub_efi_status_t status;
-+      status = efi_call_2 (pxe->start, pxe, prefer_ip6);
++      status = pxe->start(pxe, prefer_ip6);
 +
 +      if (status != GRUB_EFI_SUCCESS)
 +	  grub_printf ("Couldn't start PXE\n");
@@ -3555,7 +3546,7 @@ index 0000000000..531949cba5
 +	  grub_efi_pxe_ip_address_t station_ip;
 +
 +	  grub_memcpy (station_ip.v6.addr, manual_address->address, sizeof (station_ip.v6.addr));
-+	  status = efi_call_3 (pxe->set_station_ip, pxe, &station_ip, NULL);
++	  status = pxe->set_station_ip(pxe, &station_ip, NULL);
 +
 +	  if (status != GRUB_EFI_SUCCESS)
 +	      grub_printf ("Couldn't set station ip\n");
@@ -3578,7 +3569,7 @@ index 0000000000..531949cba5
 +	  grub_memcpy (station_ip.v4.addr, manual_address->address, sizeof (station_ip.v4.addr));
 +	  grub_memcpy (subnet_mask.v4.addr, manual_address->subnet_mask, sizeof (subnet_mask.v4.addr));
 +
-+	  status = efi_call_3 (pxe->set_station_ip, pxe, &station_ip, &subnet_mask);
++	  status = pxe->set_station_ip(pxe, &station_ip, &subnet_mask);
 +
 +	  if (status != GRUB_EFI_SUCCESS)
 +	      grub_printf ("Couldn't set station ip\n");
@@ -3731,7 +3722,7 @@ index 0000000000..531949cba5
 +	server_ip.v4.addr[i] = grub_strtoul (p, &p, 10);
 +    }
 +
-+  status = efi_call_10 (pxe->mtftp,
++  status = pxe->mtftp(
 +	    pxe,
 +	    GRUB_EFI_PXE_BASE_CODE_TFTP_GET_FILE_SIZE,
 +	    NULL,
@@ -3816,7 +3807,7 @@ index 0000000000..531949cba5
 +	server_ip.v4.addr[i] = grub_strtoul (p, &p, 10);
 +    }
 +
-+  status = efi_call_10 (pxe->mtftp,
++  status = pxe->mtftp(
 +	    pxe,
 +	    GRUB_EFI_PXE_BASE_CODE_TFTP_READ_FILE,
 +	    buf,
@@ -3847,7 +3838,7 @@ index 0000000000..531949cba5
 +	  return 0;
 +	}
 +
-+      status = efi_call_10 (pxe->mtftp,
++      status = pxe->mtftp(
 +		pxe,
 +		GRUB_EFI_PXE_BASE_CODE_TFTP_READ_FILE,
 +		buf2,
@@ -3890,7 +3881,7 @@ index 0000000000..531949cba5
 +  };
 +
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 0ce5e675ed..55aed92722 100644
+index fa6b6537142..fdec64d55ee 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -32,6 +32,9 @@
@@ -3903,8 +3894,8 @@ index 0ce5e675ed..55aed92722 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -2033,8 +2036,49 @@ static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;
- static grub_command_t cmd_lsroutes, cmd_lscards;
+@@ -2092,8 +2095,49 @@ static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;
+ static grub_command_t cmd_setvlan, cmd_lsroutes, cmd_lscards;
  static grub_command_t cmd_lsaddr, cmd_slaac;
  
 +#ifdef GRUB_MACHINE_EFI
@@ -3953,7 +3944,7 @@ index 0ce5e675ed..55aed92722 100644
    grub_register_variable_hook ("net_default_server", defserver_get_env,
  			       defserver_set_env);
    grub_env_export ("net_default_server");
-@@ -2082,10 +2126,37 @@ GRUB_MOD_INIT(net)
+@@ -2144,10 +2188,37 @@ GRUB_MOD_INIT(net)
  						grub_net_restore_hw,
  						GRUB_LOADER_PREBOOT_HOOK_PRIO_DISK);
    grub_net_poll_cards_idle = grub_net_poll_cards_idle_real;
@@ -3991,16 +3982,16 @@ index 0ce5e675ed..55aed92722 100644
    grub_register_variable_hook ("net_default_server", 0, 0);
    grub_register_variable_hook ("pxe_default_server", 0, 0);
  
-@@ -2104,4 +2175,7 @@ GRUB_MOD_FINI(net)
+@@ -2166,4 +2237,7 @@ GRUB_MOD_FINI(net)
    grub_net_fini_hw (0);
    grub_loader_unregister_preboot_hook (fini_hnd);
-   grub_net_poll_cards_idle = grub_net_poll_cards_idle_real;
+   grub_net_poll_cards_idle = NULL;
 +#ifdef GRUB_MACHINE_EFI
 +  init_mode = INIT_MODE_NONE;
 +#endif
  }
 diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
-index a2461cda1c..77958dd9dd 100644
+index 46f304c2b47..11c9db11775 100644
 --- a/util/grub-mknetdir.c
 +++ b/util/grub-mknetdir.c
 @@ -32,13 +32,15 @@
@@ -4055,7 +4046,7 @@ index a2461cda1c..77958dd9dd 100644
  {
    const char *mkimage_target;
    const char *netmodule;
-@@ -156,6 +161,7 @@ process_input_dir (const char *input_dir, enum grub_install_plat platform)
+@@ -157,6 +162,7 @@ process_input_dir (const char *input_dir, enum grub_install_plat platform)
    grub_install_push_module (targets[platform].netmodule);
  
    output = grub_util_path_concat_ext (2, grubdir, "core", targets[platform].ext);
@@ -4063,7 +4054,7 @@ index a2461cda1c..77958dd9dd 100644
    grub_install_make_image_wrap (input_dir, prefix, output,
  				0, load_cfg,
  				targets[platform].mkimage_target, 0);
-@@ -195,7 +201,16 @@ main (int argc, char *argv[])
+@@ -196,7 +202,16 @@ main (int argc, char *argv[])
  
    grub_install_mkdir_p (base);
  
@@ -4082,10 +4073,10 @@ index a2461cda1c..77958dd9dd 100644
    if (!grub_install_source_directory)
      {
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 0b490195ad..f431f49973 100644
+index 248d6a28ff9..805a9d7adf9 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -622,6 +622,23 @@ typedef union
+@@ -668,6 +668,23 @@ typedef union
  
  typedef grub_efi_uint64_t grub_efi_physical_address_t;
  typedef grub_efi_uint64_t grub_efi_virtual_address_t;
@@ -4107,9 +4098,9 @@ index 0b490195ad..f431f49973 100644
 +    grub_efi_pxe_ipv6_address_t v6;
 +} grub_efi_pxe_ip_address_t;
  
- struct grub_efi_guid
- {
-@@ -889,6 +906,8 @@ struct grub_efi_ipv6_device_path
+ /* XXX although the spec does not specify the padding, this actually
+    must have the padding!  */
+@@ -917,6 +934,8 @@ struct grub_efi_ipv6_device_path
    grub_efi_uint16_t remote_port;
    grub_efi_uint16_t protocol;
    grub_efi_uint8_t static_ip_address;
@@ -4118,7 +4109,7 @@ index 0b490195ad..f431f49973 100644
  } GRUB_PACKED;
  typedef struct grub_efi_ipv6_device_path grub_efi_ipv6_device_path_t;
  
-@@ -938,6 +957,15 @@ struct grub_efi_uri_device_path
+@@ -975,6 +994,15 @@ struct grub_efi_uri_device_path
  } GRUB_PACKED;
  typedef struct grub_efi_uri_device_path grub_efi_uri_device_path_t;
  
@@ -4134,7 +4125,7 @@ index 0b490195ad..f431f49973 100644
  #define GRUB_EFI_VENDOR_MESSAGING_DEVICE_PATH_SUBTYPE	10
  
  /* Media Device Path.  */
-@@ -1020,6 +1048,23 @@ struct grub_efi_bios_device_path
+@@ -1057,6 +1085,23 @@ struct grub_efi_bios_device_path
  } GRUB_PACKED;
  typedef struct grub_efi_bios_device_path grub_efi_bios_device_path_t;
  
@@ -4158,7 +4149,7 @@ index 0b490195ad..f431f49973 100644
  struct grub_efi_open_protocol_information_entry
  {
    grub_efi_handle_t agent_handle;
-@@ -1569,23 +1614,27 @@ typedef struct grub_efi_pxe_tftp_error
+@@ -1617,23 +1662,27 @@ typedef struct grub_efi_pxe_tftp_error
    grub_efi_char8_t error_string[127];
  } grub_efi_pxe_tftp_error_t;
  
@@ -4200,18 +4191,27 @@ index 0b490195ad..f431f49973 100644
  
  #define GRUB_EFI_PXE_BASE_CODE_MAX_IPCNT 8
  typedef struct grub_efi_pxe_ip_filter
-@@ -1652,17 +1701,31 @@ typedef struct grub_efi_pxe_mode
+@@ -1700,18 +1749,31 @@ typedef struct grub_efi_pxe_mode
  typedef struct grub_efi_pxe
  {
    grub_uint64_t rev;
--  void (*start) (void);
+-  void *start;
+-  void *stop;
+-  void *dhcp;
+-  void *discover;
+-  void *mftp;
+-  void *udpwrite;
+-  void *udpread;
+-  void *setipfilter;
+-  void *arp;
+-  void *setparams;
+-  void *setstationip;
+-  void *setpackets;
 +  grub_efi_status_t (*start) (struct grub_efi_pxe *this, grub_efi_boolean_t use_ipv6);
-   void (*stop) (void);
--  void (*dhcp) (void);
++  void (*stop) (void);
 +  grub_efi_status_t (*dhcp) (struct grub_efi_pxe *this,
 +			    grub_efi_boolean_t sort_offers);
-   void (*discover) (void);
--  void (*mftp) (void);
++  void (*discover) (void);
 +  grub_efi_status_t (*mtftp) (struct grub_efi_pxe *this,
 +			    grub_efi_pxe_base_code_tftp_opcode_t operation,
 +			    void *buffer_ptr,
@@ -4223,20 +4223,19 @@ index 0b490195ad..f431f49973 100644
 +			    grub_efi_char8_t *filename,
 +			    grub_efi_pxe_base_code_mtftp_info_t *info,
 +			    grub_efi_boolean_t dont_use_buffer);
-   void (*udpwrite) (void);
-   void (*udpread) (void);
-   void (*setipfilter) (void);
-   void (*arp) (void);
-   void (*setparams) (void);
--  void (*setstationip) (void);
++  void (*udpwrite) (void);
++  void (*udpread) (void);
++  void (*setipfilter) (void);
++  void (*arp) (void);
++  void (*setparams) (void);
 +  grub_efi_status_t (*set_station_ip) (struct grub_efi_pxe *this,
 +			    grub_efi_pxe_ip_address_t *new_station_ip,
 +			    grub_efi_pxe_ip_address_t *new_subnet_mask);
-+  //void (*setstationip) (void);
-   void (*setpackets) (void);
++  void (*setpackets) (void);
    struct grub_efi_pxe_mode *mode;
  } grub_efi_pxe_t;
-@@ -1924,6 +1987,44 @@ struct grub_efi_ip4_config2_protocol
+ 
+@@ -2005,6 +2067,44 @@ struct grub_efi_ip4_config2_protocol
  };
  typedef struct grub_efi_ip4_config2_protocol grub_efi_ip4_config2_protocol_t;
  
@@ -4281,7 +4280,7 @@ index 0b490195ad..f431f49973 100644
  enum grub_efi_ip6_config_data_type {
    GRUB_EFI_IP6_CONFIG_DATA_TYPE_INTERFACEINFO,
    GRUB_EFI_IP6_CONFIG_DATA_TYPE_ALT_INTERFACEID,
-@@ -1958,6 +2059,49 @@ struct grub_efi_ip6_config_protocol
+@@ -2039,6 +2139,49 @@ struct grub_efi_ip6_config_protocol
  };
  typedef struct grub_efi_ip6_config_protocol grub_efi_ip6_config_protocol_t;
  
@@ -4328,12 +4327,12 @@ index 0b490195ad..f431f49973 100644
 +};
 +typedef struct grub_efi_ip6_config_manual_address grub_efi_ip6_config_manual_address_t;
 +
- #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \
-   || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \
-   || defined(__riscv)
+ struct initrd_media_device_path {
+   grub_efi_vendor_media_device_path_t  vendor;
+   grub_efi_device_path_t               end;
 diff --git a/include/grub/efi/dhcp.h b/include/grub/efi/dhcp.h
 new file mode 100644
-index 0000000000..fdb88eb810
+index 00000000000..fdb88eb810e
 --- /dev/null
 +++ b/include/grub/efi/dhcp.h
 @@ -0,0 +1,343 @@
@@ -4682,7 +4681,7 @@ index 0000000000..fdb88eb810
 +#endif /* ! GRUB_EFI_DHCP_HEADER */
 diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h
 new file mode 100644
-index 0000000000..c5e9a89f50
+index 00000000000..c5e9a89f505
 --- /dev/null
 +++ b/include/grub/efi/http.h
 @@ -0,0 +1,215 @@
@@ -4903,7 +4902,7 @@ index 0000000000..c5e9a89f50
 +#endif /* !GRUB_EFI_HTTP_HEADER */
 diff --git a/include/grub/net/efi.h b/include/grub/net/efi.h
 new file mode 100644
-index 0000000000..de90d223e8
+index 00000000000..de90d223e8e
 --- /dev/null
 +++ b/include/grub/net/efi.h
 @@ -0,0 +1,144 @@
diff --git a/0081-AUDIT-0-http-boot-tracker-bug.patch b/0071-AUDIT-0-http-boot-tracker-bug.patch
similarity index 82%
rename from 0081-AUDIT-0-http-boot-tracker-bug.patch
rename to 0071-AUDIT-0-http-boot-tracker-bug.patch
index b4872711..db7f9c75 100644
--- a/0081-AUDIT-0-http-boot-tracker-bug.patch
+++ b/0071-AUDIT-0-http-boot-tracker-bug.patch
@@ -18,11 +18,11 @@ signed code is allowed to be executed.
 Signed-off-by: Michael Chang <mchang@suse.com>
 ---
  grub-core/net/efi/net.c | 4 +++-
- grub-core/net/http.c    | 5 ++++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
+ grub-core/net/http.c    | 8 +++++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index 86bce6535d..4bb308026c 100644
+index 1a19ee27144..ed04f05ad21 100644
 --- a/grub-core/net/efi/net.c
 +++ b/grub-core/net/efi/net.c
 @@ -645,8 +645,10 @@ grub_efihttp_chunk_read (grub_file_t file, char *buf,
@@ -38,20 +38,23 @@ index 86bce6535d..4bb308026c 100644
        if (buf)
  	{
 diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index 12a2632ea5..b52b558d63 100644
+index f389bf03d96..af486198399 100644
 --- a/grub-core/net/http.c
 +++ b/grub-core/net/http.c
-@@ -31,7 +31,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
+@@ -29,7 +29,11 @@
  
- enum
-   {
--    HTTP_PORT = 80
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+-#define HTTP_PORT	((grub_uint16_t) 80)
++enum
++  {
 +    HTTP_PORT = 80,
 +    HTTP_MAX_CHUNK_SIZE = 0x80000000
-   };
++  };
  
- 
-@@ -78,6 +79,8 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len)
+ typedef struct http_data
+ {
+@@ -82,6 +86,8 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len)
    if (data->in_chunk_len == 2)
      {
        data->chunk_rem = grub_strtoul (ptr, 0, 16);
diff --git a/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/0072-grub-editenv-Add-incr-command-to-increment-integer-v.patch
similarity index 98%
rename from 0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch
rename to 0072-grub-editenv-Add-incr-command-to-increment-integer-v.patch
index 6e2e4e27..f8de42a3 100644
--- a/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch
+++ b/0072-grub-editenv-Add-incr-command-to-increment-integer-v.patch
@@ -17,7 +17,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  1 file changed, 50 insertions(+)
 
 diff --git a/util/grub-editenv.c b/util/grub-editenv.c
-index db6f187cc6..948eec8a11 100644
+index db6f187cc63..948eec8a114 100644
 --- a/util/grub-editenv.c
 +++ b/util/grub-editenv.c
 @@ -53,6 +53,9 @@ static struct argp_option options[] = {
diff --git a/0083-Add-auto-hide-menu-support.patch b/0073-Add-auto-hide-menu-support.patch
similarity index 94%
rename from 0083-Add-auto-hide-menu-support.patch
rename to 0073-Add-auto-hide-menu-support.patch
index f5aed0e0..5b9a0d7a 100644
--- a/0083-Add-auto-hide-menu-support.patch
+++ b/0073-Add-auto-hide-menu-support.patch
@@ -43,10 +43,10 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  create mode 100644 util/grub.d/01_menu_auto_hide.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 48512bc631..314e6f2acf 100644
+index 1079add5bbe..5b9f85d4869 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -458,6 +458,12 @@ script = {
+@@ -461,6 +461,12 @@ script = {
    installdir = grubconf;
  };
  
@@ -61,7 +61,7 @@ index 48512bc631..314e6f2acf 100644
    common = util/grub.d/01_users.in;
 diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/01_menu_auto_hide.in
 new file mode 100644
-index 0000000000..ad175870a5
+index 00000000000..ad175870a54
 --- /dev/null
 +++ b/util/grub.d/01_menu_auto_hide.in
 @@ -0,0 +1,48 @@
@@ -114,7 +114,7 @@ index 0000000000..ad175870a5
 +fi
 +EOF
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 4b27bd2015..3c9431cfcf 100644
+index d7d423b2eaf..18fe02cefd8 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -42,6 +42,7 @@ if [ -z "${OSPROBED}" ] ; then
@@ -125,7 +125,7 @@ index 4b27bd2015..3c9431cfcf 100644
      # TRANSLATORS: it refers on the OS residing on device %s
      onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
      hints=""
-@@ -102,6 +103,7 @@ for OS in ${OSPROBED} ; do
+@@ -106,6 +107,7 @@ for OS in ${OSPROBED} ; do
  
    case ${BOOT} in
      chain)
@@ -133,7 +133,7 @@ index 4b27bd2015..3c9431cfcf 100644
  
  	  onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
-@@ -132,6 +134,7 @@ EOF
+@@ -136,6 +138,7 @@ EOF
  EOF
      ;;
      efi)
@@ -141,7 +141,7 @@ index 4b27bd2015..3c9431cfcf 100644
  
  	EFIPATH=${DEVICE#*@}
  	DEVICE=${DEVICE%@*}
-@@ -176,6 +179,7 @@ EOF
+@@ -180,6 +183,7 @@ EOF
  	  LINITRD="${LINITRD#/boot}"
  	fi
  
@@ -149,7 +149,7 @@ index 4b27bd2015..3c9431cfcf 100644
  	onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
  	recovery_params="$(echo "${LPARAMS}" | grep single)" || true
  	counter=1
-@@ -257,6 +261,7 @@ EOF
+@@ -261,6 +265,7 @@ EOF
        done
      ;;
      hurd)
@@ -157,7 +157,7 @@ index 4b27bd2015..3c9431cfcf 100644
        onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
  menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' {
-@@ -283,6 +288,7 @@ EOF
+@@ -287,6 +292,7 @@ EOF
  EOF
      ;;
      minix)
@@ -165,7 +165,7 @@ index 4b27bd2015..3c9431cfcf 100644
  	  cat << EOF
  menuentry "${LONGNAME} (on ${DEVICE}, Multiboot)" {
  EOF
-@@ -299,3 +305,15 @@ EOF
+@@ -303,3 +309,15 @@ EOF
      ;;
    esac
  done
diff --git a/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
deleted file mode 100644
index 307e33cf..00000000
--- a/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aaron Miller <aaronmiller@fb.com>
-Date: Fri, 29 Jul 2016 17:41:38 +0800
-Subject: [PATCH] net: read bracketed ipv6 addrs and port numbers
-
-Allow specifying port numbers for http and tftp paths, and allow ipv6 addresses
-to be recognized with brackets around them, which is required to specify a port
-number
-
-Signed-off-by: Aaron Miller <aaronmiller@fb.com>
-[pjones: various bug fixes]
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/net/http.c | 25 ++++++++++++---
- grub-core/net/net.c  | 87 +++++++++++++++++++++++++++++++++++++++++++++++++---
- grub-core/net/tftp.c |  8 +++--
- include/grub/net.h   |  1 +
- 4 files changed, 109 insertions(+), 12 deletions(-)
-
-diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index b616cf40b1..12a2632ea5 100644
---- a/grub-core/net/http.c
-+++ b/grub-core/net/http.c
-@@ -289,7 +289,9 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)),
- 	  nb2 = grub_netbuff_alloc (data->chunk_rem);
- 	  if (!nb2)
- 	    return grub_errno;
--	  grub_netbuff_put (nb2, data->chunk_rem);
-+	  err = grub_netbuff_put (nb2, data->chunk_rem);
-+	  if (err)
-+	    return grub_errno;
- 	  grub_memcpy (nb2->data, nb->data, data->chunk_rem);
- 	  if (file->device->net->packs.count >= 20)
- 	    {
-@@ -312,12 +314,14 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
-   int i;
-   struct grub_net_buff *nb;
-   grub_err_t err;
-+  char* server = file->device->net->server;
-+  int port = file->device->net->port;
- 
-   nb = grub_netbuff_alloc (GRUB_NET_TCP_RESERVE_SIZE
- 			   + sizeof ("GET ") - 1
- 			   + grub_strlen (data->filename)
- 			   + sizeof (" HTTP/1.1\r\nHost: ") - 1
--			   + grub_strlen (file->device->net->server)
-+			   + grub_strlen (server) + sizeof (":XXXXXXXXXX")
- 			   + sizeof ("\r\nUser-Agent: " PACKAGE_STRING
- 				     "\r\n") - 1
- 			   + sizeof ("Range: bytes=XXXXXXXXXXXXXXXXXXXX"
-@@ -356,7 +360,7 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
- 	       sizeof (" HTTP/1.1\r\nHost: ") - 1);
- 
-   ptr = nb->tail;
--  err = grub_netbuff_put (nb, grub_strlen (file->device->net->server));
-+  err = grub_netbuff_put (nb, grub_strlen (server));
-   if (err)
-     {
-       grub_netbuff_free (nb);
-@@ -365,6 +369,15 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
-   grub_memcpy (ptr, file->device->net->server,
- 	       grub_strlen (file->device->net->server));
- 
-+  if (port)
-+    {
-+      ptr = nb->tail;
-+      grub_snprintf ((char *) ptr,
-+	  sizeof (":XXXXXXXXXX"),
-+	  ":%d",
-+	  port);
-+    }
-+
-   ptr = nb->tail;
-   err = grub_netbuff_put (nb, 
- 			  sizeof ("\r\nUser-Agent: " PACKAGE_STRING "\r\n")
-@@ -390,8 +403,10 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
-   grub_netbuff_put (nb, 2);
-   grub_memcpy (ptr, "\r\n", 2);
- 
--  data->sock = grub_net_tcp_open (file->device->net->server,
--				  HTTP_PORT, http_receive,
-+  grub_dprintf ("http", "opening path %s on host %s TCP port %d\n",
-+		data->filename, server, port ? port : HTTP_PORT);
-+  data->sock = grub_net_tcp_open (server,
-+				  port ? port : HTTP_PORT, http_receive,
- 				  http_err, NULL,
- 				  file);
-   if (!data->sock)
-diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index a46f82362e..0ce5e675ed 100644
---- a/grub-core/net/net.c
-+++ b/grub-core/net/net.c
-@@ -444,6 +444,13 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
-   grub_uint16_t newip[8];
-   const char *ptr = val;
-   int word, quaddot = -1;
-+  int bracketed = 0;
-+
-+  if (ptr[0] == '[')
-+    {
-+      bracketed = 1;
-+      ptr++;
-+    }
- 
-   if (ptr[0] == ':' && ptr[1] != ':')
-     return 0;
-@@ -482,6 +489,8 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
-       grub_memset (&newip[quaddot], 0, (7 - word) * sizeof (newip[0]));
-     }
-   grub_memcpy (ip, newip, 16);
-+  if (bracketed && *ptr == ']')
-+    ptr++;
-   if (rest)
-     *rest = ptr;
-   return 1;
-@@ -1343,8 +1352,10 @@ grub_net_open_real (const char *name)
- {
-   grub_net_app_level_t proto;
-   const char *protname, *server;
-+  char *host;
-   grub_size_t protnamelen;
-   int try;
-+  int port = 0;
- 
-   if (grub_strncmp (name, "pxe:", sizeof ("pxe:") - 1) == 0)
-     {
-@@ -1382,6 +1393,72 @@ grub_net_open_real (const char *name)
-       return NULL;
-     }  
- 
-+  char* port_start;
-+  /* ipv6 or port specified? */
-+  if ((port_start = grub_strchr (server, ':')))
-+    {
-+      char* ipv6_begin;
-+      if((ipv6_begin = grub_strchr (server, '[')))
-+	{
-+	  char* ipv6_end = grub_strchr (server, ']');
-+	  if(!ipv6_end)
-+	    {
-+	      grub_error (GRUB_ERR_NET_BAD_ADDRESS,
-+		      N_("mismatched [ in address"));
-+	      return NULL;
-+	    }
-+	  /* port number after bracketed ipv6 addr */
-+	  if(ipv6_end[1] == ':')
-+	    {
-+	      port = grub_strtoul (ipv6_end + 2, NULL, 10);
-+	      if(port > 65535)
-+		{
-+		  grub_error (GRUB_ERR_NET_BAD_ADDRESS,
-+			  N_("bad port number"));
-+		  return NULL;
-+		}
-+	    }
-+	  host = grub_strndup (ipv6_begin, (ipv6_end - ipv6_begin) + 1);
-+	}
-+      else
-+	{
-+	  if (grub_strchr (port_start + 1, ':'))
-+	    {
-+	      int iplen = grub_strlen (server);
-+	      /* bracket bare ipv6 addrs */
-+	      host = grub_malloc (iplen + 3);
-+	      if(!host)
-+		{
-+		  return NULL;
-+		}
-+	      host[0] = '[';
-+	      grub_memcpy (host + 1, server, iplen);
-+	      host[iplen + 1] = ']';
-+	      host[iplen + 2] = '\0';
-+	    }
-+	  else
-+	    {
-+	      /* hostname:port or ipv4:port */
-+	      port = grub_strtol (port_start + 1, NULL, 10);
-+	      if(port > 65535)
-+		{
-+		  grub_error (GRUB_ERR_NET_BAD_ADDRESS,
-+			  N_("bad port number"));
-+		  return NULL;
-+		}
-+	      host = grub_strndup (server, port_start - server);
-+	    }
-+	}
-+    }
-+  else
-+    {
-+      host = grub_strdup (server);
-+    }
-+  if (!host)
-+    {
-+      return NULL;
-+    }
-+
-   for (try = 0; try < 2; try++)
-     {
-       FOR_NET_APP_LEVEL (proto)
-@@ -1391,14 +1468,13 @@ grub_net_open_real (const char *name)
- 	  {
- 	    grub_net_t ret = grub_zalloc (sizeof (*ret));
- 	    if (!ret)
--	      return NULL;
--	    ret->protocol = proto;
--	    ret->server = grub_strdup (server);
--	    if (!ret->server)
- 	      {
--		grub_free (ret);
-+		grub_free (host);
- 		return NULL;
- 	      }
-+	    ret->protocol = proto;
-+	    ret->port = port;
-+	    ret->server = host;
- 	    ret->fs = &grub_net_fs;
- 	    return ret;
- 	  }
-@@ -1473,6 +1549,7 @@ grub_net_open_real (const char *name)
-   grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("disk `%s' not found"),
- 	      name);
- 
-+  grub_free (host);
-   return NULL;
- }
- 
-diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 4ab2f5c735..d54b13f09f 100644
---- a/grub-core/net/tftp.c
-+++ b/grub-core/net/tftp.c
-@@ -295,6 +295,7 @@ tftp_open (struct grub_file *file, const char *filename)
-   grub_err_t err;
-   grub_uint8_t *nbd;
-   grub_net_network_level_address_t addr;
-+  int port = file->device->net->port;
- 
-   data = grub_zalloc (sizeof (*data));
-   if (!data)
-@@ -362,14 +363,17 @@ tftp_open (struct grub_file *file, const char *filename)
-   err = grub_net_resolve_address (file->device->net->server, &addr);
-   if (err)
-     {
--      grub_dprintf("tftp", "Address resolution failed: %d\n", err);
-+      grub_dprintf ("tftp", "Address resolution failed: %d\n", err);
-+      grub_dprintf ("tftp", "file_size is %llu, block_size is %llu\n",
-+		    (unsigned long long)data->file_size,
-+		    (unsigned long long)data->block_size);
-       grub_free (data);
-       return err;
-     }
- 
-   grub_dprintf("tftp", "opening connection\n");
-   data->sock = grub_net_udp_open (addr,
--				  TFTP_SERVER_PORT, tftp_receive,
-+				  port ? port : TFTP_SERVER_PORT, tftp_receive,
- 				  file);
-   if (!data->sock)
-     {
-diff --git a/include/grub/net.h b/include/grub/net.h
-index af0404db7e..d55d505a03 100644
---- a/include/grub/net.h
-+++ b/include/grub/net.h
-@@ -273,6 +273,7 @@ typedef struct grub_net
- {
-   char *server;
-   char *name;
-+  int port;
-   grub_net_app_level_t protocol;
-   grub_net_packets_t packs;
-   grub_off_t offset;
diff --git a/0084-Add-grub-set-bootflag-utility.patch b/0074-Add-grub-set-bootflag-utility.patch
similarity index 97%
rename from 0084-Add-grub-set-bootflag-utility.patch
rename to 0074-Add-grub-set-bootflag-utility.patch
index 4ee43cf4..f6dc7314 100644
--- a/0084-Add-grub-set-bootflag-utility.patch
+++ b/0074-Add-grub-set-bootflag-utility.patch
@@ -49,10 +49,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 docs/man/grub-set-bootflag.h2m
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 314e6f2acf..0b85a7fce4 100644
+index 5b9f85d4869..01096ded815 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1446,3 +1446,10 @@ program = {
+@@ -1468,3 +1468,10 @@ program = {
    ldadd = grub-core/lib/gnulib/libgnu.a;
    ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };
@@ -65,7 +65,7 @@ index 314e6f2acf..0b85a7fce4 100644
 +};
 diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
 new file mode 100644
-index 0000000000..d506f7e75b
+index 00000000000..d506f7e75bc
 --- /dev/null
 +++ b/util/grub-set-bootflag.c
 @@ -0,0 +1,172 @@
@@ -242,7 +242,7 @@ index 0000000000..d506f7e75b
 +  return 0;
 +}
 diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index 8f1485d52a..ad235de7fc 100644
+index 5e7126f9878..26ac8765e30 100644
 --- a/conf/Makefile.extra-dist
 +++ b/conf/Makefile.extra-dist
 @@ -15,6 +15,9 @@ EXTRA_DIST += docs/man
@@ -257,7 +257,7 @@ index 8f1485d52a..ad235de7fc 100644
  
 diff --git a/docs/grub-boot-success.service b/docs/grub-boot-success.service
 new file mode 100644
-index 0000000000..80e79584c9
+index 00000000000..80e79584c91
 --- /dev/null
 +++ b/docs/grub-boot-success.service
 @@ -0,0 +1,6 @@
@@ -269,7 +269,7 @@ index 0000000000..80e79584c9
 +ExecStart=/usr/sbin/grub2-set-bootflag boot_success
 diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer
 new file mode 100644
-index 0000000000..406f172005
+index 00000000000..406f1720056
 --- /dev/null
 +++ b/docs/grub-boot-success.timer
 @@ -0,0 +1,7 @@
@@ -282,7 +282,7 @@ index 0000000000..406f172005
 +OnActiveSec=2min
 diff --git a/docs/man/grub-set-bootflag.h2m b/docs/man/grub-set-bootflag.h2m
 new file mode 100644
-index 0000000000..94ec0b92ed
+index 00000000000..94ec0b92ede
 --- /dev/null
 +++ b/docs/man/grub-set-bootflag.h2m
 @@ -0,0 +1,2 @@
diff --git a/0085-docs-Add-grub-boot-indeterminate.service-example.patch b/0075-docs-Add-grub-boot-indeterminate.service-example.patch
similarity index 97%
rename from 0085-docs-Add-grub-boot-indeterminate.service-example.patch
rename to 0075-docs-Add-grub-boot-indeterminate.service-example.patch
index 96eff368..44f6ad39 100644
--- a/0085-docs-Add-grub-boot-indeterminate.service-example.patch
+++ b/0075-docs-Add-grub-boot-indeterminate.service-example.patch
@@ -16,7 +16,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 
 diff --git a/docs/grub-boot-indeterminate.service b/docs/grub-boot-indeterminate.service
 new file mode 100644
-index 0000000000..6c8dcb186b
+index 00000000000..6c8dcb186b6
 --- /dev/null
 +++ b/docs/grub-boot-indeterminate.service
 @@ -0,0 +1,11 @@
diff --git a/0086-gentpl-add-disable-support.patch b/0076-gentpl-add-disable-support.patch
similarity index 89%
rename from 0086-gentpl-add-disable-support.patch
rename to 0076-gentpl-add-disable-support.patch
index 3b305e65..949cfe8f 100644
--- a/0086-gentpl-add-disable-support.patch
+++ b/0076-gentpl-add-disable-support.patch
@@ -9,10 +9,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/gentpl.py b/gentpl.py
-index c86550d4f9..f3c5f84f85 100644
+index bfab2113a1d..6cad9b8231f 100644
 --- a/gentpl.py
 +++ b/gentpl.py
-@@ -592,11 +592,21 @@ def platform_conditional(platform, closure):
+@@ -594,11 +594,21 @@ def platform_conditional(platform, closure):
  #  };
  #
  def foreach_enabled_platform(defn, closure):
@@ -35,7 +35,7 @@ index c86550d4f9..f3c5f84f85 100644
          for platform in GRUB_PLATFORMS:
              platform_conditional(platform, closure)
  
-@@ -655,6 +665,8 @@ def first_time(defn, snippet):
+@@ -657,6 +667,8 @@ def first_time(defn, snippet):
  def is_platform_independent(defn):
      if 'enable' in defn:
          return False
diff --git a/0087-gentpl-add-pc-firmware-type.patch b/0077-gentpl-add-pc-firmware-type.patch
similarity index 74%
rename from 0087-gentpl-add-pc-firmware-type.patch
rename to 0077-gentpl-add-pc-firmware-type.patch
index 0bfd2eac..608582a5 100644
--- a/0087-gentpl-add-pc-firmware-type.patch
+++ b/0077-gentpl-add-pc-firmware-type.patch
@@ -9,14 +9,14 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/gentpl.py b/gentpl.py
-index f3c5f84f85..f09b336869 100644
+index 6cad9b8231f..597129a2bc4 100644
 --- a/gentpl.py
 +++ b/gentpl.py
-@@ -51,6 +51,7 @@ GROUPS["riscv32"]  = [ "riscv32_efi" ]
- GROUPS["riscv64"]  = [ "riscv64_efi" ]
+@@ -52,6 +52,7 @@ GROUPS["riscv32"]     = [ "riscv32_efi" ]
+ GROUPS["riscv64"]     = [ "riscv64_efi" ]
  
  # Groups based on firmware
 +GROUPS["pc"] = [ "i386_pc" ]
  GROUPS["efi"]  = [ "i386_efi", "x86_64_efi", "ia64_efi", "arm_efi", "arm64_efi",
- 		   "riscv32_efi", "riscv64_efi" ]
+ 		   "loongarch64_efi", "riscv32_efi", "riscv64_efi" ]
  GROUPS["ieee1275"]   = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ]
diff --git a/0088-efinet-also-use-the-firmware-acceleration-for-http.patch b/0078-efinet-also-use-the-firmware-acceleration-for-http.patch
similarity index 96%
rename from 0088-efinet-also-use-the-firmware-acceleration-for-http.patch
rename to 0078-efinet-also-use-the-firmware-acceleration-for-http.patch
index a3a94002..8ce3e014 100644
--- a/0088-efinet-also-use-the-firmware-acceleration-for-http.patch
+++ b/0078-efinet-also-use-the-firmware-acceleration-for-http.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index 4bb308026c..6603cd83ed 100644
+index ed04f05ad21..1f7e1b63557 100644
 --- a/grub-core/net/efi/net.c
 +++ b/grub-core/net/efi/net.c
 @@ -1324,7 +1324,9 @@ grub_efi_net_boot_from_https (void)
diff --git a/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch b/0079-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
similarity index 93%
rename from 0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
rename to 0079-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
index 90d97773..6f98f25e 100644
--- a/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
+++ b/0079-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 19 insertions(+)
 
 diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index 3f61fd2fa5..243acbaa35 100644
+index de28badccb0..b94dbc68eef 100644
 --- a/grub-core/net/efi/http.c
 +++ b/grub-core/net/efi/http.c
 @@ -4,6 +4,7 @@
@@ -23,7 +23,7 @@ index 3f61fd2fa5..243acbaa35 100644
  
  static void
  http_configure (struct grub_efi_net_device *dev, int prefer_ip6)
-@@ -351,6 +352,24 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
+@@ -342,6 +343,24 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
    grub_err_t err;
    grub_off_t size;
    char *buf;
diff --git a/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch b/0080-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
similarity index 87%
rename from 0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
rename to 0080-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
index a2c71369..9d8be1eb 100644
--- a/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
+++ b/0080-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
@@ -17,11 +17,11 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  3 files changed, 64 insertions(+), 16 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index b809c00784..b1ca894791 100644
+index fcfbcbb664d..c17e83acf87 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -850,11 +850,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
-   TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
+@@ -914,11 +914,23 @@ if test "x$target_cpu" = xloongarch64; then
+   TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mla-global-with-abs"
  fi
  
 +# Should grub utils get the host CFLAGS, or the target CFLAGS?
@@ -45,7 +45,7 @@ index b809c00784..b1ca894791 100644
    AC_CACHE_CHECK([for options to get soft-float], grub_cv_target_cc_soft_float, [
      grub_cv_target_cc_soft_float=no
      if test "x$target_cpu" = xarm64; then
-@@ -1984,6 +1996,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
+@@ -2111,6 +2123,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include"
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include"
  
@@ -88,19 +88,19 @@ index b809c00784..b1ca894791 100644
  GRUB_PLATFORM="${platform}"
  
 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 5f0ef96985..2ff9b39357 100644
+index 6262f21a772..54f0f7f7664 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
-@@ -40,24 +40,25 @@ CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
- CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
- STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx -R .note.gnu.property -R .gnu.build.attributes
+@@ -50,24 +50,25 @@ else
+ endif
+ endif
  
 -CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
--LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
+-LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r
 -CPPFLAGS_MODULE = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
 -CCASFLAGS_MODULE = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
 +CFLAGS_MODULE = $(TARGET_CFLAGS) $(CFLAGS_PLATFORM) -ffreestanding
-+LDFLAGS_MODULE = $(TARGET_LDFLAGS) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
++LDFLAGS_MODULE = $(TARGET_LDFLAGS) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r
 +CPPFLAGS_MODULE = $(TARGET_CPPFLAGS) $(CPPFLAGS_DEFAULT) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
 +CCASFLAGS_MODULE = $(TARGET_CCASFLAGS) $(CCASFLAGS_DEFAULT) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
  
@@ -129,10 +129,10 @@ index 5f0ef96985..2ff9b39357 100644
  # Other variables
  
 diff --git a/gentpl.py b/gentpl.py
-index f09b336869..0e62e14666 100644
+index 597129a2bc4..5826a6b14e8 100644
 --- a/gentpl.py
 +++ b/gentpl.py
-@@ -697,10 +697,10 @@ def module(defn, platform):
+@@ -699,10 +699,10 @@ def module(defn, platform):
      var_set(cname(defn) + "_SOURCES", platform_sources(defn, platform) + " ## platform sources")
      var_set("nodist_" + cname(defn) + "_SOURCES", platform_nodist_sources(defn, platform) + " ## platform nodist sources")
      var_set(cname(defn) + "_LDADD", platform_ldadd(defn, platform))
diff --git a/0092-Rework-how-the-fdt-command-builds.patch b/0081-Rework-how-the-fdt-command-builds.patch
similarity index 85%
rename from 0092-Rework-how-the-fdt-command-builds.patch
rename to 0081-Rework-how-the-fdt-command-builds.patch
index a374f90e..8c00d382 100644
--- a/0092-Rework-how-the-fdt-command-builds.patch
+++ b/0081-Rework-how-the-fdt-command-builds.patch
@@ -17,18 +17,18 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/Makefile.core.def | 5 ++---
+ grub-core/Makefile.core.def | 4 ++--
  grub-core/lib/fdt.c         | 2 --
  grub-core/loader/efi/fdt.c  | 2 ++
  include/grub/fdt.h          | 6 ++++++
  grub-core/Makefile.am       | 1 +
- 5 files changed, 11 insertions(+), 5 deletions(-)
+ 5 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index c40170f2dd..84a3d89de9 100644
+index 56eb6a828e8..4629c179e40 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -177,7 +177,6 @@ kernel = {
+@@ -188,7 +188,6 @@ kernel = {
    arm_coreboot = kern/arm/coreboot/init.c;
    arm_coreboot = kern/arm/coreboot/timer.c;
    arm_coreboot = kern/arm/coreboot/coreboot.S;
@@ -36,7 +36,7 @@ index c40170f2dd..84a3d89de9 100644
    arm_coreboot = bus/fdt.c;
    arm_coreboot = term/ps2.c;
    arm_coreboot = term/arm/pl050.c;
-@@ -351,6 +350,8 @@ kernel = {
+@@ -370,6 +369,8 @@ kernel = {
    riscv64 = kern/riscv/cache_flush.S;
    riscv64 = kern/riscv/dl.c;
  
@@ -45,15 +45,7 @@ index c40170f2dd..84a3d89de9 100644
    emu = disk/host.c;
    emu = kern/emu/cache_s.S;
    emu = kern/emu/hostdisk.c;
-@@ -1825,7 +1826,6 @@ module = {
-   riscv32 = loader/riscv/linux.c;
-   riscv64 = loader/riscv/linux.c;
-   emu = loader/emu/linux.c;
--  fdt = lib/fdt.c;
- 
-   common = loader/linux.c;
-   common = lib/cmdline.c;
-@@ -1836,7 +1836,6 @@ module = {
+@@ -1882,7 +1883,6 @@ module = {
  module = {
    name = fdt;
    efi = loader/efi/fdt.c;
@@ -62,7 +54,7 @@ index c40170f2dd..84a3d89de9 100644
  };
  
 diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
-index 0d371c5633..37e04bd69e 100644
+index 73cfa94a2df..fbf749e1d61 100644
 --- a/grub-core/lib/fdt.c
 +++ b/grub-core/lib/fdt.c
 @@ -21,8 +21,6 @@
@@ -75,7 +67,7 @@ index 0d371c5633..37e04bd69e 100644
  
  #define FDT_BEGIN_NODE	0x00000001
 diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
-index c86f283d75..c572415d38 100644
+index 439964b9ca6..e08d8738afc 100644
 --- a/grub-core/loader/efi/fdt.c
 +++ b/grub-core/loader/efi/fdt.c
 @@ -27,6 +27,8 @@
@@ -88,7 +80,7 @@ index c86f283d75..c572415d38 100644
  static void *fdt;
  
 diff --git a/include/grub/fdt.h b/include/grub/fdt.h
-index e609c7e411..3514aa4a5b 100644
+index e609c7e4111..3514aa4a5b6 100644
 --- a/include/grub/fdt.h
 +++ b/include/grub/fdt.h
 @@ -19,6 +19,9 @@
@@ -110,7 +102,7 @@ index e609c7e411..3514aa4a5b 100644
 +
  #endif	/* ! GRUB_FDT_HEADER */
 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index f512573c0d..dd49939aaa 100644
+index b7192a3da82..7953ba95399 100644
 --- a/grub-core/Makefile.am
 +++ b/grub-core/Makefile.am
 @@ -76,6 +76,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h
diff --git a/0093-Disable-non-wordsize-allocations-on-arm.patch b/0082-Disable-non-wordsize-allocations-on-arm.patch
similarity index 93%
rename from 0093-Disable-non-wordsize-allocations-on-arm.patch
rename to 0082-Disable-non-wordsize-allocations-on-arm.patch
index 7105c7cb..e8c46418 100644
--- a/0093-Disable-non-wordsize-allocations-on-arm.patch
+++ b/0082-Disable-non-wordsize-allocations-on-arm.patch
@@ -9,10 +9,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 20 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index b1ca894791..f42be65332 100644
+index c17e83acf87..3f3a170ab17 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1261,6 +1261,26 @@ if test "x$target_cpu" = xarm; then
+@@ -1346,6 +1346,26 @@ if test "x$target_cpu" = xarm; then
      done
    ])
  
diff --git a/0094-Prepend-prefix-when-HTTP-path-is-relative.patch b/0083-Prepend-prefix-when-HTTP-path-is-relative.patch
similarity index 97%
rename from 0094-Prepend-prefix-when-HTTP-path-is-relative.patch
rename to 0083-Prepend-prefix-when-HTTP-path-is-relative.patch
index 30d80753..ac6c8062 100644
--- a/0094-Prepend-prefix-when-HTTP-path-is-relative.patch
+++ b/0083-Prepend-prefix-when-HTTP-path-is-relative.patch
@@ -16,7 +16,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  2 files changed, 71 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index d1de9fa687..1c540fc8c2 100644
+index 463dafdba02..7347a8de676 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -131,11 +131,19 @@ grub_set_prefix_and_root (void)
@@ -41,7 +41,7 @@ index d1de9fa687..1c540fc8c2 100644
  	}
      }
 diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index 243acbaa35..de351b2cd0 100644
+index b94dbc68eef..5e97f5d5e70 100644
 --- a/grub-core/net/efi/http.c
 +++ b/grub-core/net/efi/http.c
 @@ -9,10 +9,52 @@
@@ -97,7 +97,7 @@ index 243acbaa35..de351b2cd0 100644
  
    grub_efi_http_t *http = dev->http;
  
-@@ -352,32 +394,32 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
+@@ -343,32 +385,32 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
    grub_err_t err;
    grub_off_t size;
    char *buf;
diff --git a/0095-Make-grub_error-more-verbose.patch b/0084-Make-grub_error-more-verbose.patch
similarity index 94%
rename from 0095-Make-grub_error-more-verbose.patch
rename to 0084-Make-grub_error-more-verbose.patch
index 306a3d36..5ad26840 100644
--- a/0095-Make-grub_error-more-verbose.patch
+++ b/0084-Make-grub_error-more-verbose.patch
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
-index 53c734de70..aebfe0cf83 100644
+index 53c734de70e..aebfe0cf839 100644
 --- a/grub-core/kern/err.c
 +++ b/grub-core/kern/err.c
 @@ -33,15 +33,24 @@ static struct grub_error_saved grub_error_stack_items[GRUB_ERROR_STACK_SIZE];
@@ -41,10 +41,10 @@ index 53c734de70..aebfe0cf83 100644
  
    return n;
 diff --git a/include/grub/err.h b/include/grub/err.h
-index b08d5d0de4..c0f90ef07c 100644
+index 1c07034cd60..3c587b9b822 100644
 --- a/include/grub/err.h
 +++ b/include/grub/err.h
-@@ -85,8 +85,12 @@ struct grub_error_saved
+@@ -86,8 +86,12 @@ struct grub_error_saved
  extern grub_err_t EXPORT_VAR(grub_errno);
  extern char EXPORT_VAR(grub_errmsg)[GRUB_MAX_ERRMSG];
  
diff --git a/0096-Make-reset-an-alias-for-the-reboot-command.patch b/0085-Make-reset-an-alias-for-the-reboot-command.patch
similarity index 97%
rename from 0096-Make-reset-an-alias-for-the-reboot-command.patch
rename to 0085-Make-reset-an-alias-for-the-reboot-command.patch
index 22475d65..c86acf18 100644
--- a/0096-Make-reset-an-alias-for-the-reboot-command.patch
+++ b/0085-Make-reset-an-alias-for-the-reboot-command.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/commands/reboot.c b/grub-core/commands/reboot.c
-index 46d364c99a..f5cc228363 100644
+index 46d364c99a9..f5cc2283636 100644
 --- a/grub-core/commands/reboot.c
 +++ b/grub-core/commands/reboot.c
 @@ -32,15 +32,18 @@ grub_cmd_reboot (grub_command_t cmd __attribute__ ((unused)),
diff --git a/0097-Add-a-version-command.patch b/0086-Add-a-version-command.patch
similarity index 89%
rename from 0097-Add-a-version-command.patch
rename to 0086-Add-a-version-command.patch
index 8daad53b..b8770eed 100644
--- a/0097-Add-a-version-command.patch
+++ b/0086-Add-a-version-command.patch
@@ -19,10 +19,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 grub-core/commands/version.c
 
 diff --git a/configure.ac b/configure.ac
-index f42be65332..2af5f23adf 100644
+index 3f3a170ab17..2175aa56997 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -285,6 +285,19 @@ AC_SUBST(target_cpu)
+@@ -289,6 +289,19 @@ AC_SUBST(target_cpu)
  AC_SUBST(platform)
  
  # Define default variables
@@ -43,10 +43,10 @@ index f42be65332..2af5f23adf 100644
  have_with_bootdir=n
  AC_ARG_WITH([bootdir],
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 84a3d89de9..498ca11762 100644
+index 4629c179e40..f26c689723c 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -579,6 +579,11 @@ image = {
+@@ -598,6 +598,11 @@ image = {
    enable = mips_loongson;
  };
  
@@ -60,7 +60,7 @@ index 84a3d89de9..498ca11762 100644
    common = lib/disk.c;
 diff --git a/grub-core/commands/version.c b/grub-core/commands/version.c
 new file mode 100644
-index 0000000000..de0acb07ba
+index 00000000000..de0acb07ba2
 --- /dev/null
 +++ b/grub-core/commands/version.c
 @@ -0,0 +1,56 @@
@@ -121,14 +121,14 @@ index 0000000000..de0acb07ba
 +  grub_unregister_command (cmd);
 +}
 diff --git a/config.h.in b/config.h.in
-index 9e8f9911b1..c7e316f0f1 100644
+index 9b1d3997185..d294d2c653f 100644
 --- a/config.h.in
 +++ b/config.h.in
-@@ -59,6 +59,7 @@
+@@ -63,6 +63,7 @@
  
- #define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
- #define GRUB_PLATFORM "@GRUB_PLATFORM@"
-+#define GRUB_RPM_VERSION "@GRUB_RPM_VERSION@"
+ #  define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
+ #  define GRUB_PLATFORM "@GRUB_PLATFORM@"
++#  define GRUB_RPM_VERSION "@GRUB_RPM_VERSION@"
  
- #define RE_ENABLE_I18N 1
+ #  define GRUB_STACK_PROTECTOR_INIT @GRUB_STACK_PROTECTOR_INIT@
  
diff --git a/0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch b/0087-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
similarity index 89%
rename from 0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
rename to 0087-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
index 72c8d304..9ad4036f 100644
--- a/0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
+++ b/0087-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  4 files changed, 10 insertions(+)
 
 diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
-index 0320115662..7cdffe3ebd 100644
+index 21e2395111a..c35ce8915b2 100644
 --- a/grub-core/disk/diskfilter.c
 +++ b/grub-core/disk/diskfilter.c
 @@ -188,6 +188,8 @@ scan_disk (const char *name, int accept_diskfilter)
@@ -24,7 +24,7 @@ index 0320115662..7cdffe3ebd 100644
    if (!accept_diskfilter && is_valid_diskfilter_name (name))
      return 0;
  
-@@ -1212,6 +1214,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
+@@ -1247,6 +1249,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
  	   the same.  */
  	if (pv->disk && grub_disk_native_sectors (disk) >= pv->part_size)
  	  return GRUB_ERR_NONE;
@@ -33,10 +33,10 @@ index 0320115662..7cdffe3ebd 100644
  	if (!pv->disk)
  	  return grub_errno;
 diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
-index f077b5f553..fe8ba6e6c9 100644
+index 3b5ed569133..822005456eb 100644
 --- a/grub-core/disk/efi/efidisk.c
 +++ b/grub-core/disk/efi/efidisk.c
-@@ -855,6 +855,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
+@@ -865,6 +865,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
  	  return 0;
  	}
  
@@ -45,7 +45,7 @@ index f077b5f553..fe8ba6e6c9 100644
        grub_free (dup_dp);
  
 diff --git a/grub-core/kern/device.c b/grub-core/kern/device.c
-index 73b8ecc0c0..f58b58c89d 100644
+index 670e213cf3c..d019637470d 100644
 --- a/grub-core/kern/device.c
 +++ b/grub-core/kern/device.c
 @@ -34,6 +34,7 @@ grub_device_open (const char *name)
@@ -57,7 +57,7 @@ index 73b8ecc0c0..f58b58c89d 100644
      {
        name = grub_env_get ("root");
 diff --git a/grub-core/script/script.c b/grub-core/script/script.c
-index ec4d4337c6..844e8343ca 100644
+index ec4d4337c66..844e8343ca7 100644
 --- a/grub-core/script/script.c
 +++ b/grub-core/script/script.c
 @@ -22,6 +22,11 @@
diff --git a/0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch b/0088-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
similarity index 73%
rename from 0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
rename to 0088-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
index 3ebf4b3e..2868f23e 100644
--- a/0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
+++ b/0088-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
@@ -9,17 +9,15 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/lib/reed_solomon.c      |  4 ++--
  grub-core/osdep/linux/blocklist.c |  2 +-
  grub-core/osdep/linux/getroot.c   |  2 +-
- grub-core/osdep/linux/hostdisk.c  |  2 +-
  util/grub-fstest.c                |  2 +-
  util/grub-menulst2cfg.c           |  2 +-
  util/grub-mkfont.c                | 13 +++++++------
  util/grub-probe.c                 |  2 +-
- util/grub-rpm-sort.c              |  2 +-
  util/setup.c                      |  2 +-
- 11 files changed, 18 insertions(+), 17 deletions(-)
+ 9 files changed, 16 insertions(+), 15 deletions(-)
 
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index eeea092752..f08a1bb841 100644
+index 16c79bc9488..d145e5796b3 100644
 --- a/grub-core/kern/emu/misc.c
 +++ b/grub-core/kern/emu/misc.c
 @@ -189,7 +189,7 @@ grub_util_get_image_size (const char *path)
@@ -32,10 +30,10 @@ index eeea092752..f08a1bb841 100644
    ret = (size_t) sz;
  
 diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c
-index 467305b46a..79037c093f 100644
+index 562bd2e3e3f..5fee7f2a1a4 100644
 --- a/grub-core/lib/reed_solomon.c
 +++ b/grub-core/lib/reed_solomon.c
-@@ -157,7 +157,7 @@ static void
+@@ -162,7 +162,7 @@ static void
  rs_encode (gf_single_t *data, grub_size_t s, grub_size_t rs)
  {
    gf_single_t *rs_polynomial;
@@ -44,7 +42,7 @@ index 467305b46a..79037c093f 100644
    gf_single_t *m;
    m = xcalloc (s + rs, sizeof (gf_single_t));
    grub_memcpy (m, data, s * sizeof (gf_single_t));
-@@ -324,7 +324,7 @@ static void
+@@ -333,7 +333,7 @@ static void
  encode_block (gf_single_t *ptr, grub_size_t s,
  	      gf_single_t *rptr, grub_size_t rs)
  {
@@ -54,7 +52,7 @@ index 467305b46a..79037c093f 100644
      {
        grub_size_t ds = (s + SECTOR_SIZE - 1 - i) / SECTOR_SIZE;
 diff --git a/grub-core/osdep/linux/blocklist.c b/grub-core/osdep/linux/blocklist.c
-index c77d6085cc..42a315031f 100644
+index 2efee2c2aee..902cfee53ae 100644
 --- a/grub-core/osdep/linux/blocklist.c
 +++ b/grub-core/osdep/linux/blocklist.c
 @@ -109,7 +109,7 @@ grub_install_get_blocklist (grub_device_t root_dev,
@@ -67,10 +65,10 @@ index c77d6085cc..42a315031f 100644
  		      + fie1.fm_mapped_extents
  		      * sizeof (fie1.fm_extents[1]));
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 28790307e0..9f730b3518 100644
+index 74a48c03026..477fb420992 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
-@@ -236,7 +236,7 @@ grub_find_root_devices_from_btrfs (const char *dir)
+@@ -233,7 +233,7 @@ grub_find_root_devices_from_btrfs (const char *dir)
  {
    int fd;
    struct btrfs_ioctl_fs_info_args fsi;
@@ -79,24 +77,11 @@ index 28790307e0..9f730b3518 100644
    char **ret;
  
    fd = open (dir, 0);
-diff --git a/grub-core/osdep/linux/hostdisk.c b/grub-core/osdep/linux/hostdisk.c
-index da62f924e3..7bc99ac1c1 100644
---- a/grub-core/osdep/linux/hostdisk.c
-+++ b/grub-core/osdep/linux/hostdisk.c
-@@ -83,7 +83,7 @@ grub_util_get_fd_size_os (grub_util_fd_t fd, const char *name, unsigned *log_sec
-   if (sector_size & (sector_size - 1) || !sector_size)
-     return -1;
-   for (log_sector_size = 0;
--       (1 << log_sector_size) < sector_size;
-+       (1U << log_sector_size) < sector_size;
-        log_sector_size++);
- 
-   if (log_secsize)
 diff --git a/util/grub-fstest.c b/util/grub-fstest.c
-index 8386564200..bfcef852d8 100644
+index 25ae52ab6f4..982ce9ed7d8 100644
 --- a/util/grub-fstest.c
 +++ b/util/grub-fstest.c
-@@ -323,7 +323,7 @@ cmd_cmp (char *src, char *dest)
+@@ -329,7 +329,7 @@ cmd_cmp (char *src, char *dest)
    read_file (src, cmp_hook, ff);
  
    {
@@ -106,7 +91,7 @@ index 8386564200..bfcef852d8 100644
      fseek (ff, 0, SEEK_END);
      if (pre != ftell (ff))
 diff --git a/util/grub-menulst2cfg.c b/util/grub-menulst2cfg.c
-index a39f869394..358d604210 100644
+index b80e15cc36e..1ea2a86e129 100644
 --- a/util/grub-menulst2cfg.c
 +++ b/util/grub-menulst2cfg.c
 @@ -34,7 +34,7 @@ main (int argc, char **argv)
@@ -119,10 +104,10 @@ index a39f869394..358d604210 100644
  
    grub_util_host_init (&argc, &argv);
 diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
-index 0fe45a6103..3e09240b99 100644
+index 7624d7808b7..e8a914021b2 100644
 --- a/util/grub-mkfont.c
 +++ b/util/grub-mkfont.c
-@@ -138,7 +138,8 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
+@@ -143,7 +143,8 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
    int width, height;
    int cuttop, cutbottom, cutleft, cutright;
    grub_uint8_t *data;
@@ -132,7 +117,7 @@ index 0fe45a6103..3e09240b99 100644
    FT_GlyphSlot glyph;
    int flag = FT_LOAD_RENDER | FT_LOAD_MONOCHROME;
    FT_Error err;
-@@ -183,7 +184,7 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
+@@ -188,7 +189,7 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
      cuttop = cutbottom = cutleft = cutright = 0;
    else
      {
@@ -141,7 +126,7 @@ index 0fe45a6103..3e09240b99 100644
  	{
  	  for (j = 0; j < glyph->bitmap.width; j++)
  	    if (glyph->bitmap.buffer[j / 8 + cuttop * glyph->bitmap.pitch]
-@@ -203,10 +204,10 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
+@@ -208,10 +209,10 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
  	    break;
  	}
        cutbottom = glyph->bitmap.rows - 1 - cutbottom;
@@ -154,7 +139,7 @@ index 0fe45a6103..3e09240b99 100644
  	{
  	  for (j = 0; j < glyph->bitmap.rows; j++)
  	    if (glyph->bitmap.buffer[cutleft / 8 + j * glyph->bitmap.pitch]
-@@ -225,7 +226,7 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
+@@ -230,7 +231,7 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
  	    break;
  	}
        cutright = glyph->bitmap.width - 1 - cutright;
@@ -163,7 +148,7 @@ index 0fe45a6103..3e09240b99 100644
  	cutright = 0;
      }
  
-@@ -262,7 +263,7 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
+@@ -267,7 +268,7 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
  
    mask = 0;
    data = &glyph_info->bitmap[0] - 1;
@@ -173,10 +158,10 @@ index 0fe45a6103..3e09240b99 100644
        add_pixel (&data, &mask,
  		 glyph->bitmap.buffer[i / 8 + j * glyph->bitmap.pitch] &
 diff --git a/util/grub-probe.c b/util/grub-probe.c
-index c08e46bbb4..c6fac732b4 100644
+index 65c1ca3f8b6..08ae915e8d7 100644
 --- a/util/grub-probe.c
 +++ b/util/grub-probe.c
-@@ -798,7 +798,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
+@@ -799,7 +799,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
  
      case 't':
        {
@@ -185,21 +170,8 @@ index c08e46bbb4..c6fac732b4 100644
  
  	for (i = PRINT_FS; i < ARRAY_SIZE (targets); i++)
  	  if (strcmp (arg, targets[i]) == 0)
-diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
-index f33bd1ed56..8345944105 100644
---- a/util/grub-rpm-sort.c
-+++ b/util/grub-rpm-sort.c
-@@ -232,7 +232,7 @@ main (int argc, char *argv[])
-   struct arguments arguments;
-   char **package_names = NULL;
-   size_t n_package_names = 0;
--  int i;
-+  unsigned int i;
- 
-   grub_util_host_init (&argc, &argv);
- 
 diff --git a/util/setup.c b/util/setup.c
-index da5f2c07f5..8b22bb8cca 100644
+index 87a889ff7e3..7aab468b0eb 100644
 --- a/util/setup.c
 +++ b/util/setup.c
 @@ -406,7 +406,7 @@ SETUP (const char *dir,
diff --git a/0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch b/0089-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
similarity index 55%
rename from 0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
rename to 0089-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
index 6e18f66d..668a20ce 100644
--- a/0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
+++ b/0089-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
@@ -4,33 +4,21 @@ Date: Thu, 11 Jul 2019 18:20:37 +0200
 Subject: [PATCH] Don't use -Wno-sign-compare -Wno-conversion -Wno-error, do
  use -Wextra.
 
+Updated for grub-2.12 which introduced new sign comparison problems:
+we're using -Wno-error=sign-compare
+
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- configure.ac         | 14 +++++++++++---
- conf/Makefile.common |  2 +-
- 2 files changed, 12 insertions(+), 4 deletions(-)
+ configure.ac         | 8 ++++++++
+ conf/Makefile.common | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 2af5f23adf..091ab32836 100644
+index 2175aa56997..81240397384 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1453,11 +1453,11 @@ fi
- # Set them to their new values for the tests below.
- CC="$TARGET_CC"
- if test x"$platform" = xemu ; then
--CFLAGS="$TARGET_CFLAGS -Wno-error"
-+CFLAGS="$TARGET_CFLAGS"
- elif test "x$TARGET_APPLE_LINKER" = x1 ; then
--CFLAGS="$TARGET_CFLAGS -nostdlib -static -Wno-error"
-+CFLAGS="$TARGET_CFLAGS -nostdlib -static"
- else
--CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
-+CFLAGS="$TARGET_CFLAGS -nostdlib"
- fi
- CPPFLAGS="$TARGET_CPPFLAGS"
- 
-@@ -2020,6 +2020,14 @@ if test x"$enable_werror" != xno ; then
-   HOST_CFLAGS="$HOST_CFLAGS -Werror"
+@@ -2147,6 +2147,14 @@ if test x"$enable_werror" != xno ; then
+   fi
  fi
  
 +AC_ARG_ENABLE([wextra],
@@ -45,15 +33,15 @@ index 2af5f23adf..091ab32836 100644
  TARGET_CCAS=$TARGET_CC
  
 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 2ff9b39357..35e14ff017 100644
+index 54f0f7f7664..e53ff352407 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
-@@ -66,7 +66,7 @@ grubconfdir = $(sysconfdir)/grub.d
+@@ -76,7 +76,7 @@ grubconfdir = $(sysconfdir)/grub.d
  platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
  starfielddir = $(pkgdatadir)/themes/starfield
  
--CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion
-+CFLAGS_GNULIB = -Wno-undef -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code
+-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -Wno-error=attributes
++CFLAGS_GNULIB = -Wno-undef -Wno-error=sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-error=attributes
  CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/lib/gnulib -I$(top_srcdir)/grub-core/lib/gnulib
  
  CFLAGS_POSIX = -fno-builtin
diff --git a/0107-Fix-getroot.c-s-trampolines.patch b/0090-Fix-getroot.c-s-trampolines.patch
similarity index 92%
rename from 0107-Fix-getroot.c-s-trampolines.patch
rename to 0090-Fix-getroot.c-s-trampolines.patch
index e744b779..b1f65dea 100644
--- a/0107-Fix-getroot.c-s-trampolines.patch
+++ b/0090-Fix-getroot.c-s-trampolines.patch
@@ -12,10 +12,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 7 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 9f730b3518..f0c503f43d 100644
+index 477fb420992..b32582eb302 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
-@@ -1264,22 +1264,20 @@ grub_util_get_grub_dev_os (const char *os_dev)
+@@ -1261,22 +1261,20 @@ grub_util_get_grub_dev_os (const char *os_dev)
    return grub_dev;
  }
  
diff --git a/0108-Do-not-allow-stack-trampolines-anywhere.patch b/0091-Do-not-allow-stack-trampolines-anywhere.patch
similarity index 65%
rename from 0108-Do-not-allow-stack-trampolines-anywhere.patch
rename to 0091-Do-not-allow-stack-trampolines-anywhere.patch
index 08995fcc..0c3b2985 100644
--- a/0108-Do-not-allow-stack-trampolines-anywhere.patch
+++ b/0091-Do-not-allow-stack-trampolines-anywhere.patch
@@ -10,10 +10,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 091ab32836..de707f7e0b 100644
+index 81240397384..ae7683d0693 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2028,6 +2028,9 @@ if test x"$enable_wextra" != xno ; then
+@@ -2155,6 +2155,9 @@ if test x"$enable_wextra" != xno ; then
    HOST_CFLAGS="$HOST_CFLAGS -Wextra"
  fi
  
@@ -24,15 +24,15 @@ index 091ab32836..de707f7e0b 100644
  TARGET_CCAS=$TARGET_CC
  
 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 35e14ff017..0647c53b91 100644
+index e53ff352407..91ff6c905fb 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
-@@ -66,7 +66,7 @@ grubconfdir = $(sysconfdir)/grub.d
+@@ -76,7 +76,7 @@ grubconfdir = $(sysconfdir)/grub.d
  platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
  starfielddir = $(pkgdatadir)/themes/starfield
  
--CFLAGS_GNULIB = -Wno-undef -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code
-+CFLAGS_GNULIB = -Wno-undef -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Werror=trampolines -fno-trampolines
+-CFLAGS_GNULIB = -Wno-undef -Wno-error=sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-error=attributes
++CFLAGS_GNULIB = -Wno-undef -Wno-error=sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-error=attributes -Werror=trampolines -fno-trampolines
  CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/lib/gnulib -I$(top_srcdir)/grub-core/lib/gnulib
  
  CFLAGS_POSIX = -fno-builtin
diff --git a/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch b/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch
deleted file mode 100644
index 78c15d6f..00000000
--- a/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 1 Aug 2018 10:24:52 -0400
-Subject: [PATCH] module-verifier: make it possible to run checkers on
- grub-module-verifierxx.c
-
-This makes it so you can treat grub-module-verifierxx.c as a file you can
-build directly, so syntax checkers like vim's "syntastic" plugin, which uses
-"gcc -x c -fsyntax-only" to build it, will work.
-
-One still has to do whatever setup is required to make it pick the right
-include dirs, which -W options we use, etc., but this makes it so you can do
-the checking on the file you're editing, rather than on a different file.
-
-v2: fix the typo in the #else clause in util/grub-module-verifierXX.c
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- util/grub-module-verifier32.c | 2 ++
- util/grub-module-verifier64.c | 2 ++
- util/grub-module-verifierXX.c | 9 +++++++++
- 3 files changed, 13 insertions(+)
-
-diff --git a/util/grub-module-verifier32.c b/util/grub-module-verifier32.c
-index 257229f8f0..ba7d41aafe 100644
---- a/util/grub-module-verifier32.c
-+++ b/util/grub-module-verifier32.c
-@@ -1,2 +1,4 @@
- #define MODULEVERIFIER_ELF32 1
-+#ifndef GRUB_MODULE_VERIFIERXX
- #include "grub-module-verifierXX.c"
-+#endif
-diff --git a/util/grub-module-verifier64.c b/util/grub-module-verifier64.c
-index 4db6b4bedd..fc23ef800b 100644
---- a/util/grub-module-verifier64.c
-+++ b/util/grub-module-verifier64.c
-@@ -1,2 +1,4 @@
- #define MODULEVERIFIER_ELF64 1
-+#ifndef GRUB_MODULE_VERIFIERXX
- #include "grub-module-verifierXX.c"
-+#endif
-diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c
-index ceb24309ae..a98e2f9b1a 100644
---- a/util/grub-module-verifierXX.c
-+++ b/util/grub-module-verifierXX.c
-@@ -1,3 +1,12 @@
-+#define GRUB_MODULE_VERIFIERXX
-+#if !defined(MODULEVERIFIER_ELF32) && !defined(MODULEVERIFIER_ELF64)
-+#if __SIZEOF_POINTER__ == 8
-+#include "grub-module-verifier64.c"
-+#else
-+#include "grub-module-verifier32.c"
-+#endif
-+#endif
-+
- #include <string.h>
- 
- #include <grub/elf.h>
diff --git a/0109-Reimplement-boot_counter.patch b/0092-Reimplement-boot_counter.patch
similarity index 96%
rename from 0109-Reimplement-boot_counter.patch
rename to 0092-Reimplement-boot_counter.patch
index 22bd4ef6..1f0cb967 100644
--- a/0109-Reimplement-boot_counter.patch
+++ b/0092-Reimplement-boot_counter.patch
@@ -23,10 +23,10 @@ Signed-off-by: Christian Glombek <lorbus@fedoraproject.org>
  create mode 100644 util/grub.d/01_fallback_counting.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 0b85a7fce4..27a13bc734 100644
+index 01096ded815..0bb47c6d40a 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -458,6 +458,12 @@ script = {
+@@ -461,6 +461,12 @@ script = {
    installdir = grubconf;
  };
  
@@ -40,10 +40,10 @@ index 0b85a7fce4..27a13bc734 100644
    name = '01_menu_auto_hide';
    common = util/grub.d/01_menu_auto_hide.in;
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 498ca11762..1e15345107 100644
+index f26c689723c..08c0c67bcf2 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -398,6 +398,11 @@ kernel = {
+@@ -417,6 +417,11 @@ kernel = {
    extra_dist = kern/mips/cache_flush.S;
  };
  
@@ -57,7 +57,7 @@ index 498ca11762..1e15345107 100644
    mansection = 1;
 diff --git a/grub-core/commands/increment.c b/grub-core/commands/increment.c
 new file mode 100644
-index 0000000000..79cf137656
+index 00000000000..79cf137656c
 --- /dev/null
 +++ b/grub-core/commands/increment.c
 @@ -0,0 +1,105 @@
@@ -168,7 +168,7 @@ index 0000000000..79cf137656
 +}
 diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/01_fallback_counting.in
 new file mode 100644
-index 0000000000..be0e770ea8
+index 00000000000..be0e770ea82
 --- /dev/null
 +++ b/util/grub.d/01_fallback_counting.in
 @@ -0,0 +1,22 @@
diff --git a/0110-Fix-menu-entry-selection-based-on-ID-and-title.patch b/0093-Fix-menu-entry-selection-based-on-ID-and-title.patch
similarity index 99%
rename from 0110-Fix-menu-entry-selection-based-on-ID-and-title.patch
rename to 0093-Fix-menu-entry-selection-based-on-ID-and-title.patch
index af749012..597e0c1c 100644
--- a/0110-Fix-menu-entry-selection-based-on-ID-and-title.patch
+++ b/0093-Fix-menu-entry-selection-based-on-ID-and-title.patch
@@ -24,7 +24,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 71 insertions(+), 70 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index d7a222e681..4a02aadb01 100644
+index 6444ee6f969..b0cfa32ddd8 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -164,12 +164,12 @@ grub_menu_set_timeout (int timeout)
diff --git a/0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch b/0094-Make-the-menu-entry-users-option-argument-to-be-opti.patch
similarity index 97%
rename from 0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch
rename to 0094-Make-the-menu-entry-users-option-argument-to-be-opti.patch
index 68779ebf..e0d36db7 100644
--- a/0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch
+++ b/0094-Make-the-menu-entry-users-option-argument-to-be-opti.patch
@@ -23,7 +23,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
-index b194123eb6..b175a1b43b 100644
+index b194123eb67..b175a1b43b7 100644
 --- a/grub-core/commands/menuentry.c
 +++ b/grub-core/commands/menuentry.c
 @@ -29,7 +29,7 @@ static const struct grub_arg_option options[] =
diff --git a/0112-Add-efi-export-env-and-efi-load-env-commands.patch b/0095-Add-efi-export-env-and-efi-load-env-commands.patch
similarity index 93%
rename from 0112-Add-efi-export-env-and-efi-load-env-commands.patch
rename to 0095-Add-efi-export-env-and-efi-load-env-commands.patch
index ac028764..6a5abefe 100644
--- a/0112-Add-efi-export-env-and-efi-load-env-commands.patch
+++ b/0095-Add-efi-export-env-and-efi-load-env-commands.patch
@@ -21,10 +21,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  create mode 100644 grub-core/commands/efi/env.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 1e15345107..81fc274148 100644
+index 08c0c67bcf2..4aa20cdfc13 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -820,6 +820,12 @@ module = {
+@@ -842,6 +842,12 @@ module = {
    enable = efi;
  };
  
@@ -39,7 +39,7 @@ index 1e15345107..81fc274148 100644
    efi = commands/efi/efifwsetup.c;
 diff --git a/grub-core/commands/efi/env.c b/grub-core/commands/efi/env.c
 new file mode 100644
-index 0000000000..cbd13e03e8
+index 00000000000..45f107ccd5b
 --- /dev/null
 +++ b/grub-core/commands/efi/env.c
 @@ -0,0 +1,168 @@
@@ -74,7 +74,7 @@ index 0000000000..cbd13e03e8
 +
 +GRUB_MOD_LICENSE ("GPLv3+");
 +
-+static const grub_efi_guid_t grub_env_guid = GRUB_EFI_GRUB_VARIABLE_GUID;
++static const grub_guid_t grub_env_guid = GRUB_EFI_GRUB_VARIABLE_GUID;
 +
 +static grub_err_t
 +grub_efi_export_env(grub_command_t cmd __attribute__ ((unused)),
@@ -212,10 +212,10 @@ index 0000000000..cbd13e03e8
 +  grub_unregister_command (loadenv_cmd);
 +}
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 2a446f5031..14bc10eb56 100644
+index bf16c4307bc..ef837387368 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -225,6 +225,9 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid,
+@@ -227,6 +227,9 @@ grub_efi_set_variable_with_attributes (const char *var, const grub_guid_t *guid,
    if (status == GRUB_EFI_SUCCESS)
      return GRUB_ERR_NONE;
  
@@ -226,10 +226,10 @@ index 2a446f5031..14bc10eb56 100644
  }
  
 diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 2d12e6188f..0574d8d621 100644
+index b5201974a76..dee3918fd35 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
-@@ -85,11 +85,6 @@ stack_protector_init (void)
+@@ -106,11 +106,6 @@ stack_protector_init (void)
  
  grub_addr_t grub_modbase;
  
@@ -242,7 +242,7 @@ index 2d12e6188f..0574d8d621 100644
  static int
  set_var (const char *name, const char *value,
 diff --git a/grub-core/lib/envblk.c b/grub-core/lib/envblk.c
-index 2e4e78b132..874506da16 100644
+index 2e4e78b132d..874506da169 100644
 --- a/grub-core/lib/envblk.c
 +++ b/grub-core/lib/envblk.c
 @@ -223,6 +223,49 @@ grub_envblk_delete (grub_envblk_t envblk, const char *name)
@@ -296,7 +296,7 @@ index 2e4e78b132..874506da16 100644
  grub_envblk_iterate (grub_envblk_t envblk,
                       void *hook_data,
 diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
-index d506f7e75b..a6ccc11383 100644
+index d506f7e75bc..a6ccc113839 100644
 --- a/util/grub-set-bootflag.c
 +++ b/util/grub-set-bootflag.c
 @@ -25,6 +25,7 @@
@@ -308,12 +308,12 @@ index d506f7e75b..a6ccc11383 100644
  #include <errno.h>
  #include <stdio.h>
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 2e0691454b..8dfc89a33b 100644
+index 8d98203a784..6c2c1f36e37 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -24,6 +24,11 @@
- #include <grub/dl.h>
- #include <grub/efi/api.h>
+@@ -36,6 +36,11 @@ struct linux_arch_kernel_header {
+   struct grub_pe_image_header pe_image_header;
+ };
  
 +#define GRUB_EFI_GRUB_VARIABLE_GUID \
 +  { 0x91376aff, 0xcba6, 0x42be, \
@@ -324,7 +324,7 @@ index 2e0691454b..8dfc89a33b 100644
  extern grub_efi_system_table_t *EXPORT_VAR(grub_efi_system_table);
  extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);
 diff --git a/include/grub/lib/envblk.h b/include/grub/lib/envblk.h
-index c3e6559217..ab969af246 100644
+index c3e65592170..ab969af2461 100644
 --- a/include/grub/lib/envblk.h
 +++ b/include/grub/lib/envblk.h
 @@ -22,6 +22,8 @@
diff --git a/0114-Export-all-variables-from-the-initial-context-when-c.patch b/0096-Export-all-variables-from-the-initial-context-when-c.patch
similarity index 95%
rename from 0114-Export-all-variables-from-the-initial-context-when-c.patch
rename to 0096-Export-all-variables-from-the-initial-context-when-c.patch
index 214fa4f3..a35174b4 100644
--- a/0114-Export-all-variables-from-the-initial-context-when-c.patch
+++ b/0096-Export-all-variables-from-the-initial-context-when-c.patch
@@ -17,7 +17,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  2 files changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/context.c b/grub-core/normal/context.c
-index ee53d4a68e..87edd254c4 100644
+index ba185e91599..b4baa4392cd 100644
 --- a/grub-core/normal/context.c
 +++ b/grub-core/normal/context.c
 @@ -99,7 +99,7 @@ grub_env_new_context (int export_all)
@@ -30,7 +30,7 @@ index ee53d4a68e..87edd254c4 100644
  
  int grub_extractor_level = 0;
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 4a02aadb01..fe2e77a43e 100644
+index b0cfa32ddd8..30ddcea0c11 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -375,8 +375,6 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
diff --git a/0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch b/0097-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
similarity index 96%
rename from 0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
rename to 0097-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
index 0abe8ede..08cc5632 100644
--- a/0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
+++ b/0097-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
@@ -21,10 +21,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  rename util/grub.d/{01_menu_auto_hide.in => 12_menu_auto_hide.in} (58%)
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 27a13bc734..2e6ad979c3 100644
+index 0bb47c6d40a..885dc688a60 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -459,14 +459,14 @@ script = {
+@@ -462,14 +462,14 @@ script = {
  };
  
  script = {
@@ -43,7 +43,7 @@ index 27a13bc734..2e6ad979c3 100644
    installdir = grubconf;
  };
  
-@@ -518,6 +518,12 @@ script = {
+@@ -521,6 +521,12 @@ script = {
    condition = COND_HOST_LINUX;
  };
  
@@ -60,7 +60,7 @@ diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/08_fallback_count
 similarity index 65%
 rename from util/grub.d/01_fallback_counting.in
 rename to util/grub.d/08_fallback_counting.in
-index be0e770ea8..2e2c3ff7d3 100644
+index be0e770ea82..2e2c3ff7d31 100644
 --- a/util/grub.d/01_fallback_counting.in
 +++ b/util/grub.d/08_fallback_counting.in
 @@ -1,15 +1,17 @@
@@ -89,7 +89,7 @@ index be0e770ea8..2e2c3ff7d3 100644
      set boot_counter=-1
 diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in
 new file mode 100644
-index 0000000000..6c88d933dd
+index 00000000000..6c88d933dde
 --- /dev/null
 +++ b/util/grub.d/10_reset_boot_success.in
 @@ -0,0 +1,25 @@
@@ -122,7 +122,7 @@ diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/12_menu_auto_hide.in
 similarity index 58%
 rename from util/grub.d/01_menu_auto_hide.in
 rename to util/grub.d/12_menu_auto_hide.in
-index ad175870a5..6a7c0fa0d4 100644
+index ad175870a54..6a7c0fa0d43 100644
 --- a/util/grub.d/01_menu_auto_hide.in
 +++ b/util/grub.d/12_menu_auto_hide.in
 @@ -1,5 +1,8 @@
diff --git a/0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch b/0098-Don-t-assume-that-boot-commands-will-only-return-on-.patch
similarity index 98%
rename from 0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch
rename to 0098-Don-t-assume-that-boot-commands-will-only-return-on-.patch
index df365176..06c6581d 100644
--- a/0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch
+++ b/0098-Don-t-assume-that-boot-commands-will-only-return-on-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 13 insertions(+), 10 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index fe2e77a43e..ec0c92bade 100644
+index 30ddcea0c11..cda10fa8b3f 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -285,7 +285,7 @@ get_and_remove_first_entry_number (grub_menu_t menu, const char *name)
diff --git a/0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch b/0099-grub-set-bootflag-Update-comment-about-running-as-ro.patch
similarity index 96%
rename from 0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch
rename to 0099-grub-set-bootflag-Update-comment-about-running-as-ro.patch
index 9ffb3aec..4fa4df49 100644
--- a/0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch
+++ b/0099-grub-set-bootflag-Update-comment-about-running-as-ro.patch
@@ -13,7 +13,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
-index a6ccc11383..3eb04beb5e 100644
+index a6ccc113839..3eb04beb5e7 100644
 --- a/util/grub-set-bootflag.c
 +++ b/util/grub-set-bootflag.c
 @@ -18,7 +18,7 @@
diff --git a/0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch b/0100-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
similarity index 99%
rename from 0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
rename to 0100-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
index 11722d17..ab3f79ea 100644
--- a/0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
+++ b/0100-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
@@ -13,7 +13,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  1 file changed, 78 insertions(+), 9 deletions(-)
 
 diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
-index 3eb04beb5e..3b4c25ca2a 100644
+index 3eb04beb5e7..3b4c25ca2ac 100644
 --- a/util/grub-set-bootflag.c
 +++ b/util/grub-set-bootflag.c
 @@ -28,7 +28,9 @@
diff --git a/0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/0101-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
similarity index 98%
rename from 0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
rename to 0101-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
index 948ff737..a32c1465 100644
--- a/0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
+++ b/0101-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
@@ -53,7 +53,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in
-index 6c88d933dd..e73f4137b3 100644
+index 6c88d933dde..e73f4137b36 100644
 --- a/util/grub.d/10_reset_boot_success.in
 +++ b/util/grub.d/10_reset_boot_success.in
 @@ -6,18 +6,18 @@
diff --git a/0122-Add-start-symbol-for-RISC-V.patch b/0102-Add-start-symbol-for-RISC-V.patch
similarity index 95%
rename from 0122-Add-start-symbol-for-RISC-V.patch
rename to 0102-Add-start-symbol-for-RISC-V.patch
index 2746fa25..677efae0 100644
--- a/0122-Add-start-symbol-for-RISC-V.patch
+++ b/0102-Add-start-symbol-for-RISC-V.patch
@@ -15,7 +15,7 @@ Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/grub-core/kern/riscv/efi/startup.S b/grub-core/kern/riscv/efi/startup.S
-index f2a7b2b1ed..781773136e 100644
+index f2a7b2b1ede..781773136e8 100644
 --- a/grub-core/kern/riscv/efi/startup.S
 +++ b/grub-core/kern/riscv/efi/startup.S
 @@ -29,6 +29,7 @@
diff --git a/0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch b/0103-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
similarity index 92%
rename from 0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
rename to 0103-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
index 8bfc964c..c25b28ea 100644
--- a/0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
+++ b/0103-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
@@ -19,10 +19,10 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/bootstrap.conf b/bootstrap.conf
-index 6b043fc354..52d4af44be 100644
+index 7a7813d2825..60de0597c50 100644
 --- a/bootstrap.conf
 +++ b/bootstrap.conf
-@@ -92,7 +92,7 @@ bootstrap_post_import_hook () {
+@@ -94,7 +94,7 @@ bootstrap_post_import_hook () {
      patch -d po -p3 \
        < "po/gettext-patches/$patchname.patch"
    done
diff --git a/0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch b/0104-efi-http-Export-fw-http-_path-variables-to-make-them.patch
similarity index 95%
rename from 0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch
rename to 0104-efi-http-Export-fw-http-_path-variables-to-make-them.patch
index f745782b..55cce245 100644
--- a/0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch
+++ b/0104-efi-http-Export-fw-http-_path-variables-to-make-them.patch
@@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 1c540fc8c2..b573be6650 100644
+index 7347a8de676..353a62ef1e1 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -143,6 +143,7 @@ grub_set_prefix_and_root (void)
@@ -37,7 +37,7 @@ index 1c540fc8c2..b573be6650 100644
  	  grub_free (fw_path);
  	}
 diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index de351b2cd0..755b7a6d05 100644
+index 5e97f5d5e70..3be86c141f5 100644
 --- a/grub-core/net/efi/http.c
 +++ b/grub-core/net/efi/http.c
 @@ -39,6 +39,7 @@ http_configure (struct grub_efi_net_device *dev, int prefer_ip6)
diff --git a/0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch b/0105-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
similarity index 94%
rename from 0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
rename to 0105-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
index 03d85c2c..30d206e8 100644
--- a/0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
+++ b/0105-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
@@ -43,7 +43,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 28 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index 755b7a6d05..fc8cb25ae0 100644
+index 3be86c141f5..c37c359c713 100644
 --- a/grub-core/net/efi/http.c
 +++ b/grub-core/net/efi/http.c
 @@ -158,13 +158,7 @@ efihttp_request (grub_efi_http_t *http, char *server, char *name, int use_https,
@@ -102,13 +102,13 @@ index 755b7a6d05..fc8cb25ae0 100644
    request_data.method = (headeronly > 0) ? GRUB_EFI_HTTPMETHODHEAD : GRUB_EFI_HTTPMETHODGET;
  
    request_message.data.request = &request_data;
-@@ -228,6 +244,9 @@ efihttp_request (grub_efi_http_t *http, char *server, char *name, int use_https,
+@@ -225,6 +241,9 @@ efihttp_request (grub_efi_http_t *http, char *server, char *name, int use_https,
  
-   status = efi_call_2 (http->request, http, &request_token);
+   status = http->request(http, &request_token);
  
 +  if (hostname)
 +    grub_free (hostname);
 +
    if (status != GRUB_EFI_SUCCESS)
      {
-       efi_call_1 (b->close_event, request_token.event);
+       b->close_event(request_token.event);
diff --git a/0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch b/0106-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
similarity index 97%
rename from 0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
rename to 0106-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
index 8fe26cd2..96ebab3e 100644
--- a/0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
+++ b/0106-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
@@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index 6603cd83ed..84573937b1 100644
+index 1f7e1b63557..4ef3f709ee2 100644
 --- a/grub-core/net/efi/net.c
 +++ b/grub-core/net/efi/net.c
 @@ -742,7 +742,7 @@ grub_efi_net_parse_address (const char *address,
diff --git a/0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch b/0107-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
similarity index 97%
rename from 0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
rename to 0107-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
index 2dc70010..eb342e8c 100644
--- a/0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
+++ b/0107-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
@@ -21,7 +21,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c
-index b711a5d945..313c818b18 100644
+index 1deba25e79e..fb2fe850d0e 100644
 --- a/grub-core/net/efi/ip4_config.c
 +++ b/grub-core/net/efi/ip4_config.c
 @@ -56,9 +56,20 @@ int
diff --git a/0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch b/0108-efi-net-Print-a-debug-message-if-parsing-the-address.patch
similarity index 98%
rename from 0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch
rename to 0108-efi-net-Print-a-debug-message-if-parsing-the-address.patch
index da94e081..8ef8514f 100644
--- a/0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch
+++ b/0108-efi-net-Print-a-debug-message-if-parsing-the-address.patch
@@ -22,7 +22,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 11 insertions(+), 7 deletions(-)
 
 diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index 84573937b1..a3f0535d43 100644
+index 4ef3f709ee2..a9536c66550 100644
 --- a/grub-core/net/efi/net.c
 +++ b/grub-core/net/efi/net.c
 @@ -778,9 +778,9 @@ grub_efi_net_parse_address (const char *address,
diff --git a/0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch b/0109-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
similarity index 96%
rename from 0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
rename to 0109-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
index 8793b0df..3dd525af 100644
--- a/0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
+++ b/0109-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
@@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/kern/term.c b/grub-core/kern/term.c
-index 14d5964983..4d61f4e979 100644
+index 14d59649832..4d61f4e9790 100644
 --- a/grub-core/kern/term.c
 +++ b/grub-core/kern/term.c
 @@ -144,9 +144,10 @@ grub_key_is_interrupt (int key)
diff --git a/0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch b/0110-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
similarity index 93%
rename from 0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
rename to 0110-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
index 7fef93eb..2f443d7a 100644
--- a/0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
+++ b/0110-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
@@ -20,10 +20,10 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index b52b558d63..7f878b5615 100644
+index af486198399..ce2b492c353 100644
 --- a/grub-core/net/http.c
 +++ b/grub-core/net/http.c
-@@ -501,13 +501,20 @@ http_open (struct grub_file *file, const char *filename)
+@@ -502,13 +502,20 @@ http_open (struct grub_file *file, const char *filename)
  {
    grub_err_t err;
    struct http_data *data;
diff --git a/0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch b/0111-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
similarity index 95%
rename from 0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
rename to 0111-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
index f3b10c14..f29706f3 100644
--- a/0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
+++ b/0111-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/grub-core/commands/efi/env.c b/grub-core/commands/efi/env.c
-index cbd13e03e8..977edb6b06 100644
+index 45f107ccd5b..4080f24fdb8 100644
 --- a/grub-core/commands/efi/env.c
 +++ b/grub-core/commands/efi/env.c
 @@ -149,6 +149,8 @@ grub_efi_load_env(grub_command_t cmd __attribute__ ((unused)),
diff --git a/0135-efi-dhcp-fix-some-allocation-error-checking.patch b/0112-efi-dhcp-fix-some-allocation-error-checking.patch
similarity index 83%
rename from 0135-efi-dhcp-fix-some-allocation-error-checking.patch
rename to 0112-efi-dhcp-fix-some-allocation-error-checking.patch
index 90e7a34d..e891757c 100644
--- a/0135-efi-dhcp-fix-some-allocation-error-checking.patch
+++ b/0112-efi-dhcp-fix-some-allocation-error-checking.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c
-index dbef63d8c0..e5c79b748b 100644
+index ca19902441b..6cc0dad85a7 100644
 --- a/grub-core/net/efi/dhcp.c
 +++ b/grub-core/net/efi/dhcp.c
 @@ -80,7 +80,7 @@ grub_efi_dhcp4_parse_dns (grub_efi_dhcp4_protocol_t *dhcp4, grub_efi_dhcp4_packe
@@ -26,10 +26,10 @@ index dbef63d8c0..e5c79b748b 100644
  	if (status == GRUB_EFI_BUFFER_TOO_SMALL && count)
  	  {
 -	    options = grub_malloc (count * sizeof(*options));
--	    status = efi_call_4 (dev->dhcp6->parse, dev->dhcp6, mode.ia->reply_packet, &count, options);
+-	    status = dev->dhcp6->parse(dev->dhcp6, mode.ia->reply_packet, &count, options);
 +	    options = grub_calloc (count, sizeof(*options));
 +	    if (options)
-+	      status = efi_call_4 (dev->dhcp6->parse, dev->dhcp6, mode.ia->reply_packet, &count, options);
++	      status = dev->dhcp6->parse(dev->dhcp6, mode.ia->reply_packet, &count, options);
 +	    else
 +	      status = GRUB_EFI_OUT_OF_RESOURCES;
  	  }
diff --git a/0113-Make-it-possible-to-subtract-conditions-from-debug.patch b/0113-Make-it-possible-to-subtract-conditions-from-debug.patch
deleted file mode 100644
index 15305f85..00000000
--- a/0113-Make-it-possible-to-subtract-conditions-from-debug.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 17 Jan 2019 13:10:39 -0500
-Subject: [PATCH] Make it possible to subtract conditions from debug=
-
-This makes it so you can do set debug to "all,-scripting,-lexer" and get the
-obvious outcome.  Any negation present will take preference over that
-conditional, so "all,-scripting,scripting" is the same thing as
-"all,-scripting".
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/kern/misc.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 9a2fae6398..578bf51a5f 100644
---- a/grub-core/kern/misc.c
-+++ b/grub-core/kern/misc.c
-@@ -164,12 +164,24 @@ int
- grub_debug_enabled (const char * condition)
- {
-   const char *debug;
-+  char *negcond;
-+  int negated = 0;
- 
-   debug = grub_env_get ("debug");
-   if (!debug)
-     return 0;
- 
--  if (grub_strword (debug, "all") || grub_strword (debug, condition))
-+  negcond = grub_zalloc (grub_strlen (condition) + 2);
-+  if (negcond)
-+    {
-+      grub_strcpy (negcond, "-");
-+      grub_strcpy (negcond+1, condition);
-+      negated = grub_strword (debug, negcond);
-+      grub_free (negcond);
-+    }
-+
-+  if (!negated &&
-+      (grub_strword (debug, "all") || grub_strword (debug, condition)))
-     return 1;
- 
-   return 0;
diff --git a/0136-efi-http-fix-some-allocation-error-checking.patch b/0113-efi-http-fix-some-allocation-error-checking.patch
similarity index 84%
rename from 0136-efi-http-fix-some-allocation-error-checking.patch
rename to 0113-efi-http-fix-some-allocation-error-checking.patch
index 149ada89..ba34e7fb 100644
--- a/0136-efi-http-fix-some-allocation-error-checking.patch
+++ b/0113-efi-http-fix-some-allocation-error-checking.patch
@@ -9,10 +9,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index fc8cb25ae0..26647a50fa 100644
+index c37c359c713..0568ea5d43e 100644
 --- a/grub-core/net/efi/http.c
 +++ b/grub-core/net/efi/http.c
-@@ -412,8 +412,8 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
+@@ -403,8 +403,8 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
  		  int type)
  {
    grub_err_t err;
@@ -23,7 +23,7 @@ index fc8cb25ae0..26647a50fa 100644
    char *file_name = NULL;
    const char *http_path;
  
-@@ -441,8 +441,11 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
+@@ -432,8 +432,11 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
        return err;
      }
  
diff --git a/0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch b/0114-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
similarity index 98%
rename from 0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
rename to 0114-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
index 6413eb6d..c4beaa47 100644
--- a/0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
+++ b/0114-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 28 insertions(+), 10 deletions(-)
 
 diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c
-index 313c818b18..9725e928f7 100644
+index fb2fe850d0e..e9fc24865ec 100644
 --- a/grub-core/net/efi/ip4_config.c
 +++ b/grub-core/net/efi/ip4_config.c
 @@ -4,15 +4,20 @@
@@ -82,7 +82,7 @@ index 313c818b18..9725e928f7 100644
        char *subnet, *gateway, *mask;
        grub_uint32_t u32_subnet, u32_gateway;
 diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c
-index 017c4d05bc..a46f6f9b68 100644
+index 29a03973265..050af4fbfd1 100644
 --- a/grub-core/net/efi/ip6_config.c
 +++ b/grub-core/net/efi/ip6_config.c
 @@ -3,6 +3,7 @@
diff --git a/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch b/0115-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
similarity index 97%
rename from 0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
rename to 0115-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
index ea92110b..d0dd8870 100644
--- a/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
+++ b/0115-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c
-index 9725e928f7..cb880fc3e8 100644
+index e9fc24865ec..85a090ec422 100644
 --- a/grub-core/net/efi/ip4_config.c
 +++ b/grub-core/net/efi/ip4_config.c
 @@ -61,7 +61,8 @@ int
diff --git a/0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch b/0116-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
similarity index 96%
rename from 0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
rename to 0116-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
index 915e6d72..1ecbfd88 100644
--- a/0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
+++ b/0116-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c
-index a46f6f9b68..1c5415d718 100644
+index 050af4fbfd1..952bda9fa74 100644
 --- a/grub-core/net/efi/ip6_config.c
 +++ b/grub-core/net/efi/ip6_config.c
 @@ -85,7 +85,7 @@ grub_efi_string_to_ip6_address (const char *val, grub_efi_ipv6_address_t *addres
diff --git a/0116-Fix-systemctl-kexec-exit-status-check.patch b/0116-Fix-systemctl-kexec-exit-status-check.patch
deleted file mode 100644
index 567e6786..00000000
--- a/0116-Fix-systemctl-kexec-exit-status-check.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Tue, 9 Apr 2019 12:30:38 +0200
-Subject: [PATCH] Fix systemctl kexec exit status check
-
-There's always an error printed even when the systemctl kexec command does
-succeed. That's because systemctl executes it asynchronously, but the emu
-loader seems to expect it to be synchronous and that should never return.
-
-Also, it's wrong to test if kexecute == 1 since we already know that's the
-case or otherwise the function wouldn't had called grub_fatal() earlier.
-
-Finally, systemctl kexec failing shouldn't be a fatal error since the emu
-loader fallbacks to executing the kexec command in case of a failure.
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- grub-core/loader/emu/linux.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c
-index fda9e00d24..5b85b225ee 100644
---- a/grub-core/loader/emu/linux.c
-+++ b/grub-core/loader/emu/linux.c
-@@ -71,8 +71,10 @@ grub_linux_boot (void)
- 		(kexecute==1) ? "do-or-die" : "just-in-case");
-   rc = grub_util_exec (systemctl);
- 
--  if (kexecute == 1)
--    grub_fatal (N_("Error trying to perform 'systemctl kexec'"));
-+  if (rc == GRUB_ERR_NONE)
-+    return rc;
-+
-+  grub_error (rc, N_("Error trying to perform 'systemctl kexec'"));
- 
-   /* need to check read-only root before resetting hard!? */
-   grub_printf("Performing 'kexec -e'");
diff --git a/0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch b/0117-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
similarity index 97%
rename from 0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
rename to 0117-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
index fbba65a7..fe583d35 100644
--- a/0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
+++ b/0117-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index a3f0535d43..78e5442fc5 100644
+index a9536c66550..0a1e604b5bd 100644
 --- a/grub-core/net/efi/net.c
 +++ b/grub-core/net/efi/net.c
 @@ -729,7 +729,7 @@ grub_efi_net_parse_address (const char *address,
diff --git a/0117-Print-grub-emu-linux-loader-messages-as-debug.patch b/0117-Print-grub-emu-linux-loader-messages-as-debug.patch
deleted file mode 100644
index 2718a70b..00000000
--- a/0117-Print-grub-emu-linux-loader-messages-as-debug.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Tue, 9 Apr 2019 12:42:37 +0200
-Subject: [PATCH] Print grub-emu linux loader messages as debug
-
-They just polute the output and should better be debug messages instead.
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- grub-core/loader/emu/linux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c
-index 5b85b225ee..22ab6af172 100644
---- a/grub-core/loader/emu/linux.c
-+++ b/grub-core/loader/emu/linux.c
-@@ -50,7 +50,7 @@ grub_linux_boot (void)
-     initrd_param = grub_xasprintf("%s", "");
-   }
- 
--  grub_printf("%serforming 'kexec -l %s %s %s'\n",
-+  grub_dprintf ("linux", "%serforming 'kexec -l %s %s %s'\n",
- 	(kexecute) ? "P" : "Not p",
- 	kernel_path, initrd_param, boot_cmdline);
- 
-@@ -67,7 +67,7 @@ grub_linux_boot (void)
-   if (kexecute < 1)
-     grub_fatal (N_("Use '"PACKAGE"-emu --kexec' to force a system restart."));
- 
--  grub_printf("Performing 'systemctl kexec' (%s) ",
-+  grub_dprintf ("linux", "Performing 'systemctl kexec' (%s) ",
- 		(kexecute==1) ? "do-or-die" : "just-in-case");
-   rc = grub_util_exec (systemctl);
- 
diff --git a/0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch b/0118-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
similarity index 97%
rename from 0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
rename to 0118-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
index 9b9acfea..ea5be7c4 100644
--- a/0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
+++ b/0118-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c
-index 531949cba5..73e2bb01c1 100644
+index b84f86ea470..e828fb23e96 100644
 --- a/grub-core/net/efi/pxe.c
 +++ b/grub-core/net/efi/pxe.c
 @@ -187,7 +187,7 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
diff --git a/0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch b/0119-Add-systemd-integration-scripts-to-make-systemctl-re.patch
similarity index 91%
rename from 0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch
rename to 0119-Add-systemd-integration-scripts-to-make-systemctl-re.patch
index 9e0fc884..ce424e17 100644
--- a/0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch
+++ b/0119-Add-systemd-integration-scripts-to-make-systemctl-re.patch
@@ -65,10 +65,10 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  create mode 100644 util/systemd/systemd-integration.sh.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 2e6ad979c3..9927c2cfd6 100644
+index 885dc688a60..8e52e48c780 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -470,6 +470,12 @@ script = {
+@@ -473,6 +473,12 @@ script = {
    installdir = grubconf;
  };
  
@@ -81,7 +81,7 @@ index 2e6ad979c3..9927c2cfd6 100644
  script = {
    name = '01_users';
    common = util/grub.d/01_users.in;
-@@ -569,6 +575,27 @@ script = {
+@@ -578,6 +584,27 @@ script = {
    installdir = grubconf;
  };
  
@@ -110,10 +110,10 @@ index 2e6ad979c3..9927c2cfd6 100644
    mansection = 1;
    name = grub-mkrescue;
 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 0647c53b91..9fe5863b2d 100644
+index 91ff6c905fb..c8756d8146f 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
-@@ -63,8 +63,11 @@ CCASFLAGS_LIBRARY = $(UTILS_CCASFLAGS)
+@@ -73,8 +73,11 @@ CCASFLAGS_LIBRARY = $(UTILS_CCASFLAGS)
  # Other variables
  
  grubconfdir = $(sysconfdir)/grub.d
@@ -123,21 +123,21 @@ index 0647c53b91..9fe5863b2d 100644
 +systemdunitdir = ${prefix}/lib/systemd/system
 +systemd_logind_service_ddir = $(systemdunitdir)/systemd-logind.service.d
  
- CFLAGS_GNULIB = -Wno-undef -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Werror=trampolines -fno-trampolines
+ CFLAGS_GNULIB = -Wno-undef -Wno-error=sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-error=attributes -Werror=trampolines -fno-trampolines
  CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/lib/gnulib -I$(top_srcdir)/grub-core/lib/gnulib
-@@ -121,6 +124,9 @@ noinst_LIBRARIES =
- dist_noinst_DATA =
- platform_SCRIPTS =
+@@ -133,6 +136,9 @@ platform_SCRIPTS =
  platform_PROGRAMS =
+ sbin_SCRIPTS =
+ sbin_PROGRAMS =
 +grublibexec_SCRIPTS =
 +systemdunit_SCRIPTS =
 +systemd_logind_service_d_SCRIPTS =
  
- TESTS =
  EXTRA_DIST =
+ CLEANFILES =
 diff --git a/util/grub.d/14_menu_show_once.in b/util/grub.d/14_menu_show_once.in
 new file mode 100755
-index 0000000000..1cd7f36142
+index 00000000000..1cd7f36142b
 --- /dev/null
 +++ b/util/grub.d/14_menu_show_once.in
 @@ -0,0 +1,13 @@
@@ -156,7 +156,7 @@ index 0000000000..1cd7f36142
 +EOF
 diff --git a/util/systemd/10-grub-logind-service.conf.in b/util/systemd/10-grub-logind-service.conf.in
 new file mode 100644
-index 0000000000..f2d4ac0073
+index 00000000000..f2d4ac00732
 --- /dev/null
 +++ b/util/systemd/10-grub-logind-service.conf.in
 @@ -0,0 +1,2 @@
@@ -164,7 +164,7 @@ index 0000000000..f2d4ac0073
 +Environment=SYSTEMD_REBOOT_TO_BOOT_LOADER_MENU=true
 diff --git a/util/systemd/grub-systemd-integration.service.in b/util/systemd/grub-systemd-integration.service.in
 new file mode 100644
-index 0000000000..c81fb594ce
+index 00000000000..c81fb594ce1
 --- /dev/null
 +++ b/util/systemd/grub-systemd-integration.service.in
 @@ -0,0 +1,8 @@
@@ -178,7 +178,7 @@ index 0000000000..c81fb594ce
 +ExecStart=@libexecdir@/@grubdirname@/systemd-integration.sh
 diff --git a/util/systemd/systemd-integration.sh.in b/util/systemd/systemd-integration.sh.in
 new file mode 100644
-index 0000000000..dc1218597b
+index 00000000000..dc1218597bc
 --- /dev/null
 +++ b/util/systemd/systemd-integration.sh.in
 @@ -0,0 +1,6 @@
diff --git a/0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch b/0120-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
similarity index 97%
rename from 0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
rename to 0120-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
index a16ed68e..9021de50 100644
--- a/0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
+++ b/0120-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
@@ -18,7 +18,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/util/systemd/systemd-integration.sh.in b/util/systemd/systemd-integration.sh.in
-index dc1218597b..a4c071c5b0 100644
+index dc1218597bc..a4c071c5b0c 100644
 --- a/util/systemd/systemd-integration.sh.in
 +++ b/util/systemd/systemd-integration.sh.in
 @@ -4,3 +4,8 @@ TIMEOUT_USEC=$(cat /run/systemd/reboot-to-boot-loader-menu)
diff --git a/0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch b/0121-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
similarity index 93%
rename from 0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
rename to 0121-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
index f891a695..6011b339 100644
--- a/0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
+++ b/0121-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
@@ -29,10 +29,10 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
  2 files changed, 28 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
-index 597111077b..2601438260 100644
+index f8a129eb7f1..2d9ab65aee0 100644
 --- a/grub-core/term/at_keyboard.c
 +++ b/grub-core/term/at_keyboard.c
-@@ -135,20 +135,28 @@ query_mode (void)
+@@ -145,20 +145,28 @@ query_mode (void)
    int e;
  
    e = write_mode (0);
@@ -65,7 +65,7 @@ index 597111077b..2601438260 100644
    return 0;
  }
  
-@@ -165,7 +173,13 @@ set_scancodes (void)
+@@ -175,7 +183,13 @@ set_scancodes (void)
      }
  
  #if !USE_SCANCODE_SET
@@ -80,7 +80,7 @@ index 597111077b..2601438260 100644
    return;
  #else
  
-@@ -266,6 +280,7 @@ grub_keyboard_controller_init (void)
+@@ -276,6 +290,7 @@ grub_keyboard_controller_init (void)
    grub_keyboard_orig_set = 2;
  #else
    grub_keyboard_controller_orig = grub_keyboard_controller_read ();
@@ -88,7 +88,7 @@ index 597111077b..2601438260 100644
    grub_keyboard_orig_set = query_mode ();
  #endif
    set_scancodes ();
-@@ -275,11 +290,15 @@ grub_keyboard_controller_init (void)
+@@ -285,11 +300,15 @@ grub_keyboard_controller_init (void)
  static grub_err_t
  grub_keyboard_controller_fini (struct grub_term_input *term __attribute__ ((unused)))
  {
@@ -105,7 +105,7 @@ index 597111077b..2601438260 100644
  }
  
 diff --git a/include/grub/at_keyboard.h b/include/grub/at_keyboard.h
-index bcb4d9ba78..9414dc1b99 100644
+index bcb4d9ba78f..9414dc1b996 100644
 --- a/include/grub/at_keyboard.h
 +++ b/include/grub/at_keyboard.h
 @@ -19,6 +19,10 @@
diff --git a/0148-grub-install-disable-support-for-EFI-platforms.patch b/0122-grub-install-disable-support-for-EFI-platforms.patch
similarity index 81%
rename from 0148-grub-install-disable-support-for-EFI-platforms.patch
rename to 0122-grub-install-disable-support-for-EFI-platforms.patch
index f6a75304..380dbef1 100644
--- a/0148-grub-install-disable-support-for-EFI-platforms.patch
+++ b/0122-grub-install-disable-support-for-EFI-platforms.patch
@@ -21,15 +21,15 @@ Resolves: rhbz#1737444
 Signed-off-by: Jan Hlavac <jhlavac@redhat.com>
 [rharwood: drop man page]
 ---
- util/grub-install.c | 37 ++++++++++++++++---------------------
+ util/grub-install.c | 41 +++++++++++++++++++----------------------
  docs/grub.texi      |  7 +++++++
- 2 files changed, 23 insertions(+), 21 deletions(-)
+ 2 files changed, 26 insertions(+), 22 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index a2bec7446c..5babc7af55 100644
+index 66ef9494d9d..828e8722ba5 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
-@@ -899,6 +899,22 @@ main (int argc, char *argv[])
+@@ -915,6 +915,25 @@ main (int argc, char *argv[])
  
    platform = grub_install_get_target (grub_install_source_directory);
  
@@ -39,6 +39,9 @@ index a2bec7446c..5babc7af55 100644
 +    case GRUB_INSTALL_PLATFORM_ARM64_EFI:
 +    case GRUB_INSTALL_PLATFORM_I386_EFI:
 +    case GRUB_INSTALL_PLATFORM_IA64_EFI:
++    case GRUB_INSTALL_PLATFORM_LOONGARCH64_EFI:
++    case GRUB_INSTALL_PLATFORM_RISCV32_EFI:
++    case GRUB_INSTALL_PLATFORM_RISCV64_EFI:
 +    case GRUB_INSTALL_PLATFORM_X86_64_EFI:
 +      is_efi = 1;
 +      grub_util_error (_("this utility cannot be used for EFI platforms"
@@ -52,7 +55,7 @@ index a2bec7446c..5babc7af55 100644
    {
      char *platname = grub_install_get_platform_name (platform);
      fprintf (stderr, _("Installing for %s platform.\n"), platname);
-@@ -1011,28 +1027,7 @@ main (int argc, char *argv[])
+@@ -1029,27 +1048,6 @@ main (int argc, char *argv[])
    grub_hostfs_init ();
    grub_host_init ();
  
@@ -62,6 +65,7 @@ index a2bec7446c..5babc7af55 100644
 -    case GRUB_INSTALL_PLATFORM_X86_64_EFI:
 -    case GRUB_INSTALL_PLATFORM_ARM_EFI:
 -    case GRUB_INSTALL_PLATFORM_ARM64_EFI:
+-    case GRUB_INSTALL_PLATFORM_LOONGARCH64_EFI:
 -    case GRUB_INSTALL_PLATFORM_RISCV32_EFI:
 -    case GRUB_INSTALL_PLATFORM_RISCV64_EFI:
 -    case GRUB_INSTALL_PLATFORM_IA64_EFI:
@@ -76,16 +80,22 @@ index a2bec7446c..5babc7af55 100644
 -      break;
 -    }
 -
+   switch (platform)
+     {
+     case GRUB_INSTALL_PLATFORM_I386_IEEE1275:
+@@ -1065,7 +1063,6 @@ main (int argc, char *argv[])
+     }
+ 
    /* Find the EFI System Partition.  */
 -
    if (is_efi)
      {
        grub_fs_t fs;
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 04ed6ac1f0..4870faaa00 100644
+index 44c4e665a0d..1e577d2fee9 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -6509,6 +6509,13 @@ grub2-install @var{install_device}
+@@ -7112,6 +7112,13 @@ grub2-install @var{install_device}
  The device name @var{install_device} is an OS device name or a GRUB
  device name.
  
diff --git a/0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch b/0123-New-with-debug-timestamps-configure-flag-to-prepend-.patch
similarity index 84%
rename from 0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch
rename to 0123-New-with-debug-timestamps-configure-flag-to-prepend-.patch
index c32be3c1..426d5be9 100644
--- a/0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch
+++ b/0123-New-with-debug-timestamps-configure-flag-to-prepend-.patch
@@ -15,10 +15,10 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
  3 files changed, 39 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index de707f7e0b..f069d84039 100644
+index ae7683d0693..016cd3d4e0e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1586,6 +1586,17 @@ else
+@@ -1686,6 +1686,17 @@ else
  fi
  AC_SUBST([BOOT_TIME_STATS])
  
@@ -33,10 +33,10 @@ index de707f7e0b..f069d84039 100644
 +fi
 +AC_SUBST([DEBUG_WITH_TIMESTAMPS])
 +
- AC_ARG_ENABLE([grub-emu-sdl],
- 	      [AS_HELP_STRING([--enable-grub-emu-sdl],
-                              [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])])
-@@ -2167,6 +2178,7 @@ AM_CONDITIONAL([COND_APPLE_LINKER], [test x$TARGET_APPLE_LINKER = x1])
+ AC_ARG_ENABLE([grub-emu-sdl2],
+ 	      [AS_HELP_STRING([--enable-grub-emu-sdl2],
+                              [build and install the `grub-emu' debugging utility with SDL2 support (default=guessed)])])
+@@ -2296,6 +2307,7 @@ AM_CONDITIONAL([COND_APPLE_LINKER], [test x$TARGET_APPLE_LINKER = x1])
  AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
  AM_CONDITIONAL([COND_ENABLE_CACHE_STATS], [test x$DISK_CACHE_STATS = x1])
  AM_CONDITIONAL([COND_ENABLE_BOOT_TIME_STATS], [test x$BOOT_TIME_STATS = x1])
@@ -44,7 +44,7 @@ index de707f7e0b..f069d84039 100644
  
  AM_CONDITIONAL([COND_HAVE_CXX], [test x$HAVE_CXX = xyes])
  
-@@ -2262,6 +2274,12 @@ else
+@@ -2397,6 +2409,12 @@ else
  echo With boot time statistics: No
  fi
  
@@ -58,12 +58,12 @@ index de707f7e0b..f069d84039 100644
  echo efiemu runtime: Yes
  else
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 578bf51a5f..9f54b6b7d2 100644
+index 779586658cb..d40586b9268 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -25,6 +25,9 @@
- #include <grub/env.h>
- #include <grub/i18n.h>
+@@ -27,6 +27,9 @@
+ #include <grub/types.h>
+ #include <grub/charset.h>
  #include <grub/backtrace.h>
 +#if DEBUG_WITH_TIMESTAMPS
 +#include <grub/time.h>
@@ -71,7 +71,7 @@ index 578bf51a5f..9f54b6b7d2 100644
  
  union printf_arg
  {
-@@ -192,9 +195,26 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
+@@ -236,9 +239,26 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
  		   const char *fmt, ...)
  {
    va_list args;
@@ -95,14 +95,14 @@ index 578bf51a5f..9f54b6b7d2 100644
 +      else
 +        last_had_cr = 0;
 +#endif
-       grub_printf ("%s:%d: ", file, line);
+       grub_printf ("%s:%d:%s: ", file, line, condition);
        va_start (args, fmt);
        grub_vprintf (fmt, args);
 diff --git a/config.h.in b/config.h.in
-index c7e316f0f1..c80e3e0aba 100644
+index d294d2c653f..39f4e5472ce 100644
 --- a/config.h.in
 +++ b/config.h.in
-@@ -12,6 +12,7 @@
+@@ -16,6 +16,7 @@
  /* Define to 1 to enable disk cache statistics.  */
  #define DISK_CACHE_STATS @DISK_CACHE_STATS@
  #define BOOT_TIME_STATS @BOOT_TIME_STATS@
diff --git a/0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch b/0124-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
similarity index 67%
rename from 0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
rename to 0124-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
index d26027c7..0cd12c44 100644
--- a/0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
+++ b/0124-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
@@ -9,11 +9,11 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
 ---
- grub-core/kern/disk.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ grub-core/kern/disk.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c
-index e1b0e073e0..05a28ab142 100644
+index 1eda58fe9a1..355b6579d87 100644
 --- a/grub-core/kern/disk.c
 +++ b/grub-core/kern/disk.c
 @@ -285,6 +285,8 @@ grub_disk_open (const char *name)
@@ -25,16 +25,7 @@ index e1b0e073e0..05a28ab142 100644
    return disk;
  }
  
-@@ -292,7 +294,7 @@ void
- grub_disk_close (grub_disk_t disk)
- {
-   grub_partition_t part;
--  grub_dprintf ("disk", "Closing `%s'.\n", disk->name);
-+  grub_dprintf ("disk", "Closing `%s'...\n", disk->name);
- 
-   if (disk->dev && disk->dev->disk_close)
-     (disk->dev->disk_close) (disk);
-@@ -306,8 +308,10 @@ grub_disk_close (grub_disk_t disk)
+@@ -310,8 +312,10 @@ grub_disk_close (grub_disk_t disk)
        grub_free (disk->partition);
        disk->partition = part;
      }
diff --git a/0151-Introduce-function-grub_debug_is_enabled-void-return.patch b/0125-Introduce-function-grub_debug_is_enabled-void-return.patch
similarity index 87%
rename from 0151-Introduce-function-grub_debug_is_enabled-void-return.patch
rename to 0125-Introduce-function-grub_debug_is_enabled-void-return.patch
index 9ce5d9df..224d2044 100644
--- a/0151-Introduce-function-grub_debug_is_enabled-void-return.patch
+++ b/0125-Introduce-function-grub_debug_is_enabled-void-return.patch
@@ -14,10 +14,10 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
  2 files changed, 14 insertions(+)
 
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 9f54b6b7d2..a186ad3dd4 100644
+index d40586b9268..d3a493e3552 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -163,6 +163,19 @@ int grub_err_printf (const char *fmt, ...)
+@@ -186,6 +186,19 @@ int grub_err_printf (const char *fmt, ...)
  __attribute__ ((alias("grub_printf")));
  #endif
  
@@ -38,10 +38,10 @@ index 9f54b6b7d2..a186ad3dd4 100644
  grub_debug_enabled (const char * condition)
  {
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 3adc4036e3..6c4aa85ac5 100644
+index 72aff15750d..3f5f5b61695 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
-@@ -340,6 +340,7 @@ grub_puts (const char *s)
+@@ -369,6 +369,7 @@ grub_puts (const char *s)
  }
  
  int EXPORT_FUNC(grub_puts_) (const char *s);
diff --git a/0152-Don-t-clear-screen-when-debugging-is-enabled.patch b/0126-Don-t-clear-screen-when-debugging-is-enabled.patch
similarity index 80%
rename from 0152-Don-t-clear-screen-when-debugging-is-enabled.patch
rename to 0126-Don-t-clear-screen-when-debugging-is-enabled.patch
index c35d8a3c..8cca97ca 100644
--- a/0152-Don-t-clear-screen-when-debugging-is-enabled.patch
+++ b/0126-Don-t-clear-screen-when-debugging-is-enabled.patch
@@ -10,20 +10,18 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
 [rharwood@redhat.com: rebase fuzz]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/normal/main.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ grub-core/normal/main.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index af9792c963..7de9e4c36d 100644
+index b5fa6156549..0ea27d3c534 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -215,8 +215,9 @@ grub_normal_init_page (struct grub_term_output *term,
-   char *msg_formatted;
+@@ -216,7 +216,8 @@ grub_normal_init_page (struct grub_term_output *term,
    grub_uint32_t *unicode_msg;
    grub_uint32_t *last_position;
-- 
+ 
 -  grub_term_cls (term);
-+
 +  if (! grub_debug_is_enabled ())
 +    grub_term_cls (term);
  
diff --git a/0153-grub_file_-instrumentation-new-file-debug-tag.patch b/0127-grub_file_-instrumentation-new-file-debug-tag.patch
similarity index 82%
rename from 0153-grub_file_-instrumentation-new-file-debug-tag.patch
rename to 0127-grub_file_-instrumentation-new-file-debug-tag.patch
index 908e1ff6..1d35707f 100644
--- a/0153-grub_file_-instrumentation-new-file-debug-tag.patch
+++ b/0127-grub_file_-instrumentation-new-file-debug-tag.patch
@@ -12,7 +12,7 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
  1 file changed, 14 insertions(+)
 
 diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
-index 58454458c4..e19aea3e51 100644
+index 750177248f9..264211b1143 100644
 --- a/grub-core/kern/file.c
 +++ b/grub-core/kern/file.c
 @@ -66,6 +66,8 @@ grub_file_open (const char *name, enum grub_file_type type)
@@ -21,10 +21,10 @@ index 58454458c4..e19aea3e51 100644
  
 +  grub_dprintf ("file", "Opening `%s' ...\n", name);
 +
-   device_name = grub_file_get_device_name (name);
-   if (grub_errno)
-     goto fail;
-@@ -128,6 +130,8 @@ grub_file_open (const char *name, enum grub_file_type type)
+   /* Reset grub_errno before we start. */
+   grub_errno = GRUB_ERR_NONE;
+ 
+@@ -132,6 +134,8 @@ grub_file_open (const char *name, enum grub_file_type type)
    if (!file)
      grub_file_close (last_file);
  
@@ -33,7 +33,7 @@ index 58454458c4..e19aea3e51 100644
    return file;
  
   fail:
-@@ -138,6 +142,8 @@ grub_file_open (const char *name, enum grub_file_type type)
+@@ -143,6 +147,8 @@ grub_file_open (const char *name, enum grub_file_type type)
  
    grub_free (file);
  
@@ -42,7 +42,7 @@ index 58454458c4..e19aea3e51 100644
    return 0;
  }
  
-@@ -169,6 +175,7 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
+@@ -174,6 +180,7 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
  
    if (len == 0)
      return 0;
@@ -50,7 +50,7 @@ index 58454458c4..e19aea3e51 100644
    read_hook = file->read_hook;
    read_hook_data = file->read_hook_data;
    if (!file->read_hook)
-@@ -189,11 +196,18 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
+@@ -194,11 +201,18 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
  grub_err_t
  grub_file_close (grub_file_t file)
  {
diff --git a/0154-ieee1275-Avoiding-many-unecessary-open-close.patch b/0128-ieee1275-Avoiding-many-unecessary-open-close.patch
similarity index 94%
rename from 0154-ieee1275-Avoiding-many-unecessary-open-close.patch
rename to 0128-ieee1275-Avoiding-many-unecessary-open-close.patch
index f6c52441..fac8dc7e 100644
--- a/0154-ieee1275-Avoiding-many-unecessary-open-close.patch
+++ b/0128-ieee1275-Avoiding-many-unecessary-open-close.patch
@@ -9,7 +9,7 @@ Signed-off-by: Diego Domingos <diegodo@br.ibm.com>
  1 file changed, 35 insertions(+), 29 deletions(-)
 
 diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
-index 03674cb477..ea7f78ac7d 100644
+index c6cba0c8aaf..629fc15f284 100644
 --- a/grub-core/disk/ieee1275/ofdisk.c
 +++ b/grub-core/disk/ieee1275/ofdisk.c
 @@ -44,7 +44,7 @@ struct ofdisk_hash_ent
@@ -94,7 +94,7 @@ index 03674cb477..ea7f78ac7d 100644
      if (err)
        {
          grub_free (devpath);
-@@ -532,13 +555,6 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
+@@ -528,13 +551,6 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
  static void
  grub_ofdisk_close (grub_disk_t disk)
  {
@@ -108,7 +108,7 @@ index 03674cb477..ea7f78ac7d 100644
    disk->data = 0;
  }
  
-@@ -685,7 +701,7 @@ grub_ofdisk_init (void)
+@@ -681,7 +697,7 @@ grub_ofdisk_init (void)
  }
  
  static grub_err_t
@@ -117,7 +117,7 @@ index 03674cb477..ea7f78ac7d 100644
  			    struct ofdisk_hash_ent *op)
  {
    struct size_args_ieee1275
-@@ -698,16 +714,6 @@ grub_ofdisk_get_block_size (const char *device, grub_uint32_t *block_size,
+@@ -694,16 +710,6 @@ grub_ofdisk_get_block_size (const char *device, grub_uint32_t *block_size,
        grub_ieee1275_cell_t size2;
      } args_ieee1275;
  
diff --git a/0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch b/0129-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
similarity index 98%
rename from 0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
rename to 0129-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
index 04c5c32e..9fa02bb1 100644
--- a/0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
+++ b/0129-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Diego Domingos <diegodo@br.ibm.com>
  1 file changed, 49 insertions(+)
 
 diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c
-index a6153d3595..0f5d54e9f2 100644
+index a6153d35954..0f5d54e9f2d 100644
 --- a/grub-core/osdep/linux/ofpath.c
 +++ b/grub-core/osdep/linux/ofpath.c
 @@ -350,6 +350,38 @@ of_path_of_ide(const char *sys_devname __attribute__((unused)), const char *devi
diff --git a/0156-ieee1275-powerpc-enables-device-mapper-discovery.patch b/0130-ieee1275-powerpc-enables-device-mapper-discovery.patch
similarity index 98%
rename from 0156-ieee1275-powerpc-enables-device-mapper-discovery.patch
rename to 0130-ieee1275-powerpc-enables-device-mapper-discovery.patch
index 85dbde77..6f1c21b3 100644
--- a/0156-ieee1275-powerpc-enables-device-mapper-discovery.patch
+++ b/0130-ieee1275-powerpc-enables-device-mapper-discovery.patch
@@ -17,7 +17,7 @@ Signed-off-by: Diego Domingos <diegodo@br.ibm.com>
  1 file changed, 63 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c
-index 0f5d54e9f2..cc849d9c94 100644
+index 0f5d54e9f2d..cc849d9c94c 100644
 --- a/grub-core/osdep/linux/ofpath.c
 +++ b/grub-core/osdep/linux/ofpath.c
 @@ -37,6 +37,7 @@
diff --git a/0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch b/0131-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
similarity index 94%
rename from 0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
rename to 0131-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
index f938fd1a..65646f7d 100644
--- a/0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
+++ b/0131-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
@@ -35,7 +35,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 96 insertions(+), 25 deletions(-)
 
 diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
-index 2601438260..dac0f946fe 100644
+index 2d9ab65aee0..378deb321d9 100644
 --- a/grub-core/term/at_keyboard.c
 +++ b/grub-core/term/at_keyboard.c
 @@ -31,6 +31,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -46,7 +46,7 @@ index 2601438260..dac0f946fe 100644
  
  static int ping_sent;
  
-@@ -76,6 +77,8 @@ at_command (grub_uint8_t data)
+@@ -86,6 +87,8 @@ at_command (grub_uint8_t data)
  	break;
        return 0;
      }
@@ -55,7 +55,7 @@ index 2601438260..dac0f946fe 100644
    return (i != GRUB_AT_TRIES);
  }
  
-@@ -105,6 +108,21 @@ grub_keyboard_controller_read (void)
+@@ -115,6 +118,21 @@ grub_keyboard_controller_read (void)
  
  #endif
  
@@ -77,7 +77,7 @@ index 2601438260..dac0f946fe 100644
  static int
  write_mode (int mode)
  {
-@@ -113,11 +131,14 @@ write_mode (int mode)
+@@ -123,11 +141,14 @@ write_mode (int mode)
      {
        grub_uint8_t ack;
        keyboard_controller_wait_until_ready ();
@@ -92,7 +92,7 @@ index 2601438260..dac0f946fe 100644
        if (ack == GRUB_AT_NACK)
  	continue;
        if (ack == GRUB_AT_ACK)
-@@ -125,6 +146,9 @@ write_mode (int mode)
+@@ -135,6 +156,9 @@ write_mode (int mode)
        return 0;
      }
  
@@ -102,7 +102,7 @@ index 2601438260..dac0f946fe 100644
    return (i != GRUB_AT_TRIES);
  }
  
-@@ -132,31 +156,66 @@ static int
+@@ -142,31 +166,66 @@ static int
  query_mode (void)
  {
    grub_uint8_t ret;
@@ -189,7 +189,7 @@ index 2601438260..dac0f946fe 100644
    return 0;
  }
  
-@@ -165,14 +224,25 @@ set_scancodes (void)
+@@ -175,14 +234,25 @@ set_scancodes (void)
  {
    /* You must have visited computer museum. Keyboard without scancode set
       knowledge. Assume XT. */
@@ -219,7 +219,7 @@ index 2601438260..dac0f946fe 100644
    if ((grub_keyboard_controller_orig & KEYBOARD_AT_TRANSLATE) == KEYBOARD_AT_TRANSLATE) {
      grub_dprintf ("atkeyb", "queried set is %d but keyboard in Translate mode, so actually in set 1\n", grub_keyboard_orig_set);
      ps2_state.current_set = 1;
-@@ -261,6 +331,7 @@ grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
+@@ -271,6 +341,7 @@ grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
  static void
  grub_keyboard_controller_init (void)
  {
@@ -227,7 +227,7 @@ index 2601438260..dac0f946fe 100644
    ps2_state.at_keyboard_status = 0;
    /* Drain input buffer. */
    while (1)
-@@ -282,6 +353,7 @@ grub_keyboard_controller_init (void)
+@@ -292,6 +363,7 @@ grub_keyboard_controller_init (void)
    grub_keyboard_controller_orig = grub_keyboard_controller_read ();
    grub_dprintf ("atkeyb", "grub_keyboard_controller_orig = 0x%x\n", grub_keyboard_controller_orig);
    grub_keyboard_orig_set = query_mode ();
@@ -235,7 +235,7 @@ index 2601438260..dac0f946fe 100644
  #endif
    set_scancodes ();
    keyboard_controller_led (ps2_state.led_status);
-@@ -329,7 +401,6 @@ grub_at_restore_hw (void)
+@@ -339,7 +411,6 @@ grub_at_restore_hw (void)
    return GRUB_ERR_NONE;
  }
  
diff --git a/0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch b/0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
deleted file mode 100644
index d1c7b176..00000000
--- a/0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Sat, 16 May 2020 11:33:18 +0200
-Subject: [PATCH] tpm: Don't propagate TPM measurement errors to the verifiers
- layer
-
-Currently if the EFI firmware fails to do a TPM measurement for a file,
-the error will be propagated to the verifiers framework and so opening
-the file will not succeed.
-
-This mean that buggy firmwares will prevent the system to boot since the
-loader won't be able to open any file. But failing to do TPM measurements
-shouldn't be a fatal error and the system should still be able to boot.
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- grub-core/commands/tpm.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/grub-core/commands/tpm.c b/grub-core/commands/tpm.c
-index 2052c36eab..e287d042e6 100644
---- a/grub-core/commands/tpm.c
-+++ b/grub-core/commands/tpm.c
-@@ -42,7 +42,8 @@ grub_tpm_verify_init (grub_file_t io,
- static grub_err_t
- grub_tpm_verify_write (void *context, void *buf, grub_size_t size)
- {
--  return grub_tpm_measure (buf, size, GRUB_BINARY_PCR, context);
-+  grub_tpm_measure (buf, size, GRUB_BINARY_PCR, context);
-+  return GRUB_ERR_NONE;
- }
- 
- static grub_err_t
-@@ -50,7 +51,6 @@ grub_tpm_verify_string (char *str, enum grub_verify_string_type type)
- {
-   const char *prefix = NULL;
-   char *description;
--  grub_err_t status;
- 
-   switch (type)
-     {
-@@ -66,15 +66,15 @@ grub_tpm_verify_string (char *str, enum grub_verify_string_type type)
-     }
-   description = grub_malloc (grub_strlen (str) + grub_strlen (prefix) + 1);
-   if (!description)
--    return grub_errno;
-+    return GRUB_ERR_NONE;
-   grub_memcpy (description, prefix, grub_strlen (prefix));
-   grub_memcpy (description + grub_strlen (prefix), str,
- 	       grub_strlen (str) + 1);
--  status =
--    grub_tpm_measure ((unsigned char *) str, grub_strlen (str),
--		      GRUB_STRING_PCR, description);
-+
-+  grub_tpm_measure ((unsigned char *) str, grub_strlen (str), GRUB_STRING_PCR,
-+                    description);
-   grub_free (description);
--  return status;
-+  return GRUB_ERR_NONE;
- }
- 
- struct grub_file_verifier grub_tpm_verifier = {
diff --git a/0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/0132-Add-suport-for-signing-grub-with-an-appended-signatu.patch
similarity index 86%
rename from 0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch
rename to 0132-Add-suport-for-signing-grub-with-an-appended-signatu.patch
index 81660d4d..c9a45b1d 100644
--- a/0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch
+++ b/0132-Add-suport-for-signing-grub-with-an-appended-signatu.patch
@@ -34,19 +34,19 @@ under this scheme.
 Signed-off-by: Daniel Axtens <dja@axtens.net>
 Signed-off-by: Rashmica Gupta <rashmica.g@gmail.com>
 ---
- util/grub-install-common.c  | 18 ++++++++++++++----
+ util/grub-install-common.c  | 14 ++++++++++++--
  util/grub-mkimage.c         | 15 +++++++++++++--
  util/grub-mkimagexx.c       | 39 ++++++++++++++++++++++++++++++++++++++-
  util/mkimage.c              | 13 +++++++------
  include/grub/util/install.h |  8 ++++++--
  include/grub/util/mkimage.h |  4 ++--
- 6 files changed, 80 insertions(+), 17 deletions(-)
+ 6 files changed, 78 insertions(+), 15 deletions(-)
 
 diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index 4e212e690c..a74fee16e2 100644
+index ce854d86f86..1fa0f7f6f00 100644
 --- a/util/grub-install-common.c
 +++ b/util/grub-install-common.c
-@@ -461,10 +461,12 @@ static size_t npubkeys;
+@@ -466,10 +466,12 @@ static size_t npubkeys;
  static char *sbat;
  static int disable_shim_lock;
  static grub_compression_t compression;
@@ -58,8 +58,8 @@ index 4e212e690c..a74fee16e2 100644
 +  const char *end;
    switch (key)
      {
-     case 'C':
-@@ -562,6 +564,12 @@ grub_install_parse (int key, char *arg)
+     case GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS:
+@@ -567,6 +569,12 @@ grub_install_parse (int key, char *arg)
        grub_util_error (_("Unrecognized compression `%s'"), arg);
      case GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE:
        return 1;
@@ -72,24 +72,20 @@ index 4e212e690c..a74fee16e2 100644
      default:
        return 0;
      }
-@@ -661,11 +669,13 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
- 		  " --output '%s' "
- 		  " --dtb '%s' "
- 		  "--sbat '%s' "
--		  "--format '%s' --compression '%s' %s %s %s\n",
-+		  "--format '%s' --compression '%s' "
-+		  "--appended-signature-size %zu %s %s %s\n",
- 		  dir, prefix,
- 		  outname, dtb ? : "", sbat ? : "", mkimage_target,
--		  compnames[compression], note ? "--note" : "",
--		  disable_shim_lock ? "--disable-shim-lock" : "", s);
-+		  compnames[compression], appsig_size,
-+		  disable_shim_lock ? "--disable-shim-lock" : "",
-+		  note ? "--note" : "", s);
-   free (s);
+@@ -679,9 +687,11 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
+   *p = '\0';
  
-   tgt = grub_install_get_image_target (mkimage_target);
-@@ -675,7 +685,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
+   grub_util_info ("grub-mkimage --directory '%s' --prefix '%s' --output '%s'"
+-		  " --format '%s' --compression '%s'%s%s%s\n",
++		  " --format '%s' --compression '%s'"
++		  " --appended-signture-size %zu %s%s%s\n",
+ 		  dir, prefix, outname,
+ 		  mkimage_target, compnames[compression],
++		  appsig_size,
+ 		  note ? " --note" : "",
+ 		  disable_shim_lock ? " --disable-shim-lock" : "", s);
+   free (s);
+@@ -693,7 +703,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
    grub_install_generate_image (dir, prefix, fp, outname,
  			       modules.entries, memdisk_path,
  			       pubkeys, npubkeys, config_path, tgt,
@@ -99,7 +95,7 @@ index 4e212e690c..a74fee16e2 100644
    while (dc--)
      grub_install_pop_module ();
 diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
-index c0d5599370..8a53310548 100644
+index c0d55993702..8a53310548b 100644
 --- a/util/grub-mkimage.c
 +++ b/util/grub-mkimage.c
 @@ -84,6 +84,7 @@ static struct argp_option options[] = {
@@ -153,10 +149,10 @@ index c0d5599370..8a53310548 100644
    if (grub_util_file_sync (fp) < 0)
      grub_util_error (_("cannot sync `%s': %s"), arguments.output ? : "stdout",
 diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index d78fa3e533..393119486d 100644
+index e50b29533c6..9488f052510 100644
 --- a/util/grub-mkimagexx.c
 +++ b/util/grub-mkimagexx.c
-@@ -84,6 +84,15 @@ struct grub_ieee1275_note
+@@ -85,6 +85,15 @@ struct grub_ieee1275_note
    struct grub_ieee1275_note_desc descriptor;
  };
  
@@ -172,7 +168,7 @@ index d78fa3e533..393119486d 100644
  #define GRUB_XEN_NOTE_NAME "Xen"
  
  struct fixup_block_list
-@@ -207,7 +216,7 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr)
+@@ -208,7 +217,7 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr)
  
  void
  SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc *image_target,
@@ -181,7 +177,7 @@ index d78fa3e533..393119486d 100644
  				    Elf_Addr target_addr,
  				    struct grub_mkimage_layout *layout)
  {
-@@ -221,6 +230,12 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+@@ -222,6 +231,12 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
    int shnum = 4;
    int string_size = sizeof (".text") + sizeof ("mods") + 1;
  
@@ -194,7 +190,7 @@ index d78fa3e533..393119486d 100644
    if (image_target->id != IMAGE_LOONGSON_ELF)
      phnum += 2;
  
-@@ -484,6 +499,28 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+@@ -485,6 +500,28 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
        phdr->p_offset = grub_host_to_target32 (header_size + program_size);
      }
  
@@ -224,10 +220,10 @@ index d78fa3e533..393119486d 100644
      char *str_start = (elf_img + sizeof (*ehdr) + phnum * sizeof (*phdr)
  		       + shnum * sizeof (*shdr));
 diff --git a/util/mkimage.c b/util/mkimage.c
-index a26cf76f72..bab1227601 100644
+index 4237383acaf..d33838bec6b 100644
 --- a/util/mkimage.c
 +++ b/util/mkimage.c
-@@ -869,8 +869,9 @@ grub_install_generate_image (const char *dir, const char *prefix,
+@@ -885,8 +885,9 @@ grub_install_generate_image (const char *dir, const char *prefix,
  			     char *memdisk_path, char **pubkey_paths,
  			     size_t npubkeys, char *config_path,
  			     const struct grub_install_image_target_desc *image_target,
@@ -239,7 +235,7 @@ index a26cf76f72..bab1227601 100644
  {
    char *kernel_img, *core_img;
    size_t total_module_size, core_size;
-@@ -1773,11 +1774,11 @@ grub_install_generate_image (const char *dir, const char *prefix,
+@@ -1810,11 +1811,11 @@ grub_install_generate_image (const char *dir, const char *prefix,
  	else
  	  target_addr = image_target->link_addr;
  	if (image_target->voidp_sizeof == 4)
@@ -256,7 +252,7 @@ index a26cf76f72..bab1227601 100644
        break;
      }
 diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index 7df3191f47..cf4531e02b 100644
+index 35cf17a8d93..2720428602b 100644
 --- a/include/grub/util/install.h
 +++ b/include/grub/util/install.h
 @@ -67,6 +67,9 @@
@@ -269,7 +265,7 @@ index 7df3191f47..cf4531e02b 100644
    { "verbose", 'v', 0, 0,						\
      N_("print verbose messages."), 1 }
  
-@@ -128,7 +131,8 @@ enum grub_install_options {
+@@ -129,7 +132,8 @@ enum grub_install_options {
    GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS,
    GRUB_INSTALL_OPTIONS_DTB,
    GRUB_INSTALL_OPTIONS_SBAT,
@@ -279,7 +275,7 @@ index 7df3191f47..cf4531e02b 100644
  };
  
  extern char *grub_install_source_directory;
-@@ -188,7 +192,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
+@@ -189,7 +193,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
  			     size_t npubkeys,
  			     char *config_path,
  			     const struct grub_install_image_target_desc *image_target,
@@ -289,7 +285,7 @@ index 7df3191f47..cf4531e02b 100644
  			     const char *sbat_path, const int disable_shim_lock);
  
 diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h
-index 3819a67441..6f1da89b9b 100644
+index 3819a67441c..6f1da89b9b6 100644
 --- a/include/grub/util/mkimage.h
 +++ b/include/grub/util/mkimage.h
 @@ -51,12 +51,12 @@ grub_mkimage_load_image64 (const char *kernel_path,
diff --git a/0159-docs-grub-Document-signing-grub-under-UEFI.patch b/0133-docs-grub-Document-signing-grub-under-UEFI.patch
similarity index 92%
rename from 0159-docs-grub-Document-signing-grub-under-UEFI.patch
rename to 0133-docs-grub-Document-signing-grub-under-UEFI.patch
index f2b5c176..69c352d4 100644
--- a/0159-docs-grub-Document-signing-grub-under-UEFI.patch
+++ b/0133-docs-grub-Document-signing-grub-under-UEFI.patch
@@ -13,10 +13,10 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  1 file changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 4870faaa00..365d1d6931 100644
+index 1e577d2fee9..30d4046a931 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -5817,6 +5817,7 @@ environment variables and commands are listed in the same order.
+@@ -6403,6 +6403,7 @@ environment variables and commands are listed in the same order.
  * Secure Boot Advanced Targeting::   Embedded information for generation number based revocation
  * Measured Boot::                    Measuring boot components
  * Lockdown::                         Lockdown when booting on a secure setup
@@ -24,7 +24,7 @@ index 4870faaa00..365d1d6931 100644
  @end menu
  
  @node Authentication and authorisation
-@@ -5895,7 +5896,7 @@ commands.
+@@ -6481,7 +6482,7 @@ commands.
  
  GRUB's @file{core.img} can optionally provide enforcement that all files
  subsequently read from disk are covered by a valid digital signature.
@@ -33,7 +33,7 @@ index 4870faaa00..365d1d6931 100644
  platform's firmware (e.g., Coreboot) validates @file{core.img}.
  
  If environment variable @code{check_signatures}
-@@ -6067,6 +6068,25 @@ be restricted and some operations/commands cannot be executed.
+@@ -6654,6 +6655,25 @@ be restricted and some operations/commands cannot be executed.
  The @samp{lockdown} variable is set to @samp{y} when the GRUB is locked down.
  Otherwise it does not exit.
  
diff --git a/0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch b/0134-docs-grub-Document-signing-grub-with-an-appended-sig.patch
similarity index 95%
rename from 0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch
rename to 0134-docs-grub-Document-signing-grub-with-an-appended-sig.patch
index ee3d6594..e5c63208 100644
--- a/0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch
+++ b/0134-docs-grub-Document-signing-grub-with-an-appended-sig.patch
@@ -13,10 +13,10 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  1 file changed, 42 insertions(+)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 365d1d6931..afbde7c1f7 100644
+index 30d4046a931..0ac0a1b3735 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -6087,6 +6087,48 @@ image works under UEFI secure boot and can maintain the secure-boot chain. It
+@@ -6674,6 +6674,48 @@ image works under UEFI secure boot and can maintain the secure-boot chain. It
  will also be necessary to enrol the public key used into a relevant firmware
  key database.
  
diff --git a/0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch b/0135-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
similarity index 92%
rename from 0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
rename to 0135-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
index b23ce49d..c25927d5 100644
--- a/0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
+++ b/0135-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
@@ -16,10 +16,10 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  1 file changed, 11 insertions(+)
 
 diff --git a/include/grub/dl.h b/include/grub/dl.h
-index 2f76e6b043..20d870f2a4 100644
+index 8a3d188d1d1..3f10e27d62c 100644
 --- a/include/grub/dl.h
 +++ b/include/grub/dl.h
-@@ -245,11 +245,22 @@ grub_dl_get (const char *name)
+@@ -244,11 +244,22 @@ grub_dl_get (const char *name)
    return 0;
  }
  
diff --git a/0162-pgp-factor-out-rsa_pad.patch b/0136-pgp-factor-out-rsa_pad.patch
similarity index 97%
rename from 0162-pgp-factor-out-rsa_pad.patch
rename to 0136-pgp-factor-out-rsa_pad.patch
index f1e721db..6e629a4f 100644
--- a/0162-pgp-factor-out-rsa_pad.patch
+++ b/0136-pgp-factor-out-rsa_pad.patch
@@ -27,10 +27,10 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  create mode 100644 include/grub/pkcs1_v15.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 81fc274148..97347ae76f 100644
+index 4aa20cdfc13..82f2e169ad1 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -2510,6 +2510,14 @@ module = {
+@@ -2568,6 +2568,14 @@ module = {
    cppflags = '$(CPPFLAGS_GCRY)';
  };
  
@@ -46,7 +46,7 @@ index 81fc274148..97347ae76f 100644
    name = all_video;
    common = lib/fake_module.c;
 diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
-index 5daa1e9d00..2408db4994 100644
+index c6766f044aa..b084dc9a22f 100644
 --- a/grub-core/commands/pgp.c
 +++ b/grub-core/commands/pgp.c
 @@ -24,6 +24,7 @@
@@ -93,7 +93,7 @@ index 5daa1e9d00..2408db4994 100644
  struct grub_pubkey_context
 diff --git a/grub-core/lib/pkcs1_v15.c b/grub-core/lib/pkcs1_v15.c
 new file mode 100644
-index 0000000000..dbacd563d0
+index 00000000000..dbacd563d01
 --- /dev/null
 +++ b/grub-core/lib/pkcs1_v15.c
 @@ -0,0 +1,59 @@
@@ -158,7 +158,7 @@ index 0000000000..dbacd563d0
 +}
 diff --git a/include/grub/pkcs1_v15.h b/include/grub/pkcs1_v15.h
 new file mode 100644
-index 0000000000..5c338c84a1
+index 00000000000..5c338c84a15
 --- /dev/null
 +++ b/include/grub/pkcs1_v15.h
 @@ -0,0 +1,27 @@
diff --git a/0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch b/0137-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
similarity index 96%
rename from 0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
rename to 0137-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
index 541474e5..732b91c4 100644
--- a/0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
+++ b/0137-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
@@ -40,7 +40,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
-index 2408db4994..355a43844a 100644
+index b084dc9a22f..a45c2213c4a 100644
 --- a/grub-core/commands/pgp.c
 +++ b/grub-core/commands/pgp.c
 @@ -147,10 +147,6 @@ const char *hashes[] = {
@@ -55,7 +55,7 @@ index 2408db4994..355a43844a 100644
  dsa_pad (gcry_mpi_t *hmpi, grub_uint8_t *hval,
  	 const gcry_md_spec_t *hash, struct grub_public_subkey *sk);
 diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
-index ca334d5a40..c578128a59 100644
+index 396f7641080..d53ddbe2c44 100644
 --- a/grub-core/lib/crypto.c
 +++ b/grub-core/lib/crypto.c
 @@ -121,6 +121,10 @@ grub_md_unregister (gcry_md_spec_t *cipher)
diff --git a/0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch b/0138-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
similarity index 89%
rename from 0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
rename to 0138-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
index 3176f1b7..a473c1de 100644
--- a/0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
+++ b/0138-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
@@ -23,10 +23,10 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  3 files changed, 10 insertions(+)
 
 diff --git a/grub-core/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h
-index 7217138ffd..591dbf3289 100644
+index 26918c8a01b..4be7b408063 100644
 --- a/grub-core/lib/posix_wrap/limits.h
 +++ b/grub-core/lib/posix_wrap/limits.h
-@@ -37,5 +37,6 @@
+@@ -41,5 +41,6 @@
  #define LONG_MAX GRUB_LONG_MAX
  
  #define CHAR_BIT 8
@@ -34,11 +34,11 @@ index 7217138ffd..591dbf3289 100644
  
  #endif
 diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h
-index 7a8d385e97..4634db09f2 100644
+index f5279756abe..14e4efdd0d6 100644
 --- a/grub-core/lib/posix_wrap/stdlib.h
 +++ b/grub-core/lib/posix_wrap/stdlib.h
-@@ -58,4 +58,12 @@ abs (int c)
-   return (c >= 0) ? c : -c;
+@@ -64,4 +64,12 @@ abort (void)
+   grub_abort ();
  }
  
 +#define strtol grub_strtol
@@ -51,10 +51,10 @@ index 7a8d385e97..4634db09f2 100644
 +
  #endif
 diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h
-index 854eb0122e..f63412c8da 100644
+index eeda543c47e..2f3e865495a 100644
 --- a/grub-core/lib/posix_wrap/sys/types.h
 +++ b/grub-core/lib/posix_wrap/sys/types.h
-@@ -51,6 +51,7 @@ typedef grub_uint8_t byte;
+@@ -50,6 +50,7 @@ typedef grub_uint8_t byte;
  typedef grub_addr_t uintptr_t;
  
  #define SIZEOF_UNSIGNED_LONG GRUB_CPU_SIZEOF_LONG
diff --git a/0165-libtasn1-import-libtasn1-4.16.0.patch b/0139-libtasn1-import-libtasn1-4.16.0.patch
similarity index 99%
rename from 0165-libtasn1-import-libtasn1-4.16.0.patch
rename to 0139-libtasn1-import-libtasn1-4.16.0.patch
index 95876611..89552c88 100644
--- a/0165-libtasn1-import-libtasn1-4.16.0.patch
+++ b/0139-libtasn1-import-libtasn1-4.16.0.patch
@@ -53,7 +53,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
 
 diff --git a/grub-core/lib/libtasn1/lib/coding.c b/grub-core/lib/libtasn1/lib/coding.c
 new file mode 100644
-index 0000000000..245ea64cf0
+index 00000000000..245ea64cf0a
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/coding.c
 @@ -0,0 +1,1415 @@
@@ -1474,7 +1474,7 @@ index 0000000000..245ea64cf0
 +}
 diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c
 new file mode 100644
-index 0000000000..ff04eb778c
+index 00000000000..ff04eb778cb
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/decoding.c
 @@ -0,0 +1,2478 @@
@@ -3958,7 +3958,7 @@ index 0000000000..ff04eb778c
 +}
 diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c
 new file mode 100644
-index 0000000000..997eb2725d
+index 00000000000..997eb2725dc
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/element.c
 @@ -0,0 +1,1111 @@
@@ -5075,7 +5075,7 @@ index 0000000000..997eb2725d
 +}
 diff --git a/grub-core/lib/libtasn1/lib/errors.c b/grub-core/lib/libtasn1/lib/errors.c
 new file mode 100644
-index 0000000000..cee74daf79
+index 00000000000..cee74daf795
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/errors.c
 @@ -0,0 +1,100 @@
@@ -5181,7 +5181,7 @@ index 0000000000..cee74daf79
 +}
 diff --git a/grub-core/lib/libtasn1/lib/gstr.c b/grub-core/lib/libtasn1/lib/gstr.c
 new file mode 100644
-index 0000000000..e91a3a151c
+index 00000000000..e91a3a151c0
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/gstr.c
 @@ -0,0 +1,74 @@
@@ -5261,7 +5261,7 @@ index 0000000000..e91a3a151c
 +}
 diff --git a/grub-core/lib/libtasn1/lib/parser_aux.c b/grub-core/lib/libtasn1/lib/parser_aux.c
 new file mode 100644
-index 0000000000..d5dbbf8765
+index 00000000000..d5dbbf8765d
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/parser_aux.c
 @@ -0,0 +1,1173 @@
@@ -6440,7 +6440,7 @@ index 0000000000..d5dbbf8765
 +}
 diff --git a/grub-core/lib/libtasn1/lib/structure.c b/grub-core/lib/libtasn1/lib/structure.c
 new file mode 100644
-index 0000000000..8189c56a4c
+index 00000000000..8189c56a4c9
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/structure.c
 @@ -0,0 +1,1220 @@
@@ -7666,7 +7666,7 @@ index 0000000000..8189c56a4c
 +}
 diff --git a/grub-core/lib/libtasn1/lib/element.h b/grub-core/lib/libtasn1/lib/element.h
 new file mode 100644
-index 0000000000..440a33f4bb
+index 00000000000..440a33f4bb1
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/element.h
 @@ -0,0 +1,40 @@
@@ -7712,7 +7712,7 @@ index 0000000000..440a33f4bb
 +#endif
 diff --git a/grub-core/lib/libtasn1/lib/gstr.h b/grub-core/lib/libtasn1/lib/gstr.h
 new file mode 100644
-index 0000000000..48229844ff
+index 00000000000..48229844ff3
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/gstr.h
 @@ -0,0 +1,47 @@
@@ -7765,7 +7765,7 @@ index 0000000000..48229844ff
 +#endif /* GSTR_H */
 diff --git a/grub-core/lib/libtasn1/lib/int.h b/grub-core/lib/libtasn1/lib/int.h
 new file mode 100644
-index 0000000000..ea1625786c
+index 00000000000..ea1625786c1
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/int.h
 @@ -0,0 +1,221 @@
@@ -7992,7 +7992,7 @@ index 0000000000..ea1625786c
 +#endif /* INT_H */
 diff --git a/grub-core/lib/libtasn1/lib/parser_aux.h b/grub-core/lib/libtasn1/lib/parser_aux.h
 new file mode 100644
-index 0000000000..598e684b35
+index 00000000000..598e684b355
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/parser_aux.h
 @@ -0,0 +1,172 @@
@@ -8170,7 +8170,7 @@ index 0000000000..598e684b35
 +#endif
 diff --git a/grub-core/lib/libtasn1/lib/structure.h b/grub-core/lib/libtasn1/lib/structure.h
 new file mode 100644
-index 0000000000..99e685da07
+index 00000000000..99e685da07a
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/lib/structure.h
 @@ -0,0 +1,45 @@
@@ -8221,7 +8221,7 @@ index 0000000000..99e685da07
 +#endif
 diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h
 new file mode 100644
-index 0000000000..6fd7a30dc3
+index 00000000000..6fd7a30dc35
 --- /dev/null
 +++ b/include/grub/libtasn1.h
 @@ -0,0 +1,588 @@
@@ -8815,7 +8815,7 @@ index 0000000000..6fd7a30dc3
 +#endif				/* LIBTASN1_H */
 diff --git a/grub-core/lib/libtasn1/LICENSE b/grub-core/lib/libtasn1/LICENSE
 new file mode 100644
-index 0000000000..e8b3628db9
+index 00000000000..e8b3628db9b
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/LICENSE
 @@ -0,0 +1,16 @@
@@ -8837,7 +8837,7 @@ index 0000000000..e8b3628db9
 +note that the range specifies every single year in that closed interval.
 diff --git a/grub-core/lib/libtasn1/README.md b/grub-core/lib/libtasn1/README.md
 new file mode 100644
-index 0000000000..50a8642296
+index 00000000000..50a8642296c
 --- /dev/null
 +++ b/grub-core/lib/libtasn1/README.md
 @@ -0,0 +1,91 @@
diff --git a/0166-libtasn1-disable-code-not-needed-in-grub.patch b/0140-libtasn1-disable-code-not-needed-in-grub.patch
similarity index 97%
rename from 0166-libtasn1-disable-code-not-needed-in-grub.patch
rename to 0140-libtasn1-disable-code-not-needed-in-grub.patch
index 84dcbf05..00f55888 100644
--- a/0166-libtasn1-disable-code-not-needed-in-grub.patch
+++ b/0140-libtasn1-disable-code-not-needed-in-grub.patch
@@ -25,7 +25,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  6 files changed, 38 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/lib/libtasn1/lib/coding.c b/grub-core/lib/libtasn1/lib/coding.c
-index 245ea64cf0..52def59836 100644
+index 245ea64cf0a..52def598368 100644
 --- a/grub-core/lib/libtasn1/lib/coding.c
 +++ b/grub-core/lib/libtasn1/lib/coding.c
 @@ -30,11 +30,11 @@
@@ -99,7 +99,7 @@ index 245ea64cf0..52def59836 100644
 +#endif
 \ No newline at end of file
 diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c
-index ff04eb778c..42f9a92b5d 100644
+index ff04eb778cb..42f9a92b5d4 100644
 --- a/grub-core/lib/libtasn1/lib/decoding.c
 +++ b/grub-core/lib/libtasn1/lib/decoding.c
 @@ -1613,6 +1613,7 @@ asn1_der_decoding (asn1_node * element, const void *ider, int ider_len,
@@ -119,7 +119,7 @@ index ff04eb778c..42f9a92b5d 100644
  /**
   * asn1_der_decoding_startEnd:
 diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c
-index 997eb2725d..539008d8e9 100644
+index 997eb2725dc..539008d8e94 100644
 --- a/grub-core/lib/libtasn1/lib/element.c
 +++ b/grub-core/lib/libtasn1/lib/element.c
 @@ -191,7 +191,7 @@ _asn1_append_sequence_set (asn1_node node, struct node_tail_cache_st *pcache)
@@ -141,7 +141,7 @@ index 997eb2725d..539008d8e9 100644
  #define PUT_VALUE( ptr, ptr_size, data, data_size) \
  	*len = data_size; \
 diff --git a/grub-core/lib/libtasn1/lib/errors.c b/grub-core/lib/libtasn1/lib/errors.c
-index cee74daf79..42785e8622 100644
+index cee74daf795..42785e8622b 100644
 --- a/grub-core/lib/libtasn1/lib/errors.c
 +++ b/grub-core/lib/libtasn1/lib/errors.c
 @@ -57,6 +57,8 @@ static const libtasn1_error_entry error_algorithms[] = {
@@ -162,7 +162,7 @@ index cee74daf79..42785e8622 100644
  /**
   * asn1_strerror:
 diff --git a/grub-core/lib/libtasn1/lib/structure.c b/grub-core/lib/libtasn1/lib/structure.c
-index 8189c56a4c..fcfde01a39 100644
+index 8189c56a4c9..fcfde01a393 100644
 --- a/grub-core/lib/libtasn1/lib/structure.c
 +++ b/grub-core/lib/libtasn1/lib/structure.c
 @@ -76,7 +76,7 @@ _asn1_find_left (asn1_node_const node)
@@ -218,7 +218,7 @@ index 8189c56a4c..fcfde01a39 100644
  /**
   * asn1_dup_node:
 diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h
-index 6fd7a30dc3..785eda2ae3 100644
+index 6fd7a30dc35..785eda2ae3f 100644
 --- a/include/grub/libtasn1.h
 +++ b/include/grub/libtasn1.h
 @@ -319,6 +319,8 @@ typedef struct asn1_data_node_st asn1_data_node_st;
diff --git a/0167-libtasn1-changes-for-grub-compatibility.patch b/0141-libtasn1-changes-for-grub-compatibility.patch
similarity index 96%
rename from 0167-libtasn1-changes-for-grub-compatibility.patch
rename to 0141-libtasn1-changes-for-grub-compatibility.patch
index 7c756bd4..9b2275ca 100644
--- a/0167-libtasn1-changes-for-grub-compatibility.patch
+++ b/0141-libtasn1-changes-for-grub-compatibility.patch
@@ -35,7 +35,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  6 files changed, 22 insertions(+), 33 deletions(-)
 
 diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c
-index 42f9a92b5d..7856858b27 100644
+index 42f9a92b5d4..7856858b272 100644
 --- a/grub-core/lib/libtasn1/lib/decoding.c
 +++ b/grub-core/lib/libtasn1/lib/decoding.c
 @@ -32,7 +32,8 @@
@@ -71,7 +71,7 @@ index 42f9a92b5d..7856858b27 100644
  		  result = asn1_create_element (definitions, name, &aux);
  		  if (result == ASN1_SUCCESS)
 diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c
-index 539008d8e9..ed761ff56b 100644
+index 539008d8e94..ed761ff56bd 100644
 --- a/grub-core/lib/libtasn1/lib/element.c
 +++ b/grub-core/lib/libtasn1/lib/element.c
 @@ -30,9 +30,10 @@
@@ -87,7 +87,7 @@ index 539008d8e9..ed761ff56b 100644
  _asn1_hierarchical_name (asn1_node_const node, char *name, int name_size)
  {
 diff --git a/grub-core/lib/libtasn1/lib/gstr.c b/grub-core/lib/libtasn1/lib/gstr.c
-index e91a3a151c..e33875c2c7 100644
+index e91a3a151c0..e33875c2c7c 100644
 --- a/grub-core/lib/libtasn1/lib/gstr.c
 +++ b/grub-core/lib/libtasn1/lib/gstr.c
 @@ -36,13 +36,13 @@ _asn1_str_cat (char *dest, size_t dest_tot_size, const char *src)
@@ -107,7 +107,7 @@ index e91a3a151c..e33875c2c7 100644
  	}
      }
 diff --git a/grub-core/lib/libtasn1/lib/parser_aux.c b/grub-core/lib/libtasn1/lib/parser_aux.c
-index d5dbbf8765..89c9be69dc 100644
+index d5dbbf8765d..89c9be69dc2 100644
 --- a/grub-core/lib/libtasn1/lib/parser_aux.c
 +++ b/grub-core/lib/libtasn1/lib/parser_aux.c
 @@ -26,7 +26,8 @@
@@ -139,7 +139,7 @@ index d5dbbf8765..89c9be69dc 100644
        temp[start + count] = '0' + (char) r;
        count++;
 diff --git a/grub-core/lib/libtasn1/lib/int.h b/grub-core/lib/libtasn1/lib/int.h
-index ea1625786c..4a568efee9 100644
+index ea1625786c1..4a568efee9c 100644
 --- a/grub-core/lib/libtasn1/lib/int.h
 +++ b/grub-core/lib/libtasn1/lib/int.h
 @@ -35,7 +35,7 @@
@@ -161,7 +161,7 @@ index ea1625786c..4a568efee9 100644
  #if SIZEOF_UNSIGNED_LONG_INT == 8
  # define _asn1_strtou64(n,e,b) strtoul((const char *) n, e, b)
 diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h
-index 785eda2ae3..28dbf16c4e 100644
+index 785eda2ae3f..28dbf16c4e0 100644
 --- a/include/grub/libtasn1.h
 +++ b/include/grub/libtasn1.h
 @@ -38,29 +38,15 @@
diff --git a/0168-libtasn1-compile-into-asn1-module.patch b/0142-libtasn1-compile-into-asn1-module.patch
similarity index 94%
rename from 0168-libtasn1-compile-into-asn1-module.patch
rename to 0142-libtasn1-compile-into-asn1-module.patch
index b5574036..bdd6f631 100644
--- a/0168-libtasn1-compile-into-asn1-module.patch
+++ b/0142-libtasn1-compile-into-asn1-module.patch
@@ -14,12 +14,12 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  create mode 100644 grub-core/lib/libtasn1_wrap/wrap.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 97347ae76f..21d2c54185 100644
+index 82f2e169ad1..05b976d9a77 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -2576,3 +2576,18 @@ module = {
-   common = commands/i386/wrmsr.c;
-   enable = x86;
+@@ -2646,3 +2646,18 @@ module = {
+   efi = commands/bli.c;
+   enable = efi;
  };
 +
 +module = {
@@ -38,7 +38,7 @@ index 97347ae76f..21d2c54185 100644
 +};
 diff --git a/grub-core/lib/libtasn1_wrap/wrap.c b/grub-core/lib/libtasn1_wrap/wrap.c
 new file mode 100644
-index 0000000000..622ba942e3
+index 00000000000..622ba942e33
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/wrap.c
 @@ -0,0 +1,26 @@
diff --git a/0169-test_asn1-test-module-for-libtasn1.patch b/0143-test_asn1-test-module-for-libtasn1.patch
similarity index 99%
rename from 0169-test_asn1-test-module-for-libtasn1.patch
rename to 0143-test_asn1-test-module-for-libtasn1.patch
index 1588c511..23f4bbf0 100644
--- a/0169-test_asn1-test-module-for-libtasn1.patch
+++ b/0143-test_asn1-test-module-for-libtasn1.patch
@@ -18,6 +18,9 @@ This doesn't test the full decoder but that will be exercised in
 test suites for coming patch sets.
 
 Signed-off-by: Daniel Axtens <dja@axtens.net>
+
+[pjones updated the Makefile.util.def part to have "testcase = native;"
+syntax.]
 ---
  Makefile.util.def                                  |   6 +
  grub-core/Makefile.core.def                        |  13 ++
@@ -51,27 +54,27 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  create mode 100644 tests/test_asn1.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 9927c2cfd6..3f191aa809 100644
+index 8e52e48c780..ef344f5aa8c 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1306,6 +1306,12 @@ script = {
-   common = tests/syslinux_test.in;
+@@ -1328,6 +1328,12 @@ script = {
+   common = tests/luks2_test.in;
  };
  
 +script = {
-+  testcase;
++  testcase = native;
 +  name = test_asn1;
 +  common = tests/test_asn1.in;
 +};
 +
  program = {
-   testcase;
+   testcase = native;
    name = example_unit_test;
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 21d2c54185..b4aaccf7b5 100644
+index 05b976d9a77..0e65fefb195 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -2591,3 +2591,16 @@ module = {
+@@ -2661,3 +2661,16 @@ module = {
    // -Wno-type-limits comes from libtasn1's configure.ac
    cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB) -I$(srcdir)/lib/libtasn1/lib -Wno-type-limits';
  };
@@ -90,7 +93,7 @@ index 21d2c54185..b4aaccf7b5 100644
 +};
 diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c
 new file mode 100644
-index 0000000000..534e304521
+index 00000000000..534e304521e
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c
 @@ -0,0 +1,61 @@
@@ -157,7 +160,7 @@ index 0000000000..534e304521
 +}
 diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c b/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c
 new file mode 100644
-index 0000000000..f48aea0ef8
+index 00000000000..f48aea0ef8b
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c
 @@ -0,0 +1,138 @@
@@ -301,7 +304,7 @@ index 0000000000..f48aea0ef8
 +}
 diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_simple.c b/grub-core/lib/libtasn1_wrap/tests/Test_simple.c
 new file mode 100644
-index 0000000000..9f01006ddf
+index 00000000000..9f01006ddf4
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/tests/Test_simple.c
 @@ -0,0 +1,207 @@
@@ -514,7 +517,7 @@ index 0000000000..9f01006ddf
 +}
 diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_strings.c b/grub-core/lib/libtasn1_wrap/tests/Test_strings.c
 new file mode 100644
-index 0000000000..dbe1474b20
+index 00000000000..dbe1474b204
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/tests/Test_strings.c
 @@ -0,0 +1,150 @@
@@ -670,7 +673,7 @@ index 0000000000..dbe1474b20
 +}
 diff --git a/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c b/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c
 new file mode 100644
-index 0000000000..d367bbfb5a
+index 00000000000..d367bbfb5a7
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c
 @@ -0,0 +1,116 @@
@@ -792,7 +795,7 @@ index 0000000000..d367bbfb5a
 +}
 diff --git a/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c b/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c
 new file mode 100644
-index 0000000000..3a83b58c59
+index 00000000000..3a83b58c59f
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c
 @@ -0,0 +1,120 @@
@@ -918,7 +921,7 @@ index 0000000000..3a83b58c59
 +}
 diff --git a/grub-core/lib/libtasn1_wrap/tests/octet-string.c b/grub-core/lib/libtasn1_wrap/tests/octet-string.c
 new file mode 100644
-index 0000000000..d8a049e8df
+index 00000000000..d8a049e8df0
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/tests/octet-string.c
 @@ -0,0 +1,211 @@
@@ -1135,7 +1138,7 @@ index 0000000000..d8a049e8df
 +}
 diff --git a/grub-core/lib/libtasn1_wrap/tests/reproducers.c b/grub-core/lib/libtasn1_wrap/tests/reproducers.c
 new file mode 100644
-index 0000000000..dc7268d4c6
+index 00000000000..dc7268d4c6c
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/tests/reproducers.c
 @@ -0,0 +1,81 @@
@@ -1222,7 +1225,7 @@ index 0000000000..dc7268d4c6
 +}
 diff --git a/grub-core/lib/libtasn1_wrap/wrap_tests.c b/grub-core/lib/libtasn1_wrap/wrap_tests.c
 new file mode 100644
-index 0000000000..75fcd21f0d
+index 00000000000..75fcd21f0d5
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/wrap_tests.c
 @@ -0,0 +1,75 @@
@@ -1303,7 +1306,7 @@ index 0000000000..75fcd21f0d
 +}
 diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h
 new file mode 100644
-index 0000000000..1e7d3d64f5
+index 00000000000..1e7d3d64f55
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h
 @@ -0,0 +1,32 @@
@@ -1341,7 +1344,7 @@ index 0000000000..1e7d3d64f5
 +};
 diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h
 new file mode 100644
-index 0000000000..e2561e5ec6
+index 00000000000..e2561e5ec6d
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h
 @@ -0,0 +1,36 @@
@@ -1383,7 +1386,7 @@ index 0000000000..e2561e5ec6
 +};
 diff --git a/grub-core/lib/libtasn1_wrap/wrap_tests.h b/grub-core/lib/libtasn1_wrap/wrap_tests.h
 new file mode 100644
-index 0000000000..555e56dd20
+index 00000000000..555e56dd202
 --- /dev/null
 +++ b/grub-core/lib/libtasn1_wrap/wrap_tests.h
 @@ -0,0 +1,38 @@
@@ -1426,10 +1429,10 @@ index 0000000000..555e56dd20
 +
 +#endif
 diff --git a/.gitignore b/.gitignore
-index 594d0134d3..856e69bc5c 100644
+index a18787dcfe6..f2e8e1e42d7 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -264,6 +264,7 @@ widthspec.bin
+@@ -268,6 +268,7 @@ widthspec.bin
  /stamp-h1
  /syslinux_test
  /tar_test
@@ -1439,7 +1442,7 @@ index 594d0134d3..856e69bc5c 100644
  /tests/syslinux/ubuntu10.04_grub.cfg
 diff --git a/tests/test_asn1.in b/tests/test_asn1.in
 new file mode 100644
-index 0000000000..8173c5c270
+index 00000000000..8173c5c270e
 --- /dev/null
 +++ b/tests/test_asn1.in
 @@ -0,0 +1,12 @@
diff --git a/0170-grub-install-support-embedding-x509-certificates.patch b/0144-grub-install-support-embedding-x509-certificates.patch
similarity index 90%
rename from 0170-grub-install-support-embedding-x509-certificates.patch
rename to 0144-grub-install-support-embedding-x509-certificates.patch
index c4c35f4b..9ebbeb02 100644
--- a/0170-grub-install-support-embedding-x509-certificates.patch
+++ b/0144-grub-install-support-embedding-x509-certificates.patch
@@ -20,7 +20,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  6 files changed, 80 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
-index 355a43844a..b81ac0ae46 100644
+index a45c2213c4a..847a5046a5c 100644
 --- a/grub-core/commands/pgp.c
 +++ b/grub-core/commands/pgp.c
 @@ -944,7 +944,7 @@ GRUB_MOD_INIT(pgp)
@@ -33,10 +33,10 @@ index 355a43844a..b81ac0ae46 100644
  
      pseudo_file.fs = &pseudo_fs;
 diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index a74fee16e2..c603f5b308 100644
+index 1fa0f7f6f00..b58539111da 100644
 --- a/util/grub-install-common.c
 +++ b/util/grub-install-common.c
-@@ -460,6 +460,8 @@ static char **pubkeys;
+@@ -465,6 +465,8 @@ static char **pubkeys;
  static size_t npubkeys;
  static char *sbat;
  static int disable_shim_lock;
@@ -45,7 +45,7 @@ index a74fee16e2..c603f5b308 100644
  static grub_compression_t compression;
  static size_t appsig_size;
  
-@@ -501,6 +503,12 @@ grub_install_parse (int key, char *arg)
+@@ -506,6 +508,12 @@ grub_install_parse (int key, char *arg)
      case GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK:
        disable_shim_lock = 1;
        return 1;
@@ -58,18 +58,18 @@ index a74fee16e2..c603f5b308 100644
  
      case GRUB_INSTALL_OPTIONS_VERBOSITY:
        verbosity++;
-@@ -627,6 +635,9 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
+@@ -636,6 +644,9 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
    for (pk = pubkeys; pk < pubkeys + npubkeys; pk++)
-     slen += 20 + grub_strlen (*pk);
+     slen += sizeof (" --pubkey ''") + grub_strlen (*pk);
  
 +  for (pk = x509keys; pk < x509keys + nx509keys; pk++)
 +    slen += 10 + grub_strlen (*pk);
 +
    for (md = modules.entries; *md; md++)
-     {
-       slen += 10 + grub_strlen (*md);
-@@ -655,6 +666,14 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
-       *p++ = ' ';
+     slen += sizeof (" ''") + grub_strlen (*md);
+ 
+@@ -676,6 +687,14 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
+       *p++ = '\'';
      }
  
 +  for (pk = x509keys; pk < x509keys + nx509keys; pk++)
@@ -82,8 +82,8 @@ index a74fee16e2..c603f5b308 100644
 +
    for (md = modules.entries; *md; md++)
      {
-       *p++ = '\'';
-@@ -684,7 +703,9 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
+       *p++ = ' ';
+@@ -702,7 +721,9 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
  
    grub_install_generate_image (dir, prefix, fp, outname,
  			       modules.entries, memdisk_path,
@@ -95,7 +95,7 @@ index a74fee16e2..c603f5b308 100644
  			       disable_shim_lock);
    while (dc--)
 diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
-index 8a53310548..e1f1112784 100644
+index 8a53310548b..e1f1112784a 100644
 --- a/util/grub-mkimage.c
 +++ b/util/grub-mkimage.c
 @@ -75,7 +75,8 @@ static struct argp_option options[] = {
@@ -142,10 +142,10 @@ index 8a53310548..e1f1112784 100644
  			       arguments.appsig_size, arguments.comp,
  			       arguments.dtb, arguments.sbat,
 diff --git a/util/mkimage.c b/util/mkimage.c
-index bab1227601..8319e8dfbd 100644
+index d33838bec6b..e2bb4d4cd05 100644
 --- a/util/mkimage.c
 +++ b/util/mkimage.c
-@@ -867,7 +867,8 @@ void
+@@ -883,7 +883,8 @@ void
  grub_install_generate_image (const char *dir, const char *prefix,
  			     FILE *out, const char *outname, char *mods[],
  			     char *memdisk_path, char **pubkey_paths,
@@ -155,7 +155,7 @@ index bab1227601..8319e8dfbd 100644
  			     const struct grub_install_image_target_desc *image_target,
  			     int note, size_t appsig_size, grub_compression_t comp,
  			     const char *dtb_path, const char *sbat_path,
-@@ -913,6 +914,19 @@ grub_install_generate_image (const char *dir, const char *prefix,
+@@ -929,6 +930,19 @@ grub_install_generate_image (const char *dir, const char *prefix,
        }
    }
  
@@ -175,7 +175,7 @@ index bab1227601..8319e8dfbd 100644
    if (memdisk_path)
      {
        memdisk_size = ALIGN_UP(grub_util_get_image_size (memdisk_path), 512);
-@@ -1034,7 +1048,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
+@@ -1050,7 +1064,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
  	curs = grub_util_get_image_size (pubkey_paths[i]);
  
  	header = (struct grub_module_header *) (kernel_img + offset);
@@ -184,7 +184,7 @@ index bab1227601..8319e8dfbd 100644
  	header->size = grub_host_to_target32 (curs + sizeof (*header));
  	offset += sizeof (*header);
  
-@@ -1043,6 +1057,26 @@ grub_install_generate_image (const char *dir, const char *prefix,
+@@ -1059,6 +1073,26 @@ grub_install_generate_image (const char *dir, const char *prefix,
        }
    }
  
@@ -212,7 +212,7 @@ index bab1227601..8319e8dfbd 100644
      {
        struct grub_module_header *header;
 diff --git a/include/grub/kernel.h b/include/grub/kernel.h
-index 55849777ea..98edc0863f 100644
+index 55849777eaa..98edc0863f6 100644
 --- a/include/grub/kernel.h
 +++ b/include/grub/kernel.h
 @@ -30,7 +30,9 @@ enum
@@ -227,7 +227,7 @@ index 55849777ea..98edc0863f 100644
  
  /* The module header.  */
 diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index cf4531e02b..51f3b13ac1 100644
+index 2720428602b..59eabb9bb86 100644
 --- a/include/grub/util/install.h
 +++ b/include/grub/util/install.h
 @@ -67,6 +67,8 @@
@@ -239,7 +239,7 @@ index cf4531e02b..51f3b13ac1 100644
    { "appended-signature-size", GRUB_INSTALL_OPTIONS_APPENDED_SIGNATURE_SIZE,\
      "SIZE", 0, N_("Add a note segment reserving SIZE bytes for an appended signature"), \
      1},                                                                 \
-@@ -188,8 +190,9 @@ void
+@@ -189,8 +191,9 @@ void
  grub_install_generate_image (const char *dir, const char *prefix,
  			     FILE *out,
  			     const char *outname, char *mods[],
diff --git a/0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch b/0145-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
similarity index 99%
rename from 0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
rename to 0145-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
index 0ebc6c76..7b7d70c4 100644
--- a/0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
+++ b/0145-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
@@ -22,7 +22,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
 
 diff --git a/grub-core/commands/appendedsig/gnutls_asn1_tab.c b/grub-core/commands/appendedsig/gnutls_asn1_tab.c
 new file mode 100644
-index 0000000000..ddd1314e63
+index 00000000000..ddd1314e63b
 --- /dev/null
 +++ b/grub-core/commands/appendedsig/gnutls_asn1_tab.c
 @@ -0,0 +1,121 @@
@@ -149,7 +149,7 @@ index 0000000000..ddd1314e63
 +};
 diff --git a/grub-core/commands/appendedsig/pkix_asn1_tab.c b/grub-core/commands/appendedsig/pkix_asn1_tab.c
 new file mode 100644
-index 0000000000..adef69d95c
+index 00000000000..adef69d95ce
 --- /dev/null
 +++ b/grub-core/commands/appendedsig/pkix_asn1_tab.c
 @@ -0,0 +1,484 @@
diff --git a/0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch b/0146-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
similarity index 99%
rename from 0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
rename to 0146-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
index 5a13d5bc..04bf1df4 100644
--- a/0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
+++ b/0146-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
@@ -29,7 +29,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
 
 diff --git a/grub-core/commands/appendedsig/asn1util.c b/grub-core/commands/appendedsig/asn1util.c
 new file mode 100644
-index 0000000000..eff095a9df
+index 00000000000..eff095a9df2
 --- /dev/null
 +++ b/grub-core/commands/appendedsig/asn1util.c
 @@ -0,0 +1,102 @@
@@ -137,7 +137,7 @@ index 0000000000..eff095a9df
 +}
 diff --git a/grub-core/commands/appendedsig/pkcs7.c b/grub-core/commands/appendedsig/pkcs7.c
 new file mode 100644
-index 0000000000..dc6afe203f
+index 00000000000..dc6afe203f7
 --- /dev/null
 +++ b/grub-core/commands/appendedsig/pkcs7.c
 @@ -0,0 +1,305 @@
@@ -448,7 +448,7 @@ index 0000000000..dc6afe203f
 +}
 diff --git a/grub-core/commands/appendedsig/x509.c b/grub-core/commands/appendedsig/x509.c
 new file mode 100644
-index 0000000000..2b38b3670a
+index 00000000000..2b38b3670a2
 --- /dev/null
 +++ b/grub-core/commands/appendedsig/x509.c
 @@ -0,0 +1,958 @@
@@ -1412,7 +1412,7 @@ index 0000000000..2b38b3670a
 +}
 diff --git a/grub-core/commands/appendedsig/appendedsig.h b/grub-core/commands/appendedsig/appendedsig.h
 new file mode 100644
-index 0000000000..9792ef3901
+index 00000000000..9792ef3901e
 --- /dev/null
 +++ b/grub-core/commands/appendedsig/appendedsig.h
 @@ -0,0 +1,110 @@
diff --git a/0173-appended-signatures-support-verifying-appended-signa.patch b/0147-appended-signatures-support-verifying-appended-signa.patch
similarity index 98%
rename from 0173-appended-signatures-support-verifying-appended-signa.patch
rename to 0147-appended-signatures-support-verifying-appended-signa.patch
index 969293a4..01442649 100644
--- a/0173-appended-signatures-support-verifying-appended-signa.patch
+++ b/0147-appended-signatures-support-verifying-appended-signa.patch
@@ -30,10 +30,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 grub-core/commands/appendedsig/appendedsig.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index b4aaccf7b5..77321d218c 100644
+index 0e65fefb195..ebe98551960 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -980,6 +980,18 @@ module = {
+@@ -1009,6 +1009,18 @@ module = {
    cppflags = '-I$(srcdir)/lib/posix_wrap';
  };
  
@@ -54,7 +54,7 @@ index b4aaccf7b5..77321d218c 100644
    common = commands/hdparm.c;
 diff --git a/grub-core/commands/appendedsig/appendedsig.c b/grub-core/commands/appendedsig/appendedsig.c
 new file mode 100644
-index 0000000000..bf8b18b620
+index 00000000000..1b8a8078061
 --- /dev/null
 +++ b/grub-core/commands/appendedsig/appendedsig.c
 @@ -0,0 +1,645 @@
@@ -462,7 +462,7 @@ index 0000000000..bf8b18b620
 +    }
 +
 +  return grub_error (GRUB_ERR_BAD_ARGUMENT,
-+		     N_("No certificate number %d found - only %d certificates in the store"),
++		     N_("No certificate number %lu found - only %lu certificates in the store"),
 +		     cert_num, i - 1);
 +}
 +
@@ -704,7 +704,7 @@ index 0000000000..bf8b18b620
 +  grub_unregister_command (cmd_distrust);
 +}
 diff --git a/include/grub/file.h b/include/grub/file.h
-index 31567483cc..96827a4f89 100644
+index a5bf3a792d6..d678de06325 100644
 --- a/include/grub/file.h
 +++ b/include/grub/file.h
 @@ -80,6 +80,8 @@ enum grub_file_type
diff --git a/0174-appended-signatures-verification-tests.patch b/0148-appended-signatures-verification-tests.patch
similarity index 99%
rename from 0174-appended-signatures-verification-tests.patch
rename to 0148-appended-signatures-verification-tests.patch
index 982b3c82..7c4ae86f 100644
--- a/0174-appended-signatures-verification-tests.patch
+++ b/0148-appended-signatures-verification-tests.patch
@@ -17,10 +17,10 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  create mode 100644 grub-core/tests/appended_signatures.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 77321d218c..6bddc841b8 100644
+index ebe98551960..c81c9107249 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -2161,6 +2161,12 @@ module = {
+@@ -2211,6 +2211,12 @@ module = {
    common = tests/setjmp_test.c;
  };
  
@@ -35,7 +35,7 @@ index 77321d218c..6bddc841b8 100644
    common = tests/signature_test.c;
 diff --git a/grub-core/tests/appended_signature_test.c b/grub-core/tests/appended_signature_test.c
 new file mode 100644
-index 0000000000..88a485200d
+index 00000000000..88a485200d8
 --- /dev/null
 +++ b/grub-core/tests/appended_signature_test.c
 @@ -0,0 +1,281 @@
@@ -321,7 +321,7 @@ index 0000000000..88a485200d
 +
 +GRUB_FUNCTIONAL_TEST (appended_signature_test, appended_signature_test);
 diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c
-index 96781fb39b..403fa5c789 100644
+index 96781fb39b5..403fa5c789a 100644
 --- a/grub-core/tests/lib/functional_test.c
 +++ b/grub-core/tests/lib/functional_test.c
 @@ -73,6 +73,7 @@ grub_functional_all_tests (grub_extcmd_context_t ctxt __attribute__ ((unused)),
@@ -334,7 +334,7 @@ index 96781fb39b..403fa5c789 100644
    grub_dl_load ("ctz_test");
 diff --git a/grub-core/tests/appended_signatures.h b/grub-core/tests/appended_signatures.h
 new file mode 100644
-index 0000000000..aa3dc6278e
+index 00000000000..aa3dc6278e3
 --- /dev/null
 +++ b/grub-core/tests/appended_signatures.h
 @@ -0,0 +1,557 @@
diff --git a/0175-appended-signatures-documentation.patch b/0149-appended-signatures-documentation.patch
similarity index 91%
rename from 0175-appended-signatures-documentation.patch
rename to 0149-appended-signatures-documentation.patch
index eb580464..c212ed3c 100644
--- a/0175-appended-signatures-documentation.patch
+++ b/0149-appended-signatures-documentation.patch
@@ -13,10 +13,10 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  1 file changed, 182 insertions(+), 17 deletions(-)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index afbde7c1f7..4816be8561 100644
+index 0ac0a1b3735..eab81718a59 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -3214,6 +3214,7 @@ These variables have special meaning to GRUB.
+@@ -3275,6 +3275,7 @@ These variables have special meaning to GRUB.
  
  @menu
  * biosnum::
@@ -24,7 +24,7 @@ index afbde7c1f7..4816be8561 100644
  * check_signatures::
  * chosen::
  * cmdpath::
-@@ -3273,11 +3274,18 @@ For an alternative approach which also changes BIOS drive mappings for the
+@@ -3339,11 +3340,18 @@ For an alternative approach which also changes BIOS drive mappings for the
  chain-loaded system, @pxref{drivemap}.
  
  
@@ -45,23 +45,23 @@ index afbde7c1f7..4816be8561 100644
  
  @node chosen
  @subsection chosen
-@@ -3994,6 +4002,7 @@ you forget a command, you can run the command @command{help}
+@@ -4362,6 +4370,7 @@ you forget a command, you can run the command @command{help}
  * date::                        Display or set current date and time
  * devicetree::                  Load a device tree blob
  * distrust::                    Remove a pubkey from trusted keys
 +* distrust_certificate::        Remove a certificate from the list of trusted certificates
  * drivemap::                    Map a drive to another
  * echo::                        Display a line of text
- * eval::                        Evaluate agruments as GRUB commands
-@@ -4010,6 +4019,7 @@ you forget a command, you can run the command @command{help}
+ * efitextmode::                 Set/Get text output mode resolution
+@@ -4378,6 +4387,7 @@ you forget a command, you can run the command @command{help}
+ * hexdump::                     Show raw contents of a file or memory
+ * insmod::                      Insert a module
  * keystatus::                   Check key modifier status
- * linux::                       Load a Linux kernel
- * linux16::                     Load a Linux kernel (16-bit mode)
 +* list_certificates::           List trusted certificates
  * list_env::                    List variables in environment block
  * list_trusted::                List trusted public keys
  * load_env::                    Load variables from environment block
-@@ -4047,8 +4057,10 @@ you forget a command, you can run the command @command{help}
+@@ -4416,8 +4426,10 @@ you forget a command, you can run the command @command{help}
  * test::                        Check file types and compare values
  * true::                        Do nothing, successfully
  * trust::                       Add public key to list of trusted keys
@@ -71,8 +71,8 @@ index afbde7c1f7..4816be8561 100644
 +* verify_appended::             Verify appended digital signature
  * verify_detached::             Verify detached digital signature
  * videoinfo::                   List available video modes
- @comment * xen_*::              Xen boot commands for AArch64
-@@ -4376,9 +4388,28 @@ These keys are used to validate signatures when environment variable
+ * wrmsr::                       Write values to model-specific registers
+@@ -4757,9 +4769,28 @@ These keys are used to validate signatures when environment variable
  @code{check_signatures} is set to @code{enforce}
  (@pxref{check_signatures}), and by some invocations of
  @command{verify_detached} (@pxref{verify_detached}).  @xref{Using
@@ -102,7 +102,7 @@ index afbde7c1f7..4816be8561 100644
  @node drivemap
  @subsection drivemap
  
-@@ -4636,6 +4667,21 @@ This command is only available on x86 systems.
+@@ -5036,6 +5067,21 @@ only if checking key modifier status is supported.
  @end deffn
  
  
@@ -124,7 +124,7 @@ index afbde7c1f7..4816be8561 100644
  @node list_env
  @subsection list_env
  
-@@ -4655,7 +4701,7 @@ The output is in GPG's v4 key fingerprint format (i.e., the output of
+@@ -5055,7 +5101,7 @@ The output is in GPG's v4 key fingerprint format (i.e., the output of
  @code{gpg --fingerprint}).  The least significant four bytes (last
  eight hexadecimal digits) can be used as an argument to
  @command{distrust} (@pxref{distrust}).
@@ -133,7 +133,7 @@ index afbde7c1f7..4816be8561 100644
  these keys.
  @end deffn
  
-@@ -4690,8 +4736,13 @@ When used with care, @option{--skip-sig} and the whitelist enable an
+@@ -5090,8 +5136,13 @@ When used with care, @option{--skip-sig} and the whitelist enable an
  administrator to configure a system to boot only signed
  configurations, but to allow the user to select from among multiple
  configurations, and to enable ``one-shot'' boot attempts and
@@ -148,7 +148,7 @@ index afbde7c1f7..4816be8561 100644
  @end deffn
  
  
-@@ -4987,7 +5038,7 @@ read.  It is possible to modify a digitally signed environment block
+@@ -5462,7 +5513,7 @@ read.  It is possible to modify a digitally signed environment block
  file from within GRUB using this command, such that its signature will
  no longer be valid on subsequent boots.  Care should be taken in such
  advanced configurations to avoid rendering the system
@@ -157,7 +157,7 @@ index afbde7c1f7..4816be8561 100644
  @end deffn
  
  
-@@ -5387,11 +5438,32 @@ signatures when environment variable @code{check_signatures} is set to
+@@ -5878,11 +5929,32 @@ signatures when environment variable @code{check_signatures} is set to
  must itself be properly signed.  The @option{--skip-sig} option can be
  used to disable signature-checking when reading @var{pubkey_file}
  itself. It is expected that @option{--skip-sig} is useful for testing
@@ -191,7 +191,7 @@ index afbde7c1f7..4816be8561 100644
  @node unset
  @subsection unset
  
-@@ -5410,6 +5482,18 @@ only on PC BIOS platforms.
+@@ -5901,6 +5973,18 @@ only on PC BIOS platforms.
  @end deffn
  @end ignore
  
@@ -210,7 +210,7 @@ index afbde7c1f7..4816be8561 100644
  
  @node verify_detached
  @subsection verify_detached
-@@ -5428,7 +5512,7 @@ tried.
+@@ -5919,7 +6003,7 @@ tried.
  
  Exit code @code{$?} is set to 0 if the signature validates
  successfully.  If validation fails, it is set to a non-zero value.
@@ -219,7 +219,7 @@ index afbde7c1f7..4816be8561 100644
  @end deffn
  
  @node videoinfo
-@@ -5811,13 +5895,14 @@ environment variables and commands are listed in the same order.
+@@ -6397,13 +6481,14 @@ environment variables and commands are listed in the same order.
  @chapter Security
  
  @menu
@@ -241,7 +241,7 @@ index afbde7c1f7..4816be8561 100644
  @end menu
  
  @node Authentication and authorisation
-@@ -5891,8 +5976,8 @@ generating configuration files with authentication.  You can use
+@@ -6477,8 +6562,8 @@ generating configuration files with authentication.  You can use
  adding @kbd{set superusers=} and @kbd{password} or @kbd{password_pbkdf2}
  commands.
  
@@ -252,7 +252,7 @@ index afbde7c1f7..4816be8561 100644
  
  GRUB's @file{core.img} can optionally provide enforcement that all files
  subsequently read from disk are covered by a valid digital signature.
-@@ -5985,6 +6070,86 @@ or BIOS) configuration to cause the machine to boot from a different
+@@ -6571,6 +6656,86 @@ or BIOS) configuration to cause the machine to boot from a different
  (attacker-controlled) device.  GRUB is at best only one link in a
  secure boot chain.
  
diff --git a/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch b/0150-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
similarity index 84%
rename from 0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
rename to 0150-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
index ed4c684a..a8fdba36 100644
--- a/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
+++ b/0150-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
@@ -15,10 +15,10 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  4 files changed, 32 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 6bddc841b8..3f3459b2c7 100644
+index c81c9107249..c748a37b4c5 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -323,6 +323,7 @@ kernel = {
+@@ -337,6 +337,7 @@ kernel = {
    powerpc_ieee1275 = kern/powerpc/cache.S;
    powerpc_ieee1275 = kern/powerpc/dl.c;
    powerpc_ieee1275 = kern/powerpc/compiler-rt.S;
@@ -27,18 +27,18 @@ index 6bddc841b8..3f3459b2c7 100644
    sparc64_ieee1275 = kern/sparc64/cache.S;
    sparc64_ieee1275 = kern/sparc64/dl.c;
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 937c1bc44c..fc7d971272 100644
+index c4d6962197b..85d50e2965f 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
-@@ -44,6 +44,7 @@
- #ifdef __sparc__
- #include <grub/machine/kernel.h>
+@@ -49,6 +49,7 @@
+ #if defined(__powerpc__) || defined(__i386__)
+ #include <grub/ieee1275/alloc.h>
  #endif
 +#include <grub/lockdown.h>
  
- /* The minimal heap size we can live with. */
- #define HEAP_MIN_SIZE		(unsigned long) (2 * 1024 * 1024)
-@@ -271,6 +272,30 @@ grub_parse_cmdline (void)
+ /* The maximum heap size we're going to claim at boot. Not used by sparc. */
+ #ifdef __i386__
+@@ -893,6 +894,30 @@ grub_parse_cmdline (void)
      }
  }
  
@@ -69,7 +69,7 @@ index 937c1bc44c..fc7d971272 100644
  grub_addr_t grub_modbase;
  
  void
-@@ -296,6 +321,8 @@ grub_machine_init (void)
+@@ -918,6 +943,8 @@ grub_machine_init (void)
  #else
    grub_install_get_time_ms (grub_rtc_get_time_ms);
  #endif
@@ -79,7 +79,7 @@ index 937c1bc44c..fc7d971272 100644
  
  void
 diff --git a/include/grub/lockdown.h b/include/grub/lockdown.h
-index 40531fa823..ebfee4bf06 100644
+index 40531fa823b..ebfee4bf06e 100644
 --- a/include/grub/lockdown.h
 +++ b/include/grub/lockdown.h
 @@ -24,7 +24,8 @@
@@ -93,10 +93,10 @@ index 40531fa823..ebfee4bf06 100644
  EXPORT_FUNC (grub_lockdown) (void);
  extern int
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 4816be8561..a4da9c2a1b 100644
+index eab81718a59..096a3cde075 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -6227,8 +6227,8 @@ Measured boot is currently only supported on EFI platforms.
+@@ -6814,8 +6814,8 @@ platforms.
  @section Lockdown when booting on a secure setup
  
  The GRUB can be locked down when booted on a secure boot environment, for example
diff --git a/0151-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/0151-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
new file mode 100644
index 00000000..3ca51396
--- /dev/null
+++ b/0151-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens <dja@axtens.net>
+Date: Wed, 14 Apr 2021 20:10:23 +1000
+Subject: [PATCH] ieee1275: drop HEAP_MAX_ADDR, HEAP_MIN_SIZE
+
+HEAP_MAX_ADDR is confusing. Currently it is set to 32MB, except
+on ieee1275 on x86, where it is 64MB.
+
+There is a comment which purports to explain it:
+
+/* If possible, we will avoid claiming heap above this address, because it
+   seems to cause relocation problems with OSes that link at 4 MiB */
+
+This doesn't make a lot of sense when the constants are well above 4MB
+already. It was not always this way. Prior to
+commit 7b5d0fe4440c ("Increase heap limit") in 2010, HEAP_MAX_SIZE and
+HEAP_MAX_ADDR were indeed 4MB. However, when the constants were increased
+the comment was left unchanged.
+
+It's been over a decade. It doesn't seem like we have problems with
+claims over 4MB on powerpc or x86 ieee1275. (sparc does things completely
+differently and never used the constant.)
+
+Drop the constant and the check.
+
+The only use of HEAP_MIN_SIZE was to potentially override the
+HEAP_MAX_ADDR check. It is now unused. Remove it.
+
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+---
+ grub-core/kern/ieee1275/init.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
+index 85d50e2965f..8ce1a0f09ee 100644
+--- a/grub-core/kern/ieee1275/init.c
++++ b/grub-core/kern/ieee1275/init.c
+@@ -51,7 +51,7 @@
+ #endif
+ #include <grub/lockdown.h>
+ 
+-/* The maximum heap size we're going to claim at boot. Not used by sparc. */
++/* The maximum heap size we're going to claim. Not used by sparc. */
+ #ifdef __i386__
+ #define HEAP_MAX_SIZE		(unsigned long) (64 * 1024 * 1024)
+ #else /* __powerpc__ */
diff --git a/0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch b/0152-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
similarity index 99%
rename from 0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
rename to 0152-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
index 5728f26d..a237a217 100644
--- a/0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
+++ b/0152-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
@@ -23,7 +23,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  3 files changed, 201 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/commands/appendedsig/x509.c b/grub-core/commands/appendedsig/x509.c
-index 2b38b3670a..42ec65c54a 100644
+index 2b38b3670a2..42ec65c54aa 100644
 --- a/grub-core/commands/appendedsig/x509.c
 +++ b/grub-core/commands/appendedsig/x509.c
 @@ -47,6 +47,12 @@ const char *keyUsage_oid = "2.5.29.15";
@@ -156,7 +156,7 @@ index 2b38b3670a..42ec65c54a 100644
  
  cleanup_value:
 diff --git a/grub-core/tests/appended_signature_test.c b/grub-core/tests/appended_signature_test.c
-index 88a485200d..dbba061662 100644
+index 88a485200d8..dbba0616621 100644
 --- a/grub-core/tests/appended_signature_test.c
 +++ b/grub-core/tests/appended_signature_test.c
 @@ -111,6 +111,22 @@ static struct grub_procfs_entry certificate_printable_der_entry = {
@@ -225,7 +225,7 @@ index 88a485200d..dbba061662 100644
  
  GRUB_FUNCTIONAL_TEST (appended_signature_test, appended_signature_test);
 diff --git a/grub-core/tests/appended_signatures.h b/grub-core/tests/appended_signatures.h
-index aa3dc6278e..2e5ebd7d8b 100644
+index aa3dc6278e3..2e5ebd7d8bd 100644
 --- a/grub-core/tests/appended_signatures.h
 +++ b/grub-core/tests/appended_signatures.h
 @@ -555,3 +555,84 @@ unsigned char certificate_printable_der[] = {
diff --git a/0181-ieee1275-ofdisk-retry-on-open-failure.patch b/0153-ieee1275-ofdisk-retry-on-open-failure.patch
similarity index 93%
rename from 0181-ieee1275-ofdisk-retry-on-open-failure.patch
rename to 0153-ieee1275-ofdisk-retry-on-open-failure.patch
index 91497730..160f0c9f 100644
--- a/0181-ieee1275-ofdisk-retry-on-open-failure.patch
+++ b/0153-ieee1275-ofdisk-retry-on-open-failure.patch
@@ -16,7 +16,7 @@ Signed-off-by: Diego Domingos <diegodo@br.ibm.com>
  2 files changed, 28 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
-index ea7f78ac7d..55346849d3 100644
+index 629fc15f284..b413822bb87 100644
 --- a/grub-core/disk/ieee1275/ofdisk.c
 +++ b/grub-core/disk/ieee1275/ofdisk.c
 @@ -225,7 +225,9 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
@@ -50,7 +50,7 @@ index ea7f78ac7d..55346849d3 100644
      if (! last_ihandle)
        return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
      last_devpath = op->open_path;
-@@ -571,7 +575,7 @@ grub_ofdisk_prepare (grub_disk_t disk, grub_disk_addr_t sector)
+@@ -567,7 +571,7 @@ grub_ofdisk_prepare (grub_disk_t disk, grub_disk_addr_t sector)
        last_ihandle = 0;
        last_devpath = NULL;
  
@@ -58,8 +58,8 @@ index ea7f78ac7d..55346849d3 100644
 +      RETRY_IEEE1275_OFDISK_OPEN(disk->data, &last_ihandle);
        if (! last_ihandle)
  	return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
-       last_devpath = disk->data;      
-@@ -598,12 +602,23 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
+       last_devpath = disk->data;
+@@ -594,12 +598,23 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
      return err;
    grub_ieee1275_read (last_ihandle, buf, size  << disk->log_sector_size,
  		      &actual);
@@ -85,7 +85,7 @@ index ea7f78ac7d..55346849d3 100644
  }
  
 diff --git a/include/grub/ieee1275/ofdisk.h b/include/grub/ieee1275/ofdisk.h
-index 2f69e3f191..7d2d540930 100644
+index 2f69e3f191d..7d2d5409305 100644
 --- a/include/grub/ieee1275/ofdisk.h
 +++ b/include/grub/ieee1275/ofdisk.h
 @@ -22,4 +22,12 @@
diff --git a/0183-efinet-Add-DHCP-proxy-support.patch b/0154-efinet-Add-DHCP-proxy-support.patch
similarity index 80%
rename from 0183-efinet-Add-DHCP-proxy-support.patch
rename to 0154-efinet-Add-DHCP-proxy-support.patch
index eed2dbb0..6d1b6da5 100644
--- a/0183-efinet-Add-DHCP-proxy-support.patch
+++ b/0154-efinet-Add-DHCP-proxy-support.patch
@@ -10,14 +10,14 @@ server ack packet. Currently that case is not handled, add support for it.
 Signed-off-by: Ian Page Hands <iphands@gmail.com>
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/net/drivers/efi/efinet.c | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
+ grub-core/net/drivers/efi/efinet.c | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index e11d759f19..1a24f38a21 100644
+index 225dc896da0..83005ea9f88 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
-@@ -850,10 +850,31 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+@@ -871,12 +871,32 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
      else
        {
  	grub_dprintf ("efinet", "using ipv4 and dhcp\n");
@@ -42,12 +42,12 @@ index e11d759f19..1a24f38a21 100644
 +              }
 +          }
 +
- 	grub_net_configure_by_dhcp_ack (card->name, card, 0,
- 					(struct grub_net_bootp_packet *)
--					packet_buf,
--					packet_bufsz,
-+					&pxe_mode->dhcp_ack,
-+					sizeof (pxe_mode->dhcp_ack),
- 					1, device, path);
+ 	inter = grub_net_configure_by_dhcp_ack (card->name, card, 0,
+ 						(struct grub_net_bootp_packet *)
+ 						packet_buf,
+ 						packet_bufsz,
+ 						1, device, path);
+-
  	grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
-       }
+ 	if (inter != NULL)
+ 	  {
diff --git a/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch b/0155-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
similarity index 92%
rename from 0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
rename to 0155-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
index 1982847e..47eca898 100644
--- a/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
+++ b/0155-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
@@ -20,10 +20,10 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index c02c1f0820..6af84b44e1 100644
+index b8bc37e92aa..360ce26e5f9 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -256,7 +256,9 @@ if [ -z "\${kernelopts}" ]; then
+@@ -258,7 +258,9 @@ if [ -z "\${kernelopts}" ]; then
  fi
  EOF
  
diff --git a/0186-Suppress-gettext-error-message.patch b/0156-Suppress-gettext-error-message.patch
similarity index 96%
rename from 0186-Suppress-gettext-error-message.patch
rename to 0156-Suppress-gettext-error-message.patch
index 64b219a8..e2484951 100644
--- a/0186-Suppress-gettext-error-message.patch
+++ b/0156-Suppress-gettext-error-message.patch
@@ -14,7 +14,7 @@ Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 4d02e62c10..7ec81ca0b4 100644
+index 7a1c14e4f33..631af7a946b 100644
 --- a/grub-core/gettext/gettext.c
 +++ b/grub-core/gettext/gettext.c
 @@ -424,6 +424,13 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx,
diff --git a/0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch b/0157-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
similarity index 97%
rename from 0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
rename to 0157-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
index b5d5e5cb..7ecea22d 100644
--- a/0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
+++ b/0157-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 1 insertion(+), 8 deletions(-)
 
 diff --git a/util/grub-set-password.in b/util/grub-set-password.in
-index c0b5ebbfdc..d8005e5a14 100644
+index c0b5ebbfdc5..d8005e5a142 100644
 --- a/util/grub-set-password.in
 +++ b/util/grub-set-password.in
 @@ -1,11 +1,6 @@
diff --git a/0191-normal-main-Discover-the-device-to-read-the-config-f.patch b/0158-normal-main-Discover-the-device-to-read-the-config-f.patch
similarity index 98%
rename from 0191-normal-main-Discover-the-device-to-read-the-config-f.patch
rename to 0158-normal-main-Discover-the-device-to-read-the-config-f.patch
index 2c9ca3a4..d6420264 100644
--- a/0191-normal-main-Discover-the-device-to-read-the-config-f.patch
+++ b/0158-normal-main-Discover-the-device-to-read-the-config-f.patch
@@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 51 insertions(+), 7 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 7de9e4c36d..8f5fd81003 100644
+index 0ea27d3c534..fc3ed551cec 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -337,18 +337,13 @@ grub_enter_normal_mode (const char *config)
diff --git a/0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch b/0159-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
similarity index 92%
rename from 0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
rename to 0159-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
index b9bc1400..61bb0b5c 100644
--- a/0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
+++ b/0159-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
@@ -21,21 +21,19 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
 [rharwood@redhat.com: squash in fixup commit]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/kern/main.c | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 44 insertions(+), 5 deletions(-)
+ grub-core/kern/main.c | 47 +++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 43 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index b573be6650..3fc3401472 100644
+index 353a62ef1e1..dbd4f596fbe 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
-@@ -216,13 +216,52 @@ grub_set_prefix_and_root (void)
-   if (device)
+@@ -217,12 +217,51 @@ grub_set_prefix_and_root (void)
      {
        char *prefix_set;
--    
+ 
 -      prefix_set = grub_xasprintf ("(%s)%s", device, path ? : "");
 -      if (prefix_set)
-+
 +#ifdef __powerpc__
 +      /* We have to be careful here on powerpc-ieee1275 + signed grub. We
 +	 will have signed something with a prefix that doesn't have a device
diff --git a/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch b/0160-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
similarity index 97%
rename from 0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
rename to 0160-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
index 05417ed9..a6b31cc6 100644
--- a/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
+++ b/0160-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
@@ -79,10 +79,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 3f3459b2c7..6b00eb5557 100644
+index c748a37b4c5..ceb15879272 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -89,7 +89,7 @@ kernel = {
+@@ -99,7 +99,7 @@ kernel = {
    i386_xen_pvh_ldflags     = '$(TARGET_IMG_BASE_LDOPT),0x100000';
  
    mips_loongson_ldflags    = '-Wl,-Ttext,0x80200000';
@@ -92,7 +92,7 @@ index 3f3459b2c7..6b00eb5557 100644
    mips_arc_ldflags    = '-Wl,-Ttext,$(TARGET_LINK_ADDR)';
    mips_qemu_mips_ldflags    = '-Wl,-Ttext,0x80200000';
 diff --git a/include/grub/offsets.h b/include/grub/offsets.h
-index 871e1cd4c3..69211aa798 100644
+index 871e1cd4c38..69211aa798b 100644
 --- a/include/grub/offsets.h
 +++ b/include/grub/offsets.h
 @@ -63,7 +63,7 @@
diff --git a/0161-Add-Fedora-location-of-DejaVu-SANS-font.patch b/0161-Add-Fedora-location-of-DejaVu-SANS-font.patch
new file mode 100644
index 00000000..63bbc18a
--- /dev/null
+++ b/0161-Add-Fedora-location-of-DejaVu-SANS-font.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: fluteze <fluteze@gmail.com>
+Date: Sat, 27 Nov 2021 10:54:44 -0600
+Subject: [PATCH] Add Fedora location of DejaVu SANS font
+
+In Fedora 35, and possibly earlier, grub would fail to configure with a
+complaint about DejaVu being "not found" even though it was installed.
+The DejaVu sans font search path is updated to reflect the
+distribution's current install path.
+
+Signed-off-by: Erik Edwards <fluteze@gmail.com>
+[rharwood@redhat.com: slight commit message edits]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 016cd3d4e0e..d223fe3ef6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1924,7 +1924,7 @@ if test "x$with_dejavufont" = x; then
+   # search in well-known directories
+   if test x"$starfield_excuse" = x; then
+      for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
+-       for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype /usr/pkg/share/fonts/X11/TTF /usr/local/share/fonts/dejavu /usr/X11R6/lib/X11/fonts/TTF; do
++       for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype /usr/pkg/share/fonts/X11/TTF /usr/local/share/fonts/dejavu /usr/X11R6/lib/X11/fonts/TTF /usr/share/fonts/dejavu-sans-fonts; do
+           if test -f "$dir/DejaVuSans.$ext"; then
+             DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
+             break 2
diff --git a/0210-efi-new-connectefi-command.patch b/0162-efi-new-connectefi-command.patch
similarity index 94%
rename from 0210-efi-new-connectefi-command.patch
rename to 0162-efi-new-connectefi-command.patch
index 55a49fd1..f36d9ca0 100644
--- a/0210-efi-new-connectefi-command.patch
+++ b/0162-efi-new-connectefi-command.patch
@@ -64,10 +64,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 grub-core/commands/efi/connectefi.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 39233096f2..3c0ac3b7bd 100644
+index ceb15879272..c9dcfa00e85 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -836,6 +836,12 @@ module = {
+@@ -861,6 +861,12 @@ module = {
    enable = efi;
  };
  
@@ -82,7 +82,7 @@ index 39233096f2..3c0ac3b7bd 100644
    common = commands/blocklist.c;
 diff --git a/grub-core/commands/efi/connectefi.c b/grub-core/commands/efi/connectefi.c
 new file mode 100644
-index 0000000000..8ab75bd51b
+index 00000000000..0f840ea0575
 --- /dev/null
 +++ b/grub-core/commands/efi/connectefi.c
 @@ -0,0 +1,205 @@
@@ -165,7 +165,7 @@ index 0000000000..8ab75bd51b
 +
 +typedef struct searched_item
 +{
-+  grub_efi_guid_t guid;
++  grub_guid_t guid;
 +  const char *name;
 +  searched_item_flags flags;
 +} searched_items;
@@ -292,7 +292,7 @@ index 0000000000..8ab75bd51b
 +  grub_unregister_command (cmd);
 +}
 diff --git a/grub-core/commands/efi/lsefi.c b/grub-core/commands/efi/lsefi.c
-index d1ce99af43..f2d2430e66 100644
+index 7b8316d4184..3635cd99b75 100644
 --- a/grub-core/commands/efi/lsefi.c
 +++ b/grub-core/commands/efi/lsefi.c
 @@ -19,6 +19,7 @@
@@ -304,7 +304,7 @@ index d1ce99af43..f2d2430e66 100644
  #include <grub/efi/pci.h>
  #include <grub/efi/efi.h>
 diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
-index fe8ba6e6c9..062143dfff 100644
+index 822005456eb..af69cc3bc8a 100644
 --- a/grub-core/disk/efi/efidisk.c
 +++ b/grub-core/disk/efi/efidisk.c
 @@ -396,6 +396,19 @@ enumerate_disks (void)
@@ -328,10 +328,10 @@ index fe8ba6e6c9..062143dfff 100644
  grub_efidisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
  		      grub_disk_pull_t pull)
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 14bc10eb56..7fcca69c17 100644
+index ef837387368..412a2073f41 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -95,6 +95,19 @@ grub_efi_locate_handle (grub_efi_locate_search_type_t search_type,
+@@ -96,6 +96,19 @@ grub_efi_locate_handle (grub_efi_locate_search_type_t search_type,
    return buffer;
  }
  
@@ -344,15 +344,15 @@ index 14bc10eb56..7fcca69c17 100644
 +  grub_efi_boot_services_t *b;
 +
 +  b = grub_efi_system_table->boot_services;
-+  return efi_call_4 (b->connect_controller, controller_handle,
++  return b->connect_controller(controller_handle,
 +		     driver_image_handle, remaining_device_path, recursive);
 +}
 +
  void *
  grub_efi_open_protocol (grub_efi_handle_t handle,
- 			grub_efi_guid_t *protocol,
+ 			grub_guid_t *protocol,
 diff --git a/include/grub/efi/disk.h b/include/grub/efi/disk.h
-index 254475c842..6845c2f1fd 100644
+index 254475c8428..6845c2f1fd8 100644
 --- a/include/grub/efi/disk.h
 +++ b/include/grub/efi/disk.h
 @@ -27,6 +27,8 @@ grub_efi_handle_t
@@ -365,11 +365,11 @@ index 254475c842..6845c2f1fd 100644
  void grub_efidisk_fini (void);
  
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 8dfc89a33b..ec52083c49 100644
+index 6c2c1f36e37..736d6f25694 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -41,6 +41,11 @@ EXPORT_FUNC(grub_efi_locate_handle) (grub_efi_locate_search_type_t search_type,
- 				     grub_efi_guid_t *protocol,
+@@ -53,6 +53,11 @@ EXPORT_FUNC(grub_efi_locate_handle) (grub_efi_locate_search_type_t search_type,
+ 				     grub_guid_t *protocol,
  				     void *search_key,
  				     grub_efi_uintn_t *num_handles);
 +grub_efi_status_t
@@ -378,13 +378,13 @@ index 8dfc89a33b..ec52083c49 100644
 +					  grub_efi_device_path_protocol_t *remaining_device_path,
 +					  grub_efi_boolean_t recursive);
  void *EXPORT_FUNC(grub_efi_open_protocol) (grub_efi_handle_t handle,
- 					   grub_efi_guid_t *protocol,
+ 					   grub_guid_t *protocol,
  					   grub_efi_uint32_t attributes);
 diff --git a/NEWS b/NEWS
-index 73b8492bc4..d7c1d23aed 100644
+index 3101309621b..e3cfcd569c2 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -98,7 +98,7 @@ New in 2.02:
+@@ -118,7 +118,7 @@ New in 2.02:
    * Prefer pmtimer for TSC calibration.
  
  * New/improved platform support:
diff --git a/0216-powerpc-prefix-detection-support-device-names-with-c.patch b/0163-powerpc-prefix-detection-support-device-names-with-c.patch
similarity index 98%
rename from 0216-powerpc-prefix-detection-support-device-names-with-c.patch
rename to 0163-powerpc-prefix-detection-support-device-names-with-c.patch
index 1c16fd39..57444137 100644
--- a/0216-powerpc-prefix-detection-support-device-names-with-c.patch
+++ b/0163-powerpc-prefix-detection-support-device-names-with-c.patch
@@ -30,7 +30,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  1 file changed, 21 insertions(+), 6 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 993b8a8598..e94a2f78fb 100644
+index dbd4f596fbe..8e89763f43b 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -242,14 +242,29 @@ grub_set_prefix_and_root (void)
diff --git a/0219-make-ofdisk_retries-optional.patch b/0164-make-ofdisk_retries-optional.patch
similarity index 98%
rename from 0219-make-ofdisk_retries-optional.patch
rename to 0164-make-ofdisk_retries-optional.patch
index fce9702d..791c0a6f 100644
--- a/0219-make-ofdisk_retries-optional.patch
+++ b/0164-make-ofdisk_retries-optional.patch
@@ -24,7 +24,7 @@ so the default number of retries will be used instead.
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/include/grub/ieee1275/ofdisk.h b/include/grub/ieee1275/ofdisk.h
-index 7d2d540930..0074d55eee 100644
+index 7d2d5409305..0074d55eee4 100644
 --- a/include/grub/ieee1275/ofdisk.h
 +++ b/include/grub/ieee1275/ofdisk.h
 @@ -25,7 +25,12 @@ extern void grub_ofdisk_fini (void);
diff --git a/0254-misc-Make-grub_min-and-grub_max-more-resilient.patch b/0165-misc-Make-grub_min-and-grub_max-more-resilient.patch
similarity index 94%
rename from 0254-misc-Make-grub_min-and-grub_max-more-resilient.patch
rename to 0165-misc-Make-grub_min-and-grub_max-more-resilient.patch
index eb2e8fda..a9afc998 100644
--- a/0254-misc-Make-grub_min-and-grub_max-more-resilient.patch
+++ b/0165-misc-Make-grub_min-and-grub_max-more-resilient.patch
@@ -24,10 +24,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 24 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
-index f2318e0d16..87f6e31aa6 100644
+index 1edad05948c..8d370b0b3f5 100644
 --- a/grub-core/loader/multiboot_elfxx.c
 +++ b/grub-core/loader/multiboot_elfxx.c
-@@ -35,9 +35,7 @@
+@@ -45,9 +45,7 @@
  #endif
  
  #include <grub/i386/relocator.h>
@@ -39,7 +39,7 @@ index f2318e0d16..87f6e31aa6 100644
  #pragma GCC diagnostic ignored "-Wcast-align"
  
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 6c4aa85ac5..cf84aec1db 100644
+index 3f5f5b61695..252bdb161eb 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
 @@ -35,6 +35,14 @@
@@ -57,7 +57,7 @@ index 6c4aa85ac5..cf84aec1db 100644
  #define grub_dprintf(condition, ...) grub_real_dprintf(GRUB_FILE, __LINE__, condition, __VA_ARGS__)
  
  void *EXPORT_FUNC(grub_memmove) (void *dest, const void *src, grub_size_t n);
-@@ -498,8 +506,21 @@ void EXPORT_FUNC(grub_real_boot_time) (const char *file,
+@@ -525,8 +533,21 @@ void EXPORT_FUNC(grub_real_boot_time) (const char *file,
  #define grub_boot_time(...)
  #endif
  
diff --git a/0255-ReiserFS-switch-to-using-grub_min-grub_max.patch b/0166-ReiserFS-switch-to-using-grub_min-grub_max.patch
similarity index 99%
rename from 0255-ReiserFS-switch-to-using-grub_min-grub_max.patch
rename to 0166-ReiserFS-switch-to-using-grub_min-grub_max.patch
index 0707af3e..76d44ac3 100644
--- a/0255-ReiserFS-switch-to-using-grub_min-grub_max.patch
+++ b/0166-ReiserFS-switch-to-using-grub_min-grub_max.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 9 insertions(+), 19 deletions(-)
 
 diff --git a/grub-core/fs/reiserfs.c b/grub-core/fs/reiserfs.c
-index af6a226a7f..b8253da7fe 100644
+index 36b26ac98a0..42818c37622 100644
 --- a/grub-core/fs/reiserfs.c
 +++ b/grub-core/fs/reiserfs.c
 @@ -42,16 +42,6 @@
diff --git a/0256-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch b/0167-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch
similarity index 76%
rename from 0256-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch
rename to 0167-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch
index a7ac6f2a..9293ba93 100644
--- a/0256-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch
+++ b/0167-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch
@@ -13,29 +13,27 @@ in DEBUG, regardless of BOOT_TIME_STATS.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/kern/misc.c | 3 ++-
+ grub-core/kern/misc.c | 1 +
  include/grub/misc.h   | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index a186ad3dd4..cb45461402 100644
+index d3a493e3552..f607244e7ae 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -1334,7 +1334,8 @@ grub_real_boot_time (const char *file,
-   n->next = 0;
+@@ -1438,6 +1438,7 @@ grub_real_boot_time (const char *file,
  
    va_start (args, fmt);
--  n->msg = grub_xvasprintf (fmt, args);    
-+  n->msg = grub_xvasprintf (fmt, args);
+   n->msg = grub_xvasprintf (fmt, args);
 +  grub_dprintf ("boot", "%s\n", n->msg);
    va_end (args);
  
    *boot_time_last = n;
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index cf84aec1db..faae0ae860 100644
+index 252bdb161eb..c3c735371dc 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
-@@ -503,7 +503,7 @@ void EXPORT_FUNC(grub_real_boot_time) (const char *file,
+@@ -530,7 +530,7 @@ void EXPORT_FUNC(grub_real_boot_time) (const char *file,
  				       const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 3, 4)));
  #define grub_boot_time(...) grub_real_boot_time(GRUB_FILE, __LINE__, __VA_ARGS__)
  #else
diff --git a/0257-modules-make-.module_license-read-only.patch b/0168-modules-make-.module_license-read-only.patch
similarity index 97%
rename from 0257-modules-make-.module_license-read-only.patch
rename to 0168-modules-make-.module_license-read-only.patch
index ba3b3137..368386d0 100644
--- a/0257-modules-make-.module_license-read-only.patch
+++ b/0168-modules-make-.module_license-read-only.patch
@@ -16,7 +16,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/grub/dl.h b/include/grub/dl.h
-index 20d870f2a4..618ae6f474 100644
+index 3f10e27d62c..216f8b903ac 100644
 --- a/include/grub/dl.h
 +++ b/include/grub/dl.h
 @@ -121,7 +121,7 @@ grub_mod_fini (void)
diff --git a/0258-modules-strip-.llvm_addrsig-sections-and-similar.patch b/0169-modules-strip-.llvm_addrsig-sections-and-similar.patch
similarity index 97%
rename from 0258-modules-strip-.llvm_addrsig-sections-and-similar.patch
rename to 0169-modules-strip-.llvm_addrsig-sections-and-similar.patch
index 9f26115d..c86b9997 100644
--- a/0258-modules-strip-.llvm_addrsig-sections-and-similar.patch
+++ b/0169-modules-strip-.llvm_addrsig-sections-and-similar.patch
@@ -21,7 +21,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in
-index 1250589b3f..c2c5280d75 100644
+index e57c4d9205c..337753c574c 100644
 --- a/grub-core/genmod.sh.in
 +++ b/grub-core/genmod.sh.in
 @@ -57,8 +57,11 @@ if test x@TARGET_APPLE_LINKER@ != x1; then
diff --git a/0259-modules-Don-t-allocate-space-for-non-allocable-secti.patch b/0170-modules-Don-t-allocate-space-for-non-allocable-secti.patch
similarity index 92%
rename from 0259-modules-Don-t-allocate-space-for-non-allocable-secti.patch
rename to 0170-modules-Don-t-allocate-space-for-non-allocable-secti.patch
index d07d8386..19c7fdd1 100644
--- a/0259-modules-Don-t-allocate-space-for-non-allocable-secti.patch
+++ b/0170-modules-Don-t-allocate-space-for-non-allocable-secti.patch
@@ -20,10 +20,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index f304494574..aef8af8aa7 100644
+index 931f6e41442..832c6188df4 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
-@@ -289,6 +289,9 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+@@ -281,6 +281,9 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
         i < e->e_shnum;
         i++, s = (const Elf_Shdr *)((const char *) s + e->e_shentsize))
      {
diff --git a/0262-modules-load-module-sections-at-page-aligned-address.patch b/0171-modules-load-module-sections-at-page-aligned-address.patch
similarity index 90%
rename from 0262-modules-load-module-sections-at-page-aligned-address.patch
rename to 0171-modules-load-module-sections-at-page-aligned-address.patch
index 9a5048ce..8ace83db 100644
--- a/0262-modules-load-module-sections-at-page-aligned-address.patch
+++ b/0171-modules-load-module-sections-at-page-aligned-address.patch
@@ -71,7 +71,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  13 files changed, 139 insertions(+), 11 deletions(-)
 
 diff --git a/grub-core/kern/arm/dl.c b/grub-core/kern/arm/dl.c
-index eab9d17ff2..9260737936 100644
+index eab9d17ff2d..92607379366 100644
 --- a/grub-core/kern/arm/dl.c
 +++ b/grub-core/kern/arm/dl.c
 @@ -278,3 +278,16 @@ grub_arch_dl_check_header (void *ehdr)
@@ -92,7 +92,7 @@ index eab9d17ff2..9260737936 100644
 +#endif
 +}
 diff --git a/grub-core/kern/arm64/dl.c b/grub-core/kern/arm64/dl.c
-index 512e5a80b0..0d4a26857f 100644
+index a2b5789a9dd..95c6d5bf4e5 100644
 --- a/grub-core/kern/arm64/dl.c
 +++ b/grub-core/kern/arm64/dl.c
 @@ -196,3 +196,16 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
@@ -113,19 +113,19 @@ index 512e5a80b0..0d4a26857f 100644
 +#endif
 +}
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index aef8af8aa7..8c7aacef39 100644
+index 832c6188df4..775b367287e 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
-@@ -277,7 +277,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+@@ -268,7 +268,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
  {
    unsigned i;
    const Elf_Shdr *s;
 -  grub_size_t tsize = 0, talign = 1;
 +  grub_size_t tsize = 0, talign = 1, arch_addralign = 1;
- #if !defined (__i386__) && !defined (__x86_64__) && !defined(__riscv)
+ #if !defined (__i386__) && !defined (__x86_64__) && !defined(__riscv) && \
+   !defined (__loongarch__)
    grub_size_t tramp;
-   grub_size_t got;
-@@ -285,16 +285,24 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+@@ -277,16 +277,24 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
  #endif
    char *ptr;
  
@@ -152,8 +152,8 @@ index aef8af8aa7..8c7aacef39 100644
 +	talign = sh_addralign;
      }
  
- #if !defined (__i386__) && !defined (__x86_64__) && !defined(__riscv)
-@@ -323,6 +331,9 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+ #if !defined (__i386__) && !defined (__x86_64__) && !defined(__riscv) && \
+@@ -316,6 +324,9 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
         i < e->e_shnum;
         i++, s = (Elf_Shdr *)((char *) s + e->e_shentsize))
      {
@@ -163,7 +163,7 @@ index aef8af8aa7..8c7aacef39 100644
        if (s->sh_flags & SHF_ALLOC)
  	{
  	  grub_dl_segment_t seg;
-@@ -335,17 +346,19 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+@@ -328,17 +339,19 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
  	    {
  	      void *addr;
  
@@ -186,7 +186,7 @@ index aef8af8aa7..8c7aacef39 100644
  		  break;
  		}
  
-@@ -354,7 +367,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+@@ -347,7 +360,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
  	  else
  	    seg->addr = 0;
  
@@ -196,7 +196,7 @@ index aef8af8aa7..8c7aacef39 100644
  	  seg->next = mod->segment;
  	  mod->segment = seg;
 diff --git a/grub-core/kern/emu/full.c b/grub-core/kern/emu/full.c
-index e8d63b1f5f..1de1c28eb0 100644
+index e8d63b1f5f9..1de1c28eb09 100644
 --- a/grub-core/kern/emu/full.c
 +++ b/grub-core/kern/emu/full.c
 @@ -67,3 +67,16 @@ grub_arch_dl_init_linker (void)
@@ -217,7 +217,7 @@ index e8d63b1f5f..1de1c28eb0 100644
 +#endif
 +}
 diff --git a/grub-core/kern/i386/dl.c b/grub-core/kern/i386/dl.c
-index 1346da5cc9..d6b4681fc9 100644
+index 1346da5cc91..d6b4681fc93 100644
 --- a/grub-core/kern/i386/dl.c
 +++ b/grub-core/kern/i386/dl.c
 @@ -79,3 +79,16 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
@@ -238,7 +238,7 @@ index 1346da5cc9..d6b4681fc9 100644
 +#endif
 +}
 diff --git a/grub-core/kern/ia64/dl.c b/grub-core/kern/ia64/dl.c
-index db59300fea..92d82c5750 100644
+index db59300fea3..92d82c57505 100644
 --- a/grub-core/kern/ia64/dl.c
 +++ b/grub-core/kern/ia64/dl.c
 @@ -148,3 +148,12 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
@@ -255,7 +255,7 @@ index db59300fea..92d82c5750 100644
 +  return 1;
 +}
 diff --git a/grub-core/kern/mips/dl.c b/grub-core/kern/mips/dl.c
-index 5d7d299c74..6d83bd71e9 100644
+index 5b02f97fca7..db411899dbe 100644
 --- a/grub-core/kern/mips/dl.c
 +++ b/grub-core/kern/mips/dl.c
 @@ -272,3 +272,11 @@ grub_arch_dl_init_linker (void)
@@ -271,7 +271,7 @@ index 5d7d299c74..6d83bd71e9 100644
 +  return 1;
 +}
 diff --git a/grub-core/kern/powerpc/dl.c b/grub-core/kern/powerpc/dl.c
-index cdd61b305f..5d9ba2e158 100644
+index 7b6418eabd7..0eb8bc5bd31 100644
 --- a/grub-core/kern/powerpc/dl.c
 +++ b/grub-core/kern/powerpc/dl.c
 @@ -167,3 +167,12 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
@@ -288,10 +288,10 @@ index cdd61b305f..5d9ba2e158 100644
 +  return 1;
 +}
 diff --git a/grub-core/kern/riscv/dl.c b/grub-core/kern/riscv/dl.c
-index f26b12aaa4..aa18f9e990 100644
+index 896653bb41c..1fa085b4acf 100644
 --- a/grub-core/kern/riscv/dl.c
 +++ b/grub-core/kern/riscv/dl.c
-@@ -343,3 +343,16 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
+@@ -344,3 +344,16 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
  
    return GRUB_ERR_NONE;
  }
@@ -309,7 +309,7 @@ index f26b12aaa4..aa18f9e990 100644
 +#endif
 +}
 diff --git a/grub-core/kern/sparc64/dl.c b/grub-core/kern/sparc64/dl.c
-index f3d960186b..f054f08241 100644
+index f3d960186ba..f054f08241d 100644
 --- a/grub-core/kern/sparc64/dl.c
 +++ b/grub-core/kern/sparc64/dl.c
 @@ -189,3 +189,12 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
@@ -326,7 +326,7 @@ index f3d960186b..f054f08241 100644
 +  return 1;
 +}
 diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
-index e5a8bdcf4f..a105dc50ce 100644
+index e5a8bdcf4f9..a105dc50cea 100644
 --- a/grub-core/kern/x86_64/dl.c
 +++ b/grub-core/kern/x86_64/dl.c
 @@ -119,3 +119,16 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
@@ -347,10 +347,10 @@ index e5a8bdcf4f..a105dc50ce 100644
 +#endif
 +}
 diff --git a/include/grub/dl.h b/include/grub/dl.h
-index 618ae6f474..f36ed5cb17 100644
+index 216f8b903ac..9f86765c8e9 100644
 --- a/include/grub/dl.h
 +++ b/include/grub/dl.h
-@@ -280,6 +280,8 @@ grub_err_t grub_arch_dl_check_header (void *ehdr);
+@@ -279,6 +279,8 @@ grub_err_t grub_arch_dl_check_header (void *ehdr);
  grub_err_t
  grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
  			       Elf_Shdr *s, grub_dl_segment_t seg);
@@ -360,10 +360,10 @@ index 618ae6f474..f36ed5cb17 100644
  
  #if defined (_mips)
 diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index 90083772c8..c23ba313dc 100644
+index 04c6678cb6b..8ad5494f5ce 100644
 --- a/docs/grub-dev.texi
 +++ b/docs/grub-dev.texi
-@@ -755,9 +755,9 @@ declare startup asm file ($cpu_$platform_startup) as well as any other files
+@@ -996,9 +996,9 @@ declare startup asm file ($cpu_$platform_startup) as well as any other files
  (e.g. init.c and callwrap.S) (e.g. $cpu_$platform = kern/$cpu/$platform/init.c).
  At this stage you will also need to add dummy dl.c and cache.S with functions
  grub_err_t grub_arch_dl_check_header (void *ehdr), grub_err_t
@@ -375,4 +375,4 @@ index 90083772c8..c23ba313dc 100644
 +*address, grub_size_t len) (cache.S). They won't be used for now.
  
  You will need to create directory include/$cpu/$platform and a file
- include/$cpu/types.h. The later folowing this template:
+ include/$cpu/types.h. The latter following this template:
diff --git a/0263-nx-add-memory-attribute-get-set-API.patch b/0172-nx-add-memory-attribute-get-set-API.patch
similarity index 89%
rename from 0263-nx-add-memory-attribute-get-set-API.patch
rename to 0172-nx-add-memory-attribute-get-set-API.patch
index 91c9d2f5..6a473411 100644
--- a/0263-nx-add-memory-attribute-get-set-API.patch
+++ b/0172-nx-add-memory-attribute-get-set-API.patch
@@ -29,10 +29,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  5 files changed, 226 insertions(+)
 
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 7fcca69c17..4ac2b2754e 100644
+index 412a2073f41..cdfc11565c7 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -1096,3 +1096,39 @@ grub_efi_compare_device_paths (const grub_efi_device_path_t *dp1,
+@@ -1130,3 +1130,39 @@ grub_efi_find_configuration_table (const grub_guid_t *target_guid)
  
    return 0;
  }
@@ -73,10 +73,10 @@ index 7fcca69c17..4ac2b2754e 100644
 +  return err;
 +}
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index e84961d078..2c33758ed7 100644
+index 6a6fba89184..df443f434d4 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
-@@ -738,3 +738,134 @@ grub_efi_get_ram_base(grub_addr_t *base_addr)
+@@ -687,3 +687,134 @@ grub_efi_get_ram_base(grub_addr_t *base_addr)
    return GRUB_ERR_NONE;
  }
  #endif
@@ -124,7 +124,7 @@ index e84961d078..2c33758ed7 100644
 +{
 +  grub_efi_memory_attribute_protocol_t *proto;
 +  grub_efi_physical_address_t physaddr = addr;
-+  grub_efi_guid_t protocol_guid = GRUB_EFI_MEMORY_ATTRIBUTE_PROTOCOL_GUID;
++  grub_guid_t protocol_guid = GRUB_EFI_MEMORY_ATTRIBUTE_PROTOCOL_GUID;
 +  grub_efi_status_t efi_status;
 +
 +  proto = grub_efi_locate_protocol (&protocol_guid, 0);
@@ -138,7 +138,7 @@ index e84961d078..2c33758ed7 100644
 +      return 0;
 +    }
 +
-+  efi_status = efi_call_4(proto->get_memory_attributes,
++  efi_status = proto->get_memory_attributes(
 +			  proto, physaddr, size, attrs);
 +  *attrs = uefi_mem_attrs_to_grub_mem_attrs (*attrs);
 +
@@ -151,7 +151,7 @@ index e84961d078..2c33758ed7 100644
 +{
 +  grub_efi_memory_attribute_protocol_t *proto;
 +  grub_efi_physical_address_t physaddr = addr;
-+  grub_efi_guid_t protocol_guid = GRUB_EFI_MEMORY_ATTRIBUTE_PROTOCOL_GUID;
++  grub_guid_t protocol_guid = GRUB_EFI_MEMORY_ATTRIBUTE_PROTOCOL_GUID;
 +  grub_efi_status_t efi_status = GRUB_EFI_SUCCESS;
 +  grub_uint64_t before = 0, after = 0, uefi_set_attrs, uefi_clear_attrs;
 +  grub_err_t err;
@@ -183,10 +183,10 @@ index e84961d078..2c33758ed7 100644
 +  uefi_clear_attrs = grub_mem_attrs_to_uefi_mem_attrs (clear_attrs);
 +  grub_dprintf ("nx", "translating clear_attrs from 0x%lx to 0x%lx\n", clear_attrs, uefi_clear_attrs);
 +  if (uefi_set_attrs)
-+    efi_status = efi_call_4(proto->set_memory_attributes,
++    efi_status = proto->set_memory_attributes(
 +			    proto, physaddr, size, uefi_set_attrs);
 +  if (efi_status == GRUB_EFI_SUCCESS && uefi_clear_attrs)
-+    efi_status = efi_call_4(proto->clear_memory_attributes,
++    efi_status = proto->clear_memory_attributes(
 +			    proto, physaddr, size, uefi_clear_attrs);
 +
 +  err = grub_get_mem_attrs (addr, size, &after);
@@ -212,11 +212,11 @@ index e84961d078..2c33758ed7 100644
 +  return grub_efi_status_to_err (efi_status);
 +}
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index f431f49973..464842ba37 100644
+index 805a9d7adf9..76c88fbdcb0 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
-@@ -363,6 +363,11 @@
-       { 0x89, 0x29, 0x48, 0xbc, 0xd9, 0x0a, 0xd3, 0x1a } \
+@@ -389,6 +389,11 @@
+     {0xb6, 0xc7, 0x44, 0x0b, 0x29, 0xbb, 0x8c, 0x4f } \
    }
  
 +#define GRUB_EFI_MEMORY_ATTRIBUTE_PROTOCOL_GUID \
@@ -227,7 +227,7 @@ index f431f49973..464842ba37 100644
  struct grub_efi_sal_system_table
  {
    grub_uint32_t signature;
-@@ -2102,6 +2107,26 @@ struct grub_efi_ip6_config_manual_address {
+@@ -2182,6 +2187,26 @@ struct grub_efi_ip6_config_manual_address {
  };
  typedef struct grub_efi_ip6_config_manual_address grub_efi_ip6_config_manual_address_t;
  
@@ -251,14 +251,14 @@ index f431f49973..464842ba37 100644
 +};
 +typedef struct grub_efi_memory_attribute_protocol grub_efi_memory_attribute_protocol_t;
 +
- #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \
-   || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \
-   || defined(__riscv)
+ struct initrd_media_device_path {
+   grub_efi_vendor_media_device_path_t  vendor;
+   grub_efi_device_path_t               end;
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index ec52083c49..34825c4adc 100644
+index 736d6f25694..3670eddc52b 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -164,4 +164,6 @@ struct grub_net_card;
+@@ -189,4 +189,6 @@ struct grub_net_card;
  grub_efi_handle_t
  grub_efinet_get_device_handle (struct grub_net_card *card);
  
@@ -266,18 +266,18 @@ index ec52083c49..34825c4adc 100644
 +
  #endif /* ! GRUB_EFI_EFI_HEADER */
 diff --git a/include/grub/mm.h b/include/grub/mm.h
-index 9c38dd3ca5..d81623d226 100644
+index f3bf87fa0f9..8ee1fc7171c 100644
 --- a/include/grub/mm.h
 +++ b/include/grub/mm.h
-@@ -22,6 +22,7 @@
- 
+@@ -23,6 +23,7 @@
+ #include <grub/err.h>
  #include <grub/types.h>
  #include <grub/symbol.h>
 +#include <grub/err.h>
  #include <config.h>
  
  #ifndef NULL
-@@ -38,6 +39,37 @@ void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
+@@ -56,6 +57,37 @@ void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
  void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
  #endif
  
diff --git a/0264-nx-set-page-permissions-for-loaded-modules.patch b/0173-nx-set-page-permissions-for-loaded-modules.patch
similarity index 81%
rename from 0264-nx-set-page-permissions-for-loaded-modules.patch
rename to 0173-nx-set-page-permissions-for-loaded-modules.patch
index 9e0aebbc..416caedb 100644
--- a/0264-nx-set-page-permissions-for-loaded-modules.patch
+++ b/0173-nx-set-page-permissions-for-loaded-modules.patch
@@ -16,15 +16,15 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 [rharwood: arm tgptr -> tgaddr]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/kern/dl.c | 120 +++++++++++++++++++++++++++++++++++++++-------------
- include/grub/dl.h   |  44 +++++++++++++++++++
- 2 files changed, 134 insertions(+), 30 deletions(-)
+ grub-core/kern/dl.c | 102 +++++++++++++++++++++++++++++++++++++++++++++-------
+ include/grub/dl.h   |  44 +++++++++++++++++++++++
+ 2 files changed, 133 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 8c7aacef39..d5de80186f 100644
+index 775b367287e..25666ae383f 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
-@@ -285,6 +285,8 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+@@ -277,6 +277,8 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
  #endif
    char *ptr;
  
@@ -33,7 +33,7 @@ index 8c7aacef39..d5de80186f 100644
    arch_addralign = grub_arch_dl_min_alignment ();
  
    for (i = 0, s = (const Elf_Shdr *)((const char *) e + e->e_shoff);
-@@ -384,6 +386,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+@@ -378,6 +380,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
    ptr += got;
  #endif
  
@@ -41,31 +41,7 @@ index 8c7aacef39..d5de80186f 100644
    return GRUB_ERR_NONE;
  }
  
-@@ -517,23 +520,6 @@ grub_dl_find_section (Elf_Ehdr *e, const char *name)
-       return s;
-   return NULL;
- }
--static long
--grub_dl_find_section_index (Elf_Ehdr *e, const char *name)
--{
--  Elf_Shdr *s;
--  const char *str;
--  unsigned i;
--
--  s = (Elf_Shdr *) ((char *) e + e->e_shoff + e->e_shstrndx * e->e_shentsize);
--  str = (char *) e + s->sh_offset;
--
--  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
--       i < e->e_shnum;
--       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
--    if (grub_strcmp (str + s->sh_name, name) == 0)
--      return (long)i;
--  return -1;
--}
- 
- /* Me, Vladimir Serbinenko, hereby I add this module check as per new
-    GNU module policy. Note that this license check is informative only.
-@@ -662,6 +648,7 @@ grub_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
+@@ -645,6 +648,7 @@ grub_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
    Elf_Shdr *s;
    unsigned i;
  
@@ -73,7 +49,7 @@ index 8c7aacef39..d5de80186f 100644
    for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
         i < e->e_shnum;
         i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
-@@ -670,24 +657,95 @@ grub_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
+@@ -653,22 +657,92 @@ grub_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
  	grub_dl_segment_t seg;
  	grub_err_t err;
  
@@ -102,8 +78,8 @@ index 8c7aacef39..d5de80186f 100644
        }
  
 +  grub_dprintf ("modules", "done relocating symbols for \"%s\"\n", mod->name);
-   return GRUB_ERR_NONE;
- }
++  return GRUB_ERR_NONE;
++}
 +
 +static grub_err_t
 +grub_dl_set_mem_attrs (grub_dl_t mod, void *ehdr)
@@ -175,13 +151,10 @@ index 8c7aacef39..d5de80186f 100644
 +  grub_dprintf ("modules", "done updating module memory attributes for \"%s\"\n",
 +		mod->name);
 +
-+  return GRUB_ERR_NONE;
-+}
-+
- static void
- grub_dl_print_gdb_info (grub_dl_t mod, Elf_Ehdr *e)
- {
-@@ -753,6 +811,7 @@ grub_dl_load_core_noinit (void *addr, grub_size_t size)
+   return GRUB_ERR_NONE;
+ }
+ 
+@@ -705,6 +779,7 @@ grub_dl_load_core_noinit (void *addr, grub_size_t size)
    mod->ref_count = 1;
  
    grub_dprintf ("modules", "relocating to %p\n", mod);
@@ -189,7 +162,7 @@ index 8c7aacef39..d5de80186f 100644
    /* Me, Vladimir Serbinenko, hereby I add this module check as per new
       GNU module policy. Note that this license check is informative only.
       Modules have to be licensed under GPLv3 or GPLv3+ (optionally
-@@ -766,7 +825,8 @@ grub_dl_load_core_noinit (void *addr, grub_size_t size)
+@@ -718,7 +793,8 @@ grub_dl_load_core_noinit (void *addr, grub_size_t size)
        || grub_dl_resolve_dependencies (mod, e)
        || grub_dl_load_segments (mod, e)
        || grub_dl_resolve_symbols (mod, e)
@@ -200,7 +173,7 @@ index 8c7aacef39..d5de80186f 100644
        mod->fini = 0;
        grub_dl_unload (mod);
 diff --git a/include/grub/dl.h b/include/grub/dl.h
-index f36ed5cb17..45ac8e339f 100644
+index 9f86765c8e9..1e1262a283b 100644
 --- a/include/grub/dl.h
 +++ b/include/grub/dl.h
 @@ -27,6 +27,7 @@
@@ -211,7 +184,7 @@ index f36ed5cb17..45ac8e339f 100644
  #endif
  
  /*
-@@ -268,6 +269,49 @@ grub_dl_is_persistent (grub_dl_t mod)
+@@ -267,6 +268,49 @@ grub_dl_is_persistent (grub_dl_t mod)
    return mod->persistent;
  }
  
diff --git a/0266-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch b/0174-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch
similarity index 63%
rename from 0266-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch
rename to 0174-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch
index 7da75a81..c2a4c048 100644
--- a/0266-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch
+++ b/0174-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch
@@ -17,18 +17,32 @@ GRUB_PE32_NX_COMPAT, and changes grub-mkimage to set that flag.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- util/mkimage.c | 1 +
- 1 file changed, 1 insertion(+)
+ util/mkimage.c          | 1 +
+ include/grub/efi/pe32.h | 2 ++
+ 2 files changed, 3 insertions(+)
 
 diff --git a/util/mkimage.c b/util/mkimage.c
-index 8319e8dfbd..c3d33aaac8 100644
+index e2bb4d4cd05..425d920ff92 100644
 --- a/util/mkimage.c
 +++ b/util/mkimage.c
-@@ -1418,6 +1418,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
- 	    section = (struct grub_pe32_section_table *)(o64 + 1);
- 	  }
- 
+@@ -1438,6 +1438,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdangling-pointer"
+ #endif
 +	PE_OHDR (o32, o64, dll_characteristics) = grub_host_to_target16 (GRUB_PE32_NX_COMPAT);
  	PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size);
  	PE_OHDR (o32, o64, entry_addr) = grub_host_to_target32 (layout.start_address);
  	PE_OHDR (o32, o64, image_base) = 0;
+diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
+index 4e6e9d254bd..9887e14b278 100644
+--- a/include/grub/efi/pe32.h
++++ b/include/grub/efi/pe32.h
+@@ -231,6 +231,8 @@ struct grub_pe64_optional_header
+ 
+ #define GRUB_PE32_SUBSYSTEM_EFI_APPLICATION	10
+ 
++#define GRUB_PE32_NX_COMPAT	0x0100
++
+ #define GRUB_PE32_NUM_DATA_DIRECTORIES	16
+ 
+ struct grub_pe32_section_table
diff --git a/0268-grub_fs_probe-dprint-errors-from-filesystems.patch b/0175-grub_fs_probe-dprint-errors-from-filesystems.patch
similarity index 89%
rename from 0268-grub_fs_probe-dprint-errors-from-filesystems.patch
rename to 0175-grub_fs_probe-dprint-errors-from-filesystems.patch
index 1455ae4b..fdd2932f 100644
--- a/0268-grub_fs_probe-dprint-errors-from-filesystems.patch
+++ b/0175-grub_fs_probe-dprint-errors-from-filesystems.patch
@@ -30,7 +30,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c
-index c698295bcb..b58e2ae1d2 100644
+index 7ad0aaf4e29..f25bace620b 100644
 --- a/grub-core/kern/fs.c
 +++ b/grub-core/kern/fs.c
 @@ -74,6 +74,7 @@ grub_fs_probe (grub_device_t device)
@@ -39,5 +39,5 @@ index c698295bcb..b58e2ae1d2 100644
  
 +	  grub_dprintf ("fs", _("error: %s.\n"), grub_errmsg);
  	  grub_error_push ();
- 	  grub_dprintf ("fs", "%s detection failed.\n", p->name);
- 	  grub_error_pop ();
+ 	  /* The grub_error_push() does not touch grub_errmsg. */
+ 	  grub_dprintf ("fs", _("error: %s.\n"), grub_errmsg);
diff --git a/0270-Make-debug-file-show-which-file-filters-get-run.patch b/0176-Make-debug-file-show-which-file-filters-get-run.patch
similarity index 91%
rename from 0270-Make-debug-file-show-which-file-filters-get-run.patch
rename to 0176-Make-debug-file-show-which-file-filters-get-run.patch
index 12062a31..3bd69d83 100644
--- a/0270-Make-debug-file-show-which-file-filters-get-run.patch
+++ b/0176-Make-debug-file-show-which-file-filters-get-run.patch
@@ -15,14 +15,14 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 11 insertions(+)
 
 diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
-index ed69fc0f0f..3f175630ea 100644
+index 264211b1143..1794d022fb0 100644
 --- a/grub-core/kern/file.c
 +++ b/grub-core/kern/file.c
 @@ -30,6 +30,14 @@ void (*EXPORT_VAR (grub_grubnet_fini)) (void);
  
  grub_file_filter_t grub_file_filters[GRUB_FILE_FILTER_MAX];
  
-+static char *filter_names[] = {
++static const char *filter_names[] = {
 +    [GRUB_FILE_FILTER_VERIFY] = "GRUB_FILE_FILTER_VERIFY",
 +    [GRUB_FILE_FILTER_GZIO] = "GRUB_FILE_FILTER_GZIO",
 +    [GRUB_FILE_FILTER_XZIO] = "GRUB_FILE_FILTER_XZIO",
@@ -33,7 +33,7 @@ index ed69fc0f0f..3f175630ea 100644
  /* Get the device part of the filename NAME. It is enclosed by parentheses.  */
  char *
  grub_file_get_device_name (const char *name)
-@@ -121,6 +129,9 @@ grub_file_open (const char *name, enum grub_file_type type)
+@@ -124,6 +132,9 @@ grub_file_open (const char *name, enum grub_file_type type)
      if (grub_file_filters[filter])
        {
  	last_file = file;
diff --git a/0276-BLS-create-etc-kernel-cmdline-during-mkconfig.patch b/0177-BLS-create-etc-kernel-cmdline-during-mkconfig.patch
similarity index 92%
rename from 0276-BLS-create-etc-kernel-cmdline-during-mkconfig.patch
rename to 0177-BLS-create-etc-kernel-cmdline-during-mkconfig.patch
index 7080b6f6..05e83252 100644
--- a/0276-BLS-create-etc-kernel-cmdline-during-mkconfig.patch
+++ b/0177-BLS-create-etc-kernel-cmdline-during-mkconfig.patch
@@ -9,10 +9,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 6af84b44e1..950a92f5e8 100644
+index 360ce26e5f9..a6568caf7d1 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -161,6 +161,12 @@ update_bls_cmdline()
+@@ -163,6 +163,12 @@ update_bls_cmdline()
      local cmdline="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
      local -a files=($(get_sorted_bls))
  
diff --git a/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
deleted file mode 100644
index a40caea7..00000000
--- a/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Wed, 14 Apr 2021 20:10:23 +1000
-Subject: [PATCH] ieee1275: drop HEAP_MAX_ADDR, HEAP_MIN_SIZE
-
-HEAP_MAX_ADDR is confusing. Currently it is set to 32MB, except
-on ieee1275 on x86, where it is 64MB.
-
-There is a comment which purports to explain it:
-
-/* If possible, we will avoid claiming heap above this address, because it
-   seems to cause relocation problems with OSes that link at 4 MiB */
-
-This doesn't make a lot of sense when the constants are well above 4MB
-already. It was not always this way. Prior to
-commit 7b5d0fe4440c ("Increase heap limit") in 2010, HEAP_MAX_SIZE and
-HEAP_MAX_ADDR were indeed 4MB. However, when the constants were increased
-the comment was left unchanged.
-
-It's been over a decade. It doesn't seem like we have problems with
-claims over 4MB on powerpc or x86 ieee1275. (sparc does things completely
-differently and never used the constant.)
-
-Drop the constant and the check.
-
-The only use of HEAP_MIN_SIZE was to potentially override the
-HEAP_MAX_ADDR check. It is now unused. Remove it.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
----
- grub-core/kern/ieee1275/init.c | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index fc7d971272..0dcd114ce5 100644
---- a/grub-core/kern/ieee1275/init.c
-+++ b/grub-core/kern/ieee1275/init.c
-@@ -46,9 +46,6 @@
- #endif
- #include <grub/lockdown.h>
- 
--/* The minimal heap size we can live with. */
--#define HEAP_MIN_SIZE		(unsigned long) (2 * 1024 * 1024)
--
- /* The maximum heap size we're going to claim */
- #ifdef __i386__
- #define HEAP_MAX_SIZE		(unsigned long) (64 * 1024 * 1024)
-@@ -56,14 +53,6 @@
- #define HEAP_MAX_SIZE		(unsigned long) (32 * 1024 * 1024)
- #endif
- 
--/* If possible, we will avoid claiming heap above this address, because it
--   seems to cause relocation problems with OSes that link at 4 MiB */
--#ifdef __i386__
--#define HEAP_MAX_ADDR		(unsigned long) (64 * 1024 * 1024)
--#else
--#define HEAP_MAX_ADDR		(unsigned long) (32 * 1024 * 1024)
--#endif
--
- extern char _end[];
- 
- #ifdef __sparc__
-@@ -185,12 +174,6 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
-   if (*total + len > HEAP_MAX_SIZE)
-     len = HEAP_MAX_SIZE - *total;
- 
--  /* Avoid claiming anything above HEAP_MAX_ADDR, if possible. */
--  if ((addr < HEAP_MAX_ADDR) &&				/* if it's too late, don't bother */
--      (addr + len > HEAP_MAX_ADDR) &&				/* if it wasn't available anyway, don't bother */
--      (*total + (HEAP_MAX_ADDR - addr) > HEAP_MIN_SIZE))	/* only limit ourselves when we can afford to */
--     len = HEAP_MAX_ADDR - addr;
--
-   /* In theory, firmware should already prevent this from happening by not
-      listing our own image in /memory/available.  The check below is intended
-      as a safeguard in case that doesn't happen.  However, it doesn't protect
diff --git a/0178-ieee1275-claim-more-memory.patch b/0178-ieee1275-claim-more-memory.patch
deleted file mode 100644
index 6ec319be..00000000
--- a/0178-ieee1275-claim-more-memory.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Wed, 15 Apr 2020 23:28:29 +1000
-Subject: [PATCH] ieee1275: claim more memory
-
-On powerpc-ieee1275, we are running out of memory trying to verify
-anything. This is because:
-
- - we have to load an entire file into memory to verify it. This is
-   extremely difficult to change with appended signatures.
- - We only have 32MB of heap.
- - Distro kernels are now often around 30MB.
-
-So we want to claim more memory from OpenFirmware for our heap.
-
-There are some complications:
-
- - The grub mm code isn't the only thing that will make claims on
-   memory from OpenFirmware:
-
-    * PFW/SLOF will have claimed some for their own use.
-
-    * The ieee1275 loader will try to find other bits of memory that we
-      haven't claimed to place the kernel and initrd when we go to boot.
-
-    * Once we load Linux, it will also try to claim memory. It claims
-      memory without any reference to /memory/available, it just starts
-      at min(top of RMO, 768MB) and works down. So we need to avoid this
-      area. See arch/powerpc/kernel/prom_init.c as of v5.11.
-
- - The smallest amount of memory a ppc64 KVM guest can have is 256MB.
-   It doesn't work with distro kernels but can work with custom kernels.
-   We should maintain support for that. (ppc32 can boot with even less,
-   and we shouldn't break that either.)
-
- - Even if a VM has more memory, the memory OpenFirmware makes available
-   as Real Memory Area can be restricted. A freshly created LPAR on a
-   PowerVM machine is likely to have only 256MB available to OpenFirmware
-   even if it has many gigabytes of memory allocated.
-
-EFI systems will attempt to allocate 1/4th of the available memory,
-clamped to between 1M and 1600M. That seems like a good sort of
-approach, we just need to figure out if 1/4 is the right fraction
-for us.
-
-We don't know in advance how big the kernel and initrd are going to be,
-which makes figuring out how much memory we can take a bit tricky.
-
-To figure out how much memory we should leave unused, I looked at:
-
- - an Ubuntu 20.04.1 ppc64le pseries KVM guest:
-    vmlinux: ~30MB
-    initrd:  ~50MB
-
- - a RHEL8.2 ppc64le pseries KVM guest:
-    vmlinux: ~30MB
-    initrd:  ~30MB
-
-Ubuntu VMs struggle to boot with just 256MB under SLOF.
-RHEL likewise has a higher minimum supported memory figure.
-So lets first consider a distro kernel and 512MB of addressible memory.
-(This is the default case for anything booting under PFW.) Say we lose
-131MB to PFW (based on some tests). This leaves us 381MB. 1/4 of 381MB
-is ~95MB. That should be enough to verify a 30MB vmlinux and should
-leave plenty of space to load Linux and the initrd.
-
-If we consider 256MB of RMA under PFW, we have just 125MB remaining. 1/4
-of that is a smidge under 32MB, which gives us very poor odds of verifying
-a distro-sized kernel. However, if we need 80MB just to put the kernel
-and initrd in memory, we can't claim any more than 45MB anyway. So 1/4
-will do. We'll come back to this later.
-
-grub is always built as a 32-bit binary, even if it's loading a ppc64
-kernel. So we can't address memory beyond 4GB. This gives a natural cap
-of 1GB for powerpc-ieee1275.
-
-Also apply this 1/4 approach to i386-ieee1275, but keep the 32MB cap.
-
-make check still works for both i386 and powerpc and I've booted
-powerpc grub with this change under SLOF and PFW.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
----
- grub-core/kern/ieee1275/init.c | 81 +++++++++++++++++++++++++++++++++---------
- docs/grub-dev.texi             |  6 ++--
- 2 files changed, 69 insertions(+), 18 deletions(-)
-
-diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 0dcd114ce5..c61d91a028 100644
---- a/grub-core/kern/ieee1275/init.c
-+++ b/grub-core/kern/ieee1275/init.c
-@@ -46,11 +46,12 @@
- #endif
- #include <grub/lockdown.h>
- 
--/* The maximum heap size we're going to claim */
-+/* The maximum heap size we're going to claim. Not used by sparc.
-+   We allocate 1/4 of the available memory under 4G, up to this limit. */
- #ifdef __i386__
- #define HEAP_MAX_SIZE		(unsigned long) (64 * 1024 * 1024)
--#else
--#define HEAP_MAX_SIZE		(unsigned long) (32 * 1024 * 1024)
-+#else // __powerpc__
-+#define HEAP_MAX_SIZE		(unsigned long) (1 * 1024 * 1024 * 1024)
- #endif
- 
- extern char _end[];
-@@ -147,16 +148,45 @@ grub_claim_heap (void)
- 				 + GRUB_KERNEL_MACHINE_STACK_SIZE), 0x200000);
- }
- #else
--/* Helper for grub_claim_heap.  */
-+/* Helper for grub_claim_heap on powerpc. */
-+static int
-+heap_size (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
-+	   void *data)
-+{
-+  grub_uint32_t total = *(grub_uint32_t *)data;
-+
-+  if (type != GRUB_MEMORY_AVAILABLE)
-+    return 0;
-+
-+  /* Do not consider memory beyond 4GB */
-+  if (addr > 0xffffffffUL)
-+    return 0;
-+
-+  if (addr + len > 0xffffffffUL)
-+    len = 0xffffffffUL - addr;
-+
-+  total += len;
-+  *(grub_uint32_t *)data = total;
-+
-+  return 0;
-+}
-+
- static int
- heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
- 	   void *data)
- {
--  unsigned long *total = data;
-+  grub_uint32_t total = *(grub_uint32_t *)data;
- 
-   if (type != GRUB_MEMORY_AVAILABLE)
-     return 0;
- 
-+  /* Do not consider memory beyond 4GB */
-+  if (addr > 0xffffffffUL)
-+    return 0;
-+
-+  if (addr + len > 0xffffffffUL)
-+    len = 0xffffffffUL - addr;
-+
-   if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM))
-     {
-       if (addr + len <= 0x180000)
-@@ -170,10 +200,6 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
-     }
-   len -= 1; /* Required for some firmware.  */
- 
--  /* Never exceed HEAP_MAX_SIZE  */
--  if (*total + len > HEAP_MAX_SIZE)
--    len = HEAP_MAX_SIZE - *total;
--
-   /* In theory, firmware should already prevent this from happening by not
-      listing our own image in /memory/available.  The check below is intended
-      as a safeguard in case that doesn't happen.  However, it doesn't protect
-@@ -185,6 +211,18 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
-       len = 0;
-     }
- 
-+  /* If this block contains 0x30000000 (768MB), do not claim below that.
-+     Linux likes to claim memory at min(RMO top, 768MB) and works down
-+     without reference to /memory/available. */
-+  if ((addr < 0x30000000) && ((addr + len) > 0x30000000))
-+    {
-+      len = len - (0x30000000 - addr);
-+      addr = 0x30000000;
-+    }
-+
-+  if (len > total)
-+    len = total;
-+
-   if (len)
-     {
-       grub_err_t err;
-@@ -193,10 +231,12 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
-       if (err)
- 	return err;
-       grub_mm_init_region ((void *) (grub_addr_t) addr, len);
-+      total -= len;
-     }
- 
--  *total += len;
--  if (*total >= HEAP_MAX_SIZE)
-+  *(grub_uint32_t *)data = total;
-+
-+  if (total == 0)
-     return 1;
- 
-   return 0;
-@@ -205,13 +245,22 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
- static void 
- grub_claim_heap (void)
- {
--  unsigned long total = 0;
-+  grub_uint32_t total = 0;
- 
-   if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_FORCE_CLAIM))
--    heap_init (GRUB_IEEE1275_STATIC_HEAP_START, GRUB_IEEE1275_STATIC_HEAP_LEN,
--	       1, &total);
--  else
--    grub_machine_mmap_iterate (heap_init, &total);
-+    {
-+      heap_init (GRUB_IEEE1275_STATIC_HEAP_START, GRUB_IEEE1275_STATIC_HEAP_LEN,
-+		 1, &total);
-+      return;
-+    }
-+
-+  grub_machine_mmap_iterate (heap_size, &total);
-+
-+  total = total / 4;
-+  if (total > HEAP_MAX_SIZE)
-+    total = HEAP_MAX_SIZE;
-+
-+  grub_machine_mmap_iterate (heap_init, &total);
- }
- #endif
- 
-diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index 19f708ee66..90083772c8 100644
---- a/docs/grub-dev.texi
-+++ b/docs/grub-dev.texi
-@@ -1047,7 +1047,9 @@ space is limited to 4GiB. GRUB allocates pages from EFI for its heap, at most
- 1.6 GiB.
- 
- On i386-ieee1275 and powerpc-ieee1275 GRUB uses same stack as IEEE1275.
--It allocates at most 32MiB for its heap.
-+
-+On i386-ieee1275, GRUB allocates at most 32MiB for its heap. On
-+powerpc-ieee1275, GRUB allocates up to 1GiB.
- 
- On sparc64-ieee1275 stack is 256KiB and heap is 2MiB.
- 
-@@ -1075,7 +1077,7 @@ In short:
- @item i386-qemu               @tab 60 KiB  @tab < 4 GiB
- @item *-efi                   @tab ?       @tab < 1.6 GiB
- @item i386-ieee1275           @tab ?       @tab < 32 MiB
--@item powerpc-ieee1275        @tab ?       @tab < 32 MiB
-+@item powerpc-ieee1275        @tab ?       @tab < 1 GiB
- @item sparc64-ieee1275        @tab 256KiB  @tab 2 MiB
- @item arm-uboot               @tab 256KiB  @tab 2 MiB
- @item mips(el)-qemu_mips      @tab 2MiB    @tab 253 MiB
diff --git a/0278-squish-don-t-dup-rhgb-quiet-check-mtimes.patch b/0178-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
similarity index 94%
rename from 0278-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
rename to 0178-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
index 013b915e..fa279f1f 100644
--- a/0278-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
+++ b/0178-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
@@ -9,10 +9,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 950a92f5e8..03f091a4dc 100644
+index a6568caf7d1..079bb9a0961 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -161,10 +161,16 @@ update_bls_cmdline()
+@@ -163,10 +163,16 @@ update_bls_cmdline()
      local cmdline="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
      local -a files=($(get_sorted_bls))
  
diff --git a/0179-ieee1275-request-memory-with-ibm-client-architecture.patch b/0179-ieee1275-request-memory-with-ibm-client-architecture.patch
deleted file mode 100644
index 4f3ab90c..00000000
--- a/0179-ieee1275-request-memory-with-ibm-client-architecture.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Fri, 16 Apr 2021 11:48:46 +1000
-Subject: [PATCH] ieee1275: request memory with ibm,client-architecture-support
-
-On PowerVM, the first time we boot a Linux partition, we may only get
-256MB of real memory area, even if the partition has more memory.
-
-This isn't really enough. Fortunately, the Power Architecture Platform
-Reference (PAPR) defines a method we can call to ask for more memory.
-This is part of the broad and powerful ibm,client-architecture-support
-(CAS) method.
-
-CAS can do an enormous amount of things on a PAPR platform: as well as
-asking for memory, you can set the supported processor level, the interrupt
-controller, hash vs radix mmu, and so on. We want to touch as little of
-this as possible because we don't want to step on the toes of the future OS.
-
-If:
-
- - we are running under what we think is PowerVM (compatible property of /
-   begins with "IBM"), and
-
- - the full amount of RMA is less than 512MB (as determined by the reg
-   property of /memory)
-
-then call CAS as follows: (refer to the Linux on Power Architecture
-Reference, LoPAR, which is public, at B.5.2.3):
-
- - Use the "any" PVR value and supply 2 option vectors.
-
- - Set option vector 1 (PowerPC Server Processor Architecture Level)
-   to "ignore".
-
- - Set option vector 2 with default or Linux-like options, including a
-   min-rma-size of 512MB.
-
-This will cause a CAS reboot and the partition will restart with 512MB
-of RMA. Grub will notice the 512MB and not call CAS again.
-
-(A partition can be configured with only 256MB of memory, which would
-mean this request couldn't be satisfied, but PFW refuses to load with
-only 256MB of memory, so it's a bit moot. SLOF will run fine with 256MB,
-but we will never call CAS under qemu/SLOF because /compatible won't
-begin with "IBM".)
-
-One of the first things Linux does while still running under OpenFirmware
-is to call CAS with a much fuller set of options (including asking for
-512MB of memory). This includes a much more restrictive set of PVR values
-and processor support levels, and this will induce another reboot. On this
-reboot grub will again notice the higher RMA, and not call CAS. We will get
-to Linux, Linux will call CAS but because the values are now set for Linux
-this will not induce another CAS reboot and we will finally boot.
-
-On all subsequent boots, everything will be configured with 512MB of RMA
-and all the settings Linux likes, so there will be no further CAS reboots.
-
-(phyp is super sticky with the RMA size - it persists even on cold boots.
-So if you've ever booted Linux in a partition, you'll probably never have
-grub call CAS. It'll only ever fire the first time a partition loads grub,
-or if you deliberately lower the amount of memory your partition has below
-512MB.)
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
----
- grub-core/kern/ieee1275/cmain.c  |   3 +
- grub-core/kern/ieee1275/init.c   | 144 ++++++++++++++++++++++++++++++++++++++-
- include/grub/ieee1275/ieee1275.h |   8 ++-
- 3 files changed, 152 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
-index 04df9d2c66..6435628ec5 100644
---- a/grub-core/kern/ieee1275/cmain.c
-+++ b/grub-core/kern/ieee1275/cmain.c
-@@ -127,6 +127,9 @@ grub_ieee1275_find_options (void)
- 	      break;
- 	    }
- 	}
-+
-+      if (grub_strncmp (tmp, "IBM,", 4) == 0)
-+	grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY);
-     }
- 
-   if (is_smartfirmware)
-diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index c61d91a028..9704715c83 100644
---- a/grub-core/kern/ieee1275/init.c
-+++ b/grub-core/kern/ieee1275/init.c
-@@ -242,6 +242,135 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
-   return 0;
- }
- 
-+/* How much memory does OF believe it has? (regardless of whether
-+   it's accessible or not) */
-+static grub_err_t
-+grub_ieee1275_total_mem (grub_uint64_t *total)
-+{
-+  grub_ieee1275_phandle_t root;
-+  grub_ieee1275_phandle_t memory;
-+  grub_uint32_t reg[4];
-+  grub_ssize_t reg_size;
-+  grub_uint32_t address_cells = 1;
-+  grub_uint32_t size_cells = 1;
-+  grub_uint64_t size;
-+
-+  /* If we fail to get to the end, report 0. */
-+  *total = 0;
-+
-+  /* Determine the format of each entry in `reg'.  */
-+  grub_ieee1275_finddevice ("/", &root);
-+  grub_ieee1275_get_integer_property (root, "#address-cells", &address_cells,
-+				      sizeof address_cells, 0);
-+  grub_ieee1275_get_integer_property (root, "#size-cells", &size_cells,
-+				      sizeof size_cells, 0);
-+
-+  if (size_cells > address_cells)
-+    address_cells = size_cells;
-+
-+  /* Load `/memory/reg'.  */
-+  if (grub_ieee1275_finddevice ("/memory", &memory))
-+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-+		       "couldn't find /memory node");
-+  if (grub_ieee1275_get_integer_property (memory, "reg", reg,
-+					  sizeof reg, &reg_size))
-+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-+		       "couldn't examine /memory/reg property");
-+  if (reg_size < 0 || (grub_size_t) reg_size > sizeof (reg))
-+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-+                       "/memory response buffer exceeded");
-+
-+  if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_BROKEN_ADDRESS_CELLS))
-+    {
-+      address_cells = 1;
-+      size_cells = 1;
-+    }
-+
-+  /* Decode only the size */
-+  size = reg[address_cells];
-+  if (size_cells == 2)
-+    size = (size << 32) | reg[address_cells + 1];
-+
-+  *total = size;
-+
-+  return grub_errno;
-+}
-+
-+/* Based on linux - arch/powerpc/kernel/prom_init.c */
-+struct option_vector2 {
-+	grub_uint8_t byte1;
-+	grub_uint16_t reserved;
-+	grub_uint32_t real_base;
-+	grub_uint32_t real_size;
-+	grub_uint32_t virt_base;
-+	grub_uint32_t virt_size;
-+	grub_uint32_t load_base;
-+	grub_uint32_t min_rma;
-+	grub_uint32_t min_load;
-+	grub_uint8_t min_rma_percent;
-+	grub_uint8_t max_pft_size;
-+} __attribute__((packed));
-+
-+struct pvr_entry {
-+	  grub_uint32_t mask;
-+	  grub_uint32_t entry;
-+};
-+
-+struct cas_vector {
-+    struct {
-+      struct pvr_entry terminal;
-+    } pvr_list;
-+    grub_uint8_t num_vecs;
-+    grub_uint8_t vec1_size;
-+    grub_uint8_t vec1;
-+    grub_uint8_t vec2_size;
-+    struct option_vector2 vec2;
-+} __attribute__((packed));
-+
-+/* Call ibm,client-architecture-support to try to get more RMA.
-+   We ask for 512MB which should be enough to verify a distro kernel.
-+   We ignore most errors: if we don't succeed we'll proceed with whatever
-+   memory we have. */
-+static void
-+grub_ieee1275_ibm_cas (void)
-+{
-+  int rc;
-+  grub_ieee1275_ihandle_t root;
-+  struct cas_args {
-+    struct grub_ieee1275_common_hdr common;
-+    grub_ieee1275_cell_t method;
-+    grub_ieee1275_ihandle_t ihandle;
-+    grub_ieee1275_cell_t cas_addr;
-+    grub_ieee1275_cell_t result;
-+  } args;
-+  struct cas_vector vector = {
-+    .pvr_list = { { 0x00000000, 0xffffffff } }, /* any processor */
-+    .num_vecs = 2 - 1,
-+    .vec1_size = 0,
-+    .vec1 = 0x80, /* ignore */
-+    .vec2_size = 1 + sizeof(struct option_vector2) - 2,
-+    .vec2 = {
-+      0, 0, -1, -1, -1, -1, -1, 512, -1, 0, 48
-+    },
-+  };
-+
-+  INIT_IEEE1275_COMMON (&args.common, "call-method", 3, 2);
-+  args.method = (grub_ieee1275_cell_t)"ibm,client-architecture-support";
-+  rc = grub_ieee1275_open("/", &root);
-+  if (rc) {
-+	  grub_error (GRUB_ERR_IO, "could not open root when trying to call CAS");
-+	  return;
-+  }
-+  args.ihandle = root;
-+  args.cas_addr = (grub_ieee1275_cell_t)&vector;
-+
-+  grub_printf("Calling ibm,client-architecture-support...");
-+  IEEE1275_CALL_ENTRY_FN (&args);
-+  grub_printf("done\n");
-+
-+  grub_ieee1275_close(root);
-+}
-+
- static void 
- grub_claim_heap (void)
- {
-@@ -249,11 +378,22 @@ grub_claim_heap (void)
- 
-   if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_FORCE_CLAIM))
-     {
--      heap_init (GRUB_IEEE1275_STATIC_HEAP_START, GRUB_IEEE1275_STATIC_HEAP_LEN,
--		 1, &total);
-+      heap_init (GRUB_IEEE1275_STATIC_HEAP_START,
-+		 GRUB_IEEE1275_STATIC_HEAP_LEN, 1, &total);
-       return;
-     }
- 
-+  if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY))
-+    {
-+      grub_uint64_t rma_size;
-+      grub_err_t err;
-+
-+      err = grub_ieee1275_total_mem (&rma_size);
-+      /* if we have an error, don't call CAS, just hope for the best */
-+      if (!err && rma_size < (512 * 1024 * 1024))
-+	grub_ieee1275_ibm_cas();
-+    }
-+
-   grub_machine_mmap_iterate (heap_size, &total);
- 
-   total = total / 4;
-diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index b5a1d49bbc..e0a6c2ce1e 100644
---- a/include/grub/ieee1275/ieee1275.h
-+++ b/include/grub/ieee1275/ieee1275.h
-@@ -149,7 +149,13 @@ enum grub_ieee1275_flag
- 
-   GRUB_IEEE1275_FLAG_RAW_DEVNAMES,
-   
--  GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT
-+  GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT,
-+
-+  /* On PFW, the first time we boot a Linux partition, we may only get 256MB
-+     of real memory area, even if the partition has more memory. Set this flag
-+     if we think we're running under PFW. Then, if this flag is set, and the
-+     RMA is only 256MB in size, try asking for more with CAS. */
-+  GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY,
- };
- 
- extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
diff --git a/0279-squish-give-up-on-rhgb-quiet.patch b/0179-squish-give-up-on-rhgb-quiet.patch
similarity index 91%
rename from 0279-squish-give-up-on-rhgb-quiet.patch
rename to 0179-squish-give-up-on-rhgb-quiet.patch
index bbead5e9..c1cbf6da 100644
--- a/0279-squish-give-up-on-rhgb-quiet.patch
+++ b/0179-squish-give-up-on-rhgb-quiet.patch
@@ -9,10 +9,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 4 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 03f091a4dc..5ad624bfec 100644
+index 079bb9a0961..2dddc39816f 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -166,10 +166,6 @@ update_bls_cmdline()
+@@ -168,10 +168,6 @@ update_bls_cmdline()
  	# anaconda has the correct information to create this during install;
  	# afterward, grubby will take care of syncing on updates.  If the user
  	# has modified /etc/default/grub, try to cope.
diff --git a/0280-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch b/0180-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
similarity index 96%
rename from 0280-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
rename to 0180-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
index ed378b89..2c5c7c54 100644
--- a/0280-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
+++ b/0180-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
@@ -32,10 +32,10 @@ Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/322
  1 file changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 5ad624bfec..e5e87a6d80 100644
+index 2dddc39816f..11c19304f8b 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -161,12 +161,13 @@ update_bls_cmdline()
+@@ -163,12 +163,13 @@ update_bls_cmdline()
      local cmdline="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
      local -a files=($(get_sorted_bls))
  
diff --git a/0181-blscfg-Don-t-root-device-in-emu-builds.patch b/0181-blscfg-Don-t-root-device-in-emu-builds.patch
new file mode 100644
index 00000000..d61b1b23
--- /dev/null
+++ b/0181-blscfg-Don-t-root-device-in-emu-builds.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 25 Aug 2022 17:57:55 -0400
+Subject: [PATCH] blscfg: Don't root device in emu builds
+
+Otherwise, we end up looking for kernel/initrd in /boot/boot which
+doesn't work at all.  Non-emu builds need to be looking in
+($root)/boot/, which is what this is for.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ grub-core/commands/blscfg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
+index e907a6a5d28..dbd0899acf3 100644
+--- a/grub-core/commands/blscfg.c
++++ b/grub-core/commands/blscfg.c
+@@ -41,7 +41,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+ #define GRUB_BLS_CONFIG_PATH "/loader/entries/"
+ #ifdef GRUB_MACHINE_EMU
+-#define GRUB_BOOT_DEVICE "/boot"
++#define GRUB_BOOT_DEVICE ""
+ #else
+ #define GRUB_BOOT_DEVICE "($root)"
+ #endif
diff --git a/0182-ppc64le-signed-boot-media-changes.patch b/0182-ppc64le-signed-boot-media-changes.patch
new file mode 100644
index 00000000..f92570e3
--- /dev/null
+++ b/0182-ppc64le-signed-boot-media-changes.patch
@@ -0,0 +1,123 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Wed, 25 Jan 2023 16:10:58 -0500
+Subject: [PATCH] ppc64le: signed boot media changes
+
+Skip mdraid < 1.1 on isos since mdraid* can't even
+
+Prior to this change, on ppc64le with part_msdos and the mdraid* modules
+enabled, we see:
+
+    disk/diskfilter.c:191: scanning ieee1275/cdrom
+    kern/disk.c:196: Opening `ieee1275/cdrom'...
+    disk/ieee1275/ofdisk.c:477: Opening `cdrom'.
+    disk/ieee1275/ofdisk.c:502: MAX_RETRIES set to 20
+    kern/disk.c:288: Opening `ieee1275/cdrom' succeeded.
+    disk/diskfilter.c:136: Scanning for DISKFILTER devices on disk ieee1275/cdrom
+    partmap/msdos.c:184: partition 0: flag 0x80, type 0x96, start 0x0, len
+    0x6a5d70
+    disk/diskfilter.c:136: Scanning for DISKFILTER devices on disk ieee1275/cdrom
+    SCSI-DISK: Access beyond end of device !
+    SCSI-DISK: Access beyond end of device !
+    SCSI-DISK: Access beyond end of device !
+    SCSI-DISK: Access beyond end of device !
+    SCSI-DISK: Access beyond end of device !
+    disk/ieee1275/ofdisk.c:578: MAX_RETRIES set to 20
+
+These latter two lines repeat many times, eventually ending in:
+
+    kern/disk.c:388: ieee1275/cdrom read failed
+    error: ../../grub-core/disk/ieee1275/ofdisk.c:608:failure reading sector
+    0x1a9720 from `ieee1275/cdrom'.
+
+and the system drops to a "grub>" prompt.
+
+Prior to 1.1, mdraid stored the superblock offset from the end of the
+disk, and the firmware really doesn't like reads there.  Best guess was
+that the firmware and the iso image appear to diagree on the blocksize
+(512 vs. 2048), and the diskfilter RAID probing is too much for it.
+It's tempting to just skip probing for cdroms, but unfortunately isos
+can be virtualized elsewhere - such as regular disks.
+
+Also fix detection of root, and try the chrp path as a fallback if the
+built prefix doesn't work.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+
+wip
+---
+ grub-core/disk/mdraid1x_linux.c  | 6 ++++++
+ grub-core/disk/mdraid_linux.c    | 5 +++++
+ grub-core/kern/ieee1275/openfw.c | 2 +-
+ grub-core/normal/main.c          | 5 +++++
+ 4 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/disk/mdraid1x_linux.c b/grub-core/disk/mdraid1x_linux.c
+index 72e5cb6f481..3b5b6c42342 100644
+--- a/grub-core/disk/mdraid1x_linux.c
++++ b/grub-core/disk/mdraid1x_linux.c
+@@ -130,6 +130,12 @@ grub_mdraid_detect (grub_disk_t disk,
+       struct grub_diskfilter_vg *array;
+       char *uuid;
+ 
++#ifdef __powerpc__
++      /* Firmware will yell at us for reading too far. */
++      if (minor_version == 0)
++        continue;
++#endif
++
+       if (size == GRUB_DISK_SIZE_UNKNOWN && minor_version == 0)
+ 	continue;
+ 
+diff --git a/grub-core/disk/mdraid_linux.c b/grub-core/disk/mdraid_linux.c
+index e40216f5111..98fcfb1be69 100644
+--- a/grub-core/disk/mdraid_linux.c
++++ b/grub-core/disk/mdraid_linux.c
+@@ -189,6 +189,11 @@ grub_mdraid_detect (grub_disk_t disk,
+   grub_uint32_t level;
+   struct grub_diskfilter_vg *ret;
+ 
++#ifdef __powerpc__
++  /* Firmware will yell at us for reading too far. */
++  return NULL;
++#endif
++
+   /* The sector where the mdraid 0.90 superblock is stored, if available.  */
+   size = grub_disk_native_sectors (disk);
+   if (size == GRUB_DISK_SIZE_UNKNOWN)
+diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
+index e2ecc65d2d8..65616254e02 100644
+--- a/grub-core/kern/ieee1275/openfw.c
++++ b/grub-core/kern/ieee1275/openfw.c
+@@ -499,7 +499,7 @@ grub_ieee1275_encode_devname (const char *path)
+ 	*optr++ ='\\';
+       *optr++ = *iptr++;
+     }
+-  if (partition && partition[0])
++  if (partition && partition[0] >= '0' && partition[0] <= '9')
+     {
+       unsigned int partno = grub_strtoul (partition, 0, 0);
+ 
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index fc3ed551cec..e903f291732 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -372,6 +372,7 @@ grub_try_normal_prefix (const char *prefix)
+            file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
+            if (file)
+              {
++               grub_env_set ("prefix", prefix);
+                grub_file_close (file);
+                err = GRUB_ERR_NONE;
+              }
+@@ -447,6 +448,10 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+       err = grub_try_normal ("fw_path");
+       if (err == GRUB_ERR_FILE_NOT_FOUND)
+         err = grub_try_normal ("prefix");
++#ifdef __powerpc__
++      if (err == GRUB_ERR_FILE_NOT_FOUND)
++        err = grub_try_normal_prefix ("/boot/grub");
++#endif
+       if (err == GRUB_ERR_FILE_NOT_FOUND)
+         err = grub_try_normal_discover ();
+       if (err == GRUB_ERR_FILE_NOT_FOUND)
diff --git a/0183-core-Fix-several-implicit-function-declarations.patch b/0183-core-Fix-several-implicit-function-declarations.patch
new file mode 100644
index 00000000..a8140332
--- /dev/null
+++ b/0183-core-Fix-several-implicit-function-declarations.patch
@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Arjun Shankar <arjun@redhat.com>
+Date: Sun, 5 Feb 2023 11:13:55 +0100
+Subject: [PATCH] core: Fix several implicit function declarations
+
+These #include lines ensure that grub2 continues to build with C99
+where implicit function declarations are removed.
+
+Related to:
+
+  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
+  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
+---
+ grub-core/commands/efi/connectefi.c | 1 +
+ grub-core/net/http.c                | 1 +
+ grub-core/term/at_keyboard.c        | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/grub-core/commands/efi/connectefi.c b/grub-core/commands/efi/connectefi.c
+index 0f840ea0575..6c397f8f508 100644
+--- a/grub-core/commands/efi/connectefi.c
++++ b/grub-core/commands/efi/connectefi.c
+@@ -21,6 +21,7 @@
+ #include <grub/efi/api.h>
+ #include <grub/efi/pci.h>
+ #include <grub/efi/efi.h>
++#include <grub/efi/disk.h>
+ #include <grub/command.h>
+ #include <grub/err.h>
+ #include <grub/i18n.h>
+diff --git a/grub-core/net/http.c b/grub-core/net/http.c
+index ce2b492c353..40df19426c8 100644
+--- a/grub-core/net/http.c
++++ b/grub-core/net/http.c
+@@ -26,6 +26,7 @@
+ #include <grub/dl.h>
+ #include <grub/file.h>
+ #include <grub/i18n.h>
++#include <grub/env.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
+index 378deb321d9..e667d0a862c 100644
+--- a/grub-core/term/at_keyboard.c
++++ b/grub-core/term/at_keyboard.c
+@@ -25,6 +25,7 @@
+ #include <grub/time.h>
+ #include <grub/loader.h>
+ #include <grub/ps2.h>
++#include <grub/env.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
diff --git a/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch b/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
deleted file mode 100644
index 3d7c641a..00000000
--- a/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Fri, 11 Jun 2021 00:01:29 +0200
-Subject: [PATCH] fs/ext2: Ignore checksum seed incompat feature
-
-This incompat feature is used to denote that the filesystem stored its
-metadata checksum seed in the superblock. This is used to allow tune2fs
-to change the UUID on a mounted metadata_csum filesystem without having
-to rewrite all the disk metadata.
-
-But GRUB doesn't use the metadata checksum in anyway, so can just ignore
-this feature if is enabled. This is consistent with GRUB filesystem code
-in general which just does a best effort to access the filesystem's data.
-
-It may be removed from the ignored list in the future if supports to do
-metadata checksumming verification is added to the read-only FS driver.
-
-Suggested-by: Eric Sandeen <esandeen@redhat.com>
-Suggested-by: Lukas Czerner <lczerner@redhat.com>
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- grub-core/fs/ext2.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
-index e7dd78e663..731d346f88 100644
---- a/grub-core/fs/ext2.c
-+++ b/grub-core/fs/ext2.c
-@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
- #define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
- #define EXT4_FEATURE_INCOMPAT_MMP		0x0100
- #define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
-+#define EXT4_FEATURE_INCOMPAT_CSUM_SEED		0x2000
- #define EXT4_FEATURE_INCOMPAT_ENCRYPT          0x10000
- 
- /* The set of back-incompatible features this driver DOES support. Add (OR)
-@@ -123,9 +124,16 @@ GRUB_MOD_LICENSE ("GPLv3+");
-  * mmp:            Not really back-incompatible - was added as such to
-  *                 avoid multiple read-write mounts. Safe to ignore for this
-  *                 RO driver.
-+ * checksum seed:  Not really back-incompatible - was added to allow tools
-+ *                 such as tune2fs to change the UUID on a mounted metadata
-+ *                 checksummed filesystem. Safe to ignore for now since the
-+ *                 driver doesn't support checksum verification. But it must
-+ *                 be removed from this list if that support is added later.
-+ *
-  */
- #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
--				     | EXT4_FEATURE_INCOMPAT_MMP)
-+				     | EXT4_FEATURE_INCOMPAT_MMP \
-+				     | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
- 
- 
- #define EXT3_JOURNAL_MAGIC_NUMBER	0xc03b3998U
diff --git a/0184-ieee1275-request-memory-with-ibm-client-architecture.patch b/0184-ieee1275-request-memory-with-ibm-client-architecture.patch
new file mode 100644
index 00000000..bd598850
--- /dev/null
+++ b/0184-ieee1275-request-memory-with-ibm-client-architecture.patch
@@ -0,0 +1,109 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens <dja@axtens.net>
+Date: Mon, 6 Feb 2023 10:03:20 -0500
+Subject: [PATCH] ieee1275: request memory with ibm,
+ client-architecture-support
+
+On PowerVM, the first time we boot a Linux partition, we may only get
+256MB of real memory area, even if the partition has more memory.
+
+This isn't enough to reliably verify a kernel. Fortunately, the Power
+Architecture Platform Reference (PAPR) defines a method we can call to ask
+for more memory: the broad and powerful ibm,client-architecture-support
+(CAS) method.
+
+CAS can do an enormous amount of things on a PAPR platform: as well as
+asking for memory, you can set the supported processor level, the interrupt
+controller, hash vs radix mmu, and so on.
+
+If:
+
+ - we are running under what we think is PowerVM (compatible property of /
+   begins with "IBM"), and
+
+ - the full amount of RMA is less than 512MB (as determined by the reg
+   property of /memory)
+
+then call CAS as follows: (refer to the Linux on Power Architecture
+Reference, LoPAR, which is public, at B.5.2.3):
+
+ - Use the "any" PVR value and supply 2 option vectors.
+
+ - Set option vector 1 (PowerPC Server Processor Architecture Level)
+   to "ignore".
+
+ - Set option vector 2 with default or Linux-like options, including a
+   min-rma-size of 512MB.
+
+ - Set option vector 3 to request Floating Point, VMX and Decimal Floating
+   point, but don't abort the boot if we can't get them.
+
+ - Set option vector 4 to request a minimum VP percentage to 1%, which is
+   what Linux requests, and is below the default of 10%. Without this,
+   some systems with very large or very small configurations fail to boot.
+
+This will cause a CAS reboot and the partition will restart with 512MB
+of RMA. Importantly, grub will notice the 512MB and not call CAS again.
+
+Notes about the choices of parameters:
+
+ - A partition can be configured with only 256MB of memory, which would
+   mean this request couldn't be satisfied, but PFW refuses to load with
+   only 256MB of memory, so it's a bit moot. SLOF will run fine with 256MB,
+   but we will never call CAS under qemu/SLOF because /compatible won't
+   begin with "IBM".)
+
+ - unspecified CAS vectors take on default values. Some of these values
+   might restrict the ability of certain hardware configurations to boot.
+   This is why we need to specify the VP percentage in vector 4, which is
+   in turn why we need to specify vector 3.
+
+Finally, we should have enough memory to verify a kernel, and we will
+reach Linux. One of the first things Linux does while still running under
+OpenFirmware is to call CAS with a much fuller set of options (including
+asking for 512MB of memory). Linux includes a much more restrictive set of
+PVR values and processor support levels, and this CAS invocation will likely
+induce another reboot. On this reboot grub will again notice the higher RMA,
+and not call CAS. We will get to Linux again, Linux will call CAS again, but
+because the values are now set for Linux this will not induce another CAS
+reboot and we will finally boot all the way to userspace.
+
+On all subsequent boots, everything will be configured with 512MB of RMA,
+so there will be no further CAS reboots from grub. (phyp is super sticky
+with the RMA size - it persists even on cold boots. So if you've ever booted
+Linux in a partition, you'll probably never have grub call CAS. It'll only
+ever fire the first time a partition loads grub, or if you deliberately lower
+the amount of memory your partition has below 512MB.)
+
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+(cherry picked from commit d5571590b7de61887efac1c298901455697ba307)
+---
+ grub-core/kern/ieee1275/init.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
+index 8ce1a0f09ee..13e8a5b4bb8 100644
+--- a/grub-core/kern/ieee1275/init.c
++++ b/grub-core/kern/ieee1275/init.c
+@@ -850,6 +850,19 @@ grub_claim_heap (void)
+     }
+ #endif
+ 
++#if defined(__powerpc__)
++  if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY))
++    {
++      grub_uint64_t rma_size;
++      grub_err_t err;
++
++      err = grub_ieee1275_total_mem (&rma_size);
++      /* if we have an error, don't call CAS, just hope for the best */
++      if (err == GRUB_ERR_NONE && rma_size < (512 * 1024 * 1024))
++	grub_ieee1275_ibm_cas ();
++    }
++#endif
++
+   grub_machine_mmap_iterate (heap_init, &total);
+ }
+ #endif
diff --git a/0185-hostdisk-work-around-proc-not-reporting-size.patch b/0185-hostdisk-work-around-proc-not-reporting-size.patch
new file mode 100644
index 00000000..72715ae3
--- /dev/null
+++ b/0185-hostdisk-work-around-proc-not-reporting-size.patch
@@ -0,0 +1,93 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 9 Mar 2023 11:18:19 -0500
+Subject: [PATCH] hostdisk: work around /proc not reporting size
+
+fstat(2) of files in /proc will yield st_size == 0 regardless of file
+contents.  Use a negative value in grub_file_t's size to denote "ignore"
+and plumb through.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ grub-core/kern/file.c           | 28 ++++++++++++++++------------
+ grub-core/lib/progress.c        |  2 +-
+ grub-core/osdep/unix/hostdisk.c |  6 ++++++
+ 3 files changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
+index 1794d022fb0..75510df7c92 100644
+--- a/grub-core/kern/file.c
++++ b/grub-core/kern/file.c
+@@ -172,26 +172,30 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
+   grub_disk_read_hook_t read_hook;
+   void *read_hook_data;
+ 
+-  if (file->offset > file->size)
+-    {
+-      grub_error (GRUB_ERR_OUT_OF_RANGE,
+-		  N_("attempt to read past the end of file"));
+-      return -1;
+-    }
+-
+   if (len == 0)
+     return 0;
+ 
+-  if (len > file->size - file->offset)
+-    len = file->size - file->offset;
++#ifdef GRUB_MACHINE_EMU
++  if (file->size >= 0)
++    {
++#endif
++      if (file->offset > file->size)
++        {
++          grub_error (GRUB_ERR_OUT_OF_RANGE,
++                      N_("attempt to read past the end of file"));
++          return -1;
++        }
++
++      if (len > file->size - file->offset)
++        len = file->size - file->offset;
++#ifdef GRUB_MACHINE_EMU
++    }
++#endif
+ 
+   /* Prevent an overflow.  */
+   if ((grub_ssize_t) len < 0)
+     len >>= 1;
+ 
+-  if (len == 0)
+-    return 0;
+-
+   read_hook = file->read_hook;
+   read_hook_data = file->read_hook_data;
+   if (!file->read_hook)
+diff --git a/grub-core/lib/progress.c b/grub-core/lib/progress.c
+index 4f4389dd586..eb1b7d13cfd 100644
+--- a/grub-core/lib/progress.c
++++ b/grub-core/lib/progress.c
+@@ -72,7 +72,7 @@ grub_file_progress_hook_real (grub_disk_addr_t sector __attribute__ ((unused)),
+ 				       * 100ULL * 1000ULL,
+ 				       now - file->last_progress_time, 0);
+ 
+-      if (file->size == 0)
++      if (file->size <= 0)
+ 	percent = 100;
+       else
+ 	percent = grub_divmod64 (100 * file->progress_offset,
+diff --git a/grub-core/osdep/unix/hostdisk.c b/grub-core/osdep/unix/hostdisk.c
+index 3a00d7451a5..e5f4b4d5f9c 100644
+--- a/grub-core/osdep/unix/hostdisk.c
++++ b/grub-core/osdep/unix/hostdisk.c
+@@ -71,6 +71,12 @@ grub_util_get_fd_size (grub_util_fd_t fd, const char *name, unsigned *log_secsiz
+   if (log_secsize)
+     *log_secsize = 9;
+ 
++#ifdef GRUB_MACHINE_EMU
++  /* /proc doesn't behave itself and gives 0 for file sizes to stat. */
++  if (st.st_size == 0 && !grub_strncmp ("/proc", name, 5))
++    return -1;
++#endif
++
+   return st.st_size;
+ }
+ 
diff --git a/0186-blscfg-check-for-mounted-boot-in-emu.patch b/0186-blscfg-check-for-mounted-boot-in-emu.patch
new file mode 100644
index 00000000..54b3cf01
--- /dev/null
+++ b/0186-blscfg-check-for-mounted-boot-in-emu.patch
@@ -0,0 +1,118 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Tue, 7 Mar 2023 18:59:40 -0500
+Subject: [PATCH] blscfg: check for mounted /boot in emu
+
+Irritatingly, BLS defines paths relatives to the mountpoint of the
+filesystem which contains its snippets, not / or any other fixed
+location.  So grub2-emu needs to know whether /boot is a separate
+filesysem from / and conditionally prepend a path.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ grub-core/commands/blscfg.c | 54 ++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 49 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
+index dbd0899acf3..6e398fc1757 100644
+--- a/grub-core/commands/blscfg.c
++++ b/grub-core/commands/blscfg.c
+@@ -40,8 +40,9 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #include "loadenv.h"
+ 
+ #define GRUB_BLS_CONFIG_PATH "/loader/entries/"
++
+ #ifdef GRUB_MACHINE_EMU
+-#define GRUB_BOOT_DEVICE ""
++#define GRUB_BOOT_DEVICE "/boot"
+ #else
+ #define GRUB_BOOT_DEVICE "($root)"
+ #endif
+@@ -54,8 +55,50 @@ struct keyval
+ 
+ static struct bls_entry *entries = NULL;
+ 
++/* Cache probing in frob_boot_device().  Used for linux entry also.
++ * Always true in non-emu, meaning to prefix things with GRUB_BOOT_DEVICE. */
++static int separate_boot = -1;
++
+ #define FOR_BLS_ENTRIES(var) FOR_LIST_ELEMENTS (var, entries)
+ 
++/* BLS appears to make paths relative to the filesystem that snippets are
++ * on, not /.  Attempt to cope. */
++static char *frob_boot_device(char *tmp)
++{
++#ifdef GRUB_MACHINE_EMU
++  grub_file_t f;
++  char *line = NULL;
++
++  if (separate_boot != -1)
++    goto probed;
++
++  separate_boot = 0;
++
++  f = grub_file_open ("/proc/mounts", GRUB_FILE_TYPE_CONFIG);
++  if (f == NULL)
++    goto probed;
++
++  while ((line = grub_file_getline (f)))
++    {
++      if (grub_strstr (line, " " GRUB_BOOT_DEVICE " "))
++	{
++	  separate_boot = 1;
++	  grub_free (line);
++	  break;
++	}
++
++      grub_free(line);
++    }
++
++  grub_file_close (f);
++ probed:
++  if (!separate_boot)
++    return grub_stpcpy (tmp, " ");
++#endif
++
++  return grub_stpcpy (tmp, " " GRUB_BOOT_DEVICE);
++}
++
+ static int bls_add_keyval(struct bls_entry *entry, char *key, char *val)
+ {
+   char *k, *v;
+@@ -842,7 +885,7 @@ static void create_entry (struct bls_entry *entry)
+       for (i = 0; early_initrds != NULL && early_initrds[i] != NULL; i++)
+ 	{
+ 	  grub_dprintf ("blscfg", "adding early initrd %s\n", early_initrds[i]);
+-	  tmp = grub_stpcpy (tmp, " " GRUB_BOOT_DEVICE);
++	  tmp = frob_boot_device (tmp);
+ 	  tmp = grub_stpcpy (tmp, initrd_prefix);
+ 	  tmp = grub_stpcpy (tmp, early_initrds[i]);
+ 	  grub_free(early_initrds[i]);
+@@ -851,7 +894,7 @@ static void create_entry (struct bls_entry *entry)
+       for (i = 0; initrds != NULL && initrds[i] != NULL; i++)
+ 	{
+ 	  grub_dprintf ("blscfg", "adding initrd %s\n", initrds[i]);
+-	  tmp = grub_stpcpy (tmp, " " GRUB_BOOT_DEVICE);
++	  tmp = frob_boot_device (tmp);
+ 	  tmp = grub_stpcpy (tmp, initrds[i]);
+ 	}
+       tmp = grub_stpcpy (tmp, "\n");
+@@ -888,7 +931,7 @@ static void create_entry (struct bls_entry *entry)
+         }
+       char *tmp = dt;
+       tmp = grub_stpcpy (dt, "devicetree");
+-      tmp = grub_stpcpy (tmp, " " GRUB_BOOT_DEVICE);
++      tmp = frob_boot_device (tmp);
+       if (add_dt_prefix)
+         tmp = grub_stpcpy (tmp, prefix);
+       tmp = grub_stpcpy (tmp, devicetree);
+@@ -907,7 +950,8 @@ static void create_entry (struct bls_entry *entry)
+ 			"linux %s%s%s%s\n"
+ 			"%s%s",
+ 			savedefault ? "savedefault\n" : "",
+-			GRUB_BOOT_DEVICE, clinux, options ? " " : "", options ? options : "",
++			separate_boot ? GRUB_BOOT_DEVICE : "",
++			clinux, options ? " " : "", options ? options : "",
+ 			initrd ? initrd : "", dt ? dt : "");
+ 
+   grub_normal_add_menu_entry (argc, argv, classes, id, users, hotkey, NULL, src, 0, &index, entry);
diff --git a/0187-grub_dl_set_mem_attrs-fix-format-string.patch b/0187-grub_dl_set_mem_attrs-fix-format-string.patch
new file mode 100644
index 00000000..646c609d
--- /dev/null
+++ b/0187-grub_dl_set_mem_attrs-fix-format-string.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Fri, 7 Apr 2023 14:54:35 +0200
+Subject: [PATCH] grub_dl_set_mem_attrs(): fix format string
+
+The grub_dprintf() call for printing the message
+
+  updating attributes for GOT and trampolines
+
+passes the argument "mod->name", but the format string doesn't accept that
+argument.
+
+Print the module name too.
+
+Example output:
+
+> kern/dl.c:736: updating attributes for GOT and trampolines ("video_fb")
+
+Fixes: ad1b904d325b (nx: set page permissions for loaded modules.)
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+---
+ grub-core/kern/dl.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index 25666ae383f..101e0794dd8 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -733,7 +733,8 @@ grub_dl_set_mem_attrs (grub_dl_t mod, void *ehdr)
+     {
+       tgsz = ALIGN_UP(tgsz, arch_addralign);
+ 
+-      grub_dprintf ("modules", "updating attributes for GOT and trampolines\n",
++      grub_dprintf ("modules",
++		    "updating attributes for GOT and trampolines (\"%s\")\n",
+ 		    mod->name);
+       grub_update_mem_attrs (tgaddr, tgsz, GRUB_MEM_ATTR_R|GRUB_MEM_ATTR_X,
+ 			     GRUB_MEM_ATTR_W);
diff --git a/0188-grub_dl_set_mem_attrs-add-self-check-for-the-tramp-G.patch b/0188-grub_dl_set_mem_attrs-add-self-check-for-the-tramp-G.patch
new file mode 100644
index 00000000..6543a9e2
--- /dev/null
+++ b/0188-grub_dl_set_mem_attrs-add-self-check-for-the-tramp-G.patch
@@ -0,0 +1,140 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Fri, 7 Apr 2023 16:21:54 +0200
+Subject: [PATCH] grub_dl_set_mem_attrs(): add self-check for the tramp/GOT
+ sizes
+
+On aarch64 UEFI, we currently have a crasher:
+
+  grub_dl_load_core()
+    grub_dl_load_core_noinit()
+
+      /* independent allocation: must remain writable */
+      mod = grub_zalloc();
+
+      /* allocates module image with incorrect tail alignment */
+      grub_dl_load_segments()
+
+      /* write-protecting the module image makes "mod" read-only! */
+      grub_dl_set_mem_attrs()
+        grub_update_mem_attrs()
+
+    grub_dl_init()
+      /* page fault, crash */
+      mod->next = ...;
+
+- Commit 887f1d8fa976 ("modules: load module sections at page-aligned
+  addresses", 2023-02-08) forgot to page-align the allocation of the
+  trampolines and GOT areas of grub2 modules, in grub_dl_load_segments().
+
+- Commit ad1b904d325b ("nx: set page permissions for loaded modules.",
+  2023-02-08) calculated a common bounding box for the trampolines and GOT
+  areas in grub_dl_set_mem_attrs(), rounded the box size up to a whole
+  multiple of EFI page size ("arch_addralign"), and write-protected the
+  resultant page range.
+
+Consequently, grub_dl_load_segments() places the module image in memory
+such that its tail -- the end of the trampolines and GOT areas -- lands at
+the head of a page whose tail in turn contains independent memory
+allocations, such as "mod". grub_dl_set_mem_attrs() will then unwittingly
+write-protect these other allocations too.
+
+But "mod" must remain writable: we assign "mod->next" in grub_dl_init()
+subsequently. Currently we crash there with a page fault / permission
+fault.
+
+(The crash is not trivial to hit: the tramp/GOT areas are irrelevant on
+x86_64, plus the page protection depends on the UEFI platform firmware
+providing EFI_MEMORY_ATTRIBUTE_PROTOCOL. In practice, the crash is
+restricted to aarch64 edk2 (ArmVirtQemu) builds containing commit
+1c4dfadb4611, "ArmPkg/CpuDxe: Implement EFI memory attributes protocol",
+2023-03-16.)
+
+Example log before the patch:
+
+> kern/dl.c:736: updating attributes for GOT and trampolines ("video_fb")
+> kern/efi/mm.c:927: set +rx -w on 0x13b88b000-0x13b88bfff before:rwx after:r-x
+> kern/dl.c:744: done updating module memory attributes for "video_fb"
+> kern/dl.c:639: flushing 0xe4f0 bytes at 0x13b87d000
+> kern/arm64/cache.c:42: D$ line size: 64
+> kern/arm64/cache.c:43: I$ line size: 64
+> kern/dl.c:839: module name: video_fb
+> kern/dl.c:840: init function: 0x0
+> kern/dl.c:865: Initing module video_fb
+>
+> Synchronous Exception at 0x000000013B8A76EC
+> PC 0x00013B8A76EC
+>
+>   X0 0x000000013B88B960   X1 0x0000000000000000   X2 0x000000013F93587C   X3 0x0000000000000075
+>
+>   SP 0x00000000470745C0  ELR 0x000000013B8A76EC  SPSR 0x60000205  FPSR 0x00000000
+>  ESR 0x9600004F          FAR 0x000000013B88B9D0
+>
+>  ESR : EC 0x25  IL 0x1  ISS 0x0000004F
+>
+> Data abort: Permission fault, third level
+
+Note the following:
+
+- The whole 4K page at 0x1_3B88_B000 is write-protected.
+
+- The "video_fb" module actually lives at [0x1_3B87_D000, 0x1_3B88_B4F0)
+  -- left-inclusive, right-exclusive --; that is, in the last page (at
+  0x1_3B88_B000), it only occupies the first 0x4F0 bytes.
+
+- The instruction at 0x1_3B8A_76EC faults. Not shown here, but it is a
+  store instruction, which writes to the field at offset 0x70 of the
+  structure pointed-to by the X0 register. This is the "mod->next"
+  assignment from grub_dl_init().
+
+- The faulting address is therefore (X0 + 0x70), i.e., 0x1_3B88_B9D0. This
+  is indeed the value held in the FAR register.
+
+- The faulting address 0x1_3B88_B9D0 falls in the above-noted page (at
+  0x1_3B88_B000), namely at offset 0x9D0. This is *beyond* the first 0x4F0
+  bytes that the very tail of the "video_fb" module occupies at the front
+  of that page.
+
+For now, add a self-check that reports this bug (and prevents the crash by
+skipping the write protection).
+
+Example log after the patch:
+
+> kern/dl.c:742:BUG: trying to protect pages outside of module allocation
+> ("video_fb"): module base 0x13b87d000, size 0xe4f0; tramp/GOT base
+> 0x13b88b000, size 0x1000
+
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+---
+ grub-core/kern/dl.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index 101e0794dd8..bad0ad4b945 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -682,7 +682,7 @@ grub_dl_set_mem_attrs (grub_dl_t mod, void *ehdr)
+ #if !defined (__i386__) && !defined (__x86_64__) && !defined(__riscv)
+   grub_size_t arch_addralign = grub_arch_dl_min_alignment ();
+   grub_addr_t tgaddr;
+-  grub_uint64_t tgsz;
++  grub_size_t tgsz;
+ #endif
+ 
+   grub_dprintf ("modules", "updating memory attributes for \"%s\"\n",
+@@ -736,6 +736,15 @@ grub_dl_set_mem_attrs (grub_dl_t mod, void *ehdr)
+       grub_dprintf ("modules",
+ 		    "updating attributes for GOT and trampolines (\"%s\")\n",
+ 		    mod->name);
++      if (tgaddr < (grub_addr_t)mod->base ||
++          tgsz > (grub_addr_t)-1 - tgaddr ||
++	  tgaddr + tgsz > (grub_addr_t)mod->base + mod->sz)
++	return grub_error (GRUB_ERR_BUG,
++			   "BUG: trying to protect pages outside of module "
++			   "allocation (\"%s\"): module base %p, size 0x%"
++			   PRIxGRUB_SIZE "; tramp/GOT base 0x%" PRIxGRUB_ADDR
++			   ", size 0x%" PRIxGRUB_SIZE,
++			   mod->name, mod->base, mod->sz, tgaddr, tgsz);
+       grub_update_mem_attrs (tgaddr, tgsz, GRUB_MEM_ATTR_R|GRUB_MEM_ATTR_X,
+ 			     GRUB_MEM_ATTR_W);
+     }
diff --git a/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch b/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch
deleted file mode 100644
index 265b9672..00000000
--- a/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Tue, 6 Jul 2021 00:38:40 +0200
-Subject: [PATCH] templates: Check for EFI at runtime instead of config
- generation time
-
-The 30_uefi-firmware template checks if an OsIndicationsSupported UEFI var
-exists and EFI_OS_INDICATIONS_BOOT_TO_FW_UI bit is set, to decide whether
-a "fwsetup" menu entry would be added or not to the GRUB menu.
-
-But this has the problem that it will only work if the configuration file
-was created on an UEFI machine that supports booting to a firmware UI.
-
-This for example doesn't support creating GRUB config files when executing
-on systems that support both UEFI and legacy BIOS booting. Since creating
-the config file from legacy BIOS wouldn't allow to access the firmware UI.
-
-To prevent this, make the template to unconditionally create the grub.cfg
-snippet but check at runtime if was booted through UEFI to decide if this
-entry should be added. That way it won't be added when booting with BIOS.
-
-There's no need to check if EFI_OS_INDICATIONS_BOOT_TO_FW_UI bit is set,
-since that's already done by the "fwsetup" command when is executed.
-
-Resolves: rhbz#1823864
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- util/grub.d/30_uefi-firmware.in | 21 ++++++++-------------
- 1 file changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
-index d344d3883d..b6041b55e2 100644
---- a/util/grub.d/30_uefi-firmware.in
-+++ b/util/grub.d/30_uefi-firmware.in
-@@ -26,19 +26,14 @@ export TEXTDOMAINDIR="@localedir@"
- 
- . "$pkgdatadir/grub-mkconfig_lib"
- 
--EFI_VARS_DIR=/sys/firmware/efi/efivars
--EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c
--OS_INDICATIONS="$EFI_VARS_DIR/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE"
-+LABEL="UEFI Firmware Settings"
- 
--if [ -e "$OS_INDICATIONS" ] && \
--   [ "$(( $(printf 0x%x \'"$(cat $OS_INDICATIONS | cut -b5)"\') & 1 ))" = 1 ]; then
--  LABEL="UEFI Firmware Settings"
-+gettext_printf "Adding boot menu entry for UEFI Firmware Settings ...\n" >&2
- 
--  gettext_printf "Adding boot menu entry for UEFI Firmware Settings ...\n" >&2
--
--  cat << EOF
--menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
--	fwsetup
--}
--EOF
-+cat << EOF
-+if [ "\$grub_platform" = "efi" ]; then
-+	menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
-+		fwsetup
-+	}
- fi
-+EOF
diff --git a/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch b/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
deleted file mode 100644
index 3b1a219d..00000000
--- a/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Tue, 6 Jul 2021 01:10:18 +0200
-Subject: [PATCH] efi: Print an error if boot to firmware setup is not
- supported
-
-The "fwsetup" command is only registered if the firmware supports booting
-to the firmware setup UI. But it could be possible that the GRUB config
-already contains a "fwsetup" entry, because it was generated in a machine
-that has support for this feature.
-
-To prevent users getting a "can't find command `fwsetup`" error if it is
-not supported by the firmware, let's just always register the command but
-print a more accurate message if the firmware doesn't support this option.
-
-Resolves: rhbz#1823864
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- grub-core/commands/efi/efifwsetup.c | 43 ++++++++++++++++++++-----------------
- 1 file changed, 23 insertions(+), 20 deletions(-)
-
-diff --git a/grub-core/commands/efi/efifwsetup.c b/grub-core/commands/efi/efifwsetup.c
-index eaca032838..328c45e82e 100644
---- a/grub-core/commands/efi/efifwsetup.c
-+++ b/grub-core/commands/efi/efifwsetup.c
-@@ -27,6 +27,25 @@
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
-+static grub_efi_boolean_t
-+efifwsetup_is_supported (void)
-+{
-+  grub_efi_uint64_t *os_indications_supported = NULL;
-+  grub_size_t oi_size = 0;
-+  grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;
-+
-+  grub_efi_get_variable ("OsIndicationsSupported", &global, &oi_size,
-+			 (void **) &os_indications_supported);
-+
-+  if (!os_indications_supported)
-+    return 0;
-+
-+  if (*os_indications_supported & GRUB_EFI_OS_INDICATIONS_BOOT_TO_FW_UI)
-+    return 1;
-+
-+  return 0;
-+}
-+
- static grub_err_t
- grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)),
- 		  int argc __attribute__ ((unused)),
-@@ -38,6 +57,10 @@ grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)),
-   grub_size_t oi_size;
-   grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;
- 
-+  if (!efifwsetup_is_supported ())
-+	  return grub_error (GRUB_ERR_INVALID_COMMAND,
-+			     N_("Reboot to firmware setup is not supported"));
-+
-   grub_efi_get_variable ("OsIndications", &global, &oi_size,
- 			 (void **) &old_os_indications);
- 
-@@ -56,28 +79,8 @@ grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)),
- 
- static grub_command_t cmd = NULL;
- 
--static grub_efi_boolean_t
--efifwsetup_is_supported (void)
--{
--  grub_efi_uint64_t *os_indications_supported = NULL;
--  grub_size_t oi_size = 0;
--  grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;
--
--  grub_efi_get_variable ("OsIndicationsSupported", &global, &oi_size,
--			 (void **) &os_indications_supported);
--
--  if (!os_indications_supported)
--    return 0;
--
--  if (*os_indications_supported & GRUB_EFI_OS_INDICATIONS_BOOT_TO_FW_UI)
--    return 1;
--
--  return 0;
--}
--
- GRUB_MOD_INIT (efifwsetup)
- {
--  if (efifwsetup_is_supported ())
-     cmd = grub_register_command ("fwsetup", grub_cmd_fwsetup, NULL,
- 				 N_("Reboot into firmware setup menu."));
- 
diff --git a/0189-grub_dl_load_segments-page-align-the-tramp-GOT-areas.patch b/0189-grub_dl_load_segments-page-align-the-tramp-GOT-areas.patch
new file mode 100644
index 00000000..9ccf4122
--- /dev/null
+++ b/0189-grub_dl_load_segments-page-align-the-tramp-GOT-areas.patch
@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Fri, 7 Apr 2023 16:56:09 +0200
+Subject: [PATCH] grub_dl_load_segments(): page-align the tramp/GOT areas too
+
+The tramp/GOT write-protection in grub_dl_set_mem_attrs() requires that
+the tramp/GOT areas of the module image *not* share a page with any other
+memory allocations. Page-align the tramp/GOT areas, while satisfying their
+intrinsic alignment requirements too.
+
+Fixes: 887f1d8fa976 (modules: load module sections at page-aligned addresses)
+Fixes: ad1b904d325b (nx: set page permissions for loaded modules.)
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+---
+ grub-core/kern/dl.c | 24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index bad0ad4b945..c55f0ecf931 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -272,7 +272,9 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+ #if !defined (__i386__) && !defined (__x86_64__) && !defined(__riscv) && \
+   !defined (__loongarch__)
+   grub_size_t tramp;
++  grub_size_t tramp_align;
+   grub_size_t got;
++  grub_size_t got_align;
+   grub_err_t err;
+ #endif
+   char *ptr;
+@@ -304,12 +306,18 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+   err = grub_arch_dl_get_tramp_got_size (e, &tramp, &got);
+   if (err)
+     return err;
+-  tsize += ALIGN_UP (tramp, GRUB_ARCH_DL_TRAMP_ALIGN);
+-  if (talign < GRUB_ARCH_DL_TRAMP_ALIGN)
+-    talign = GRUB_ARCH_DL_TRAMP_ALIGN;
+-  tsize += ALIGN_UP (got, GRUB_ARCH_DL_GOT_ALIGN);
+-  if (talign < GRUB_ARCH_DL_GOT_ALIGN)
+-    talign = GRUB_ARCH_DL_GOT_ALIGN;
++  tramp_align = GRUB_ARCH_DL_TRAMP_ALIGN;
++  if (tramp_align < arch_addralign)
++    tramp_align = arch_addralign;
++  tsize += ALIGN_UP (tramp, tramp_align);
++  if (talign < tramp_align)
++    talign = tramp_align;
++  got_align = GRUB_ARCH_DL_GOT_ALIGN;
++  if (got_align < arch_addralign)
++    got_align = arch_addralign;
++  tsize += ALIGN_UP (got, got_align);
++  if (talign < got_align)
++    talign = got_align;
+ #endif
+ 
+ #ifdef GRUB_MACHINE_EMU
+@@ -370,11 +378,11 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
+     }
+ #if !defined (__i386__) && !defined (__x86_64__) && !defined(__riscv) && \
+   !defined (__loongarch__)
+-  ptr = (char *) ALIGN_UP ((grub_addr_t) ptr, GRUB_ARCH_DL_TRAMP_ALIGN);
++  ptr = (char *) ALIGN_UP ((grub_addr_t) ptr, tramp_align);
+   mod->tramp = ptr;
+   mod->trampptr = ptr;
+   ptr += tramp;
+-  ptr = (char *) ALIGN_UP ((grub_addr_t) ptr, GRUB_ARCH_DL_GOT_ALIGN);
++  ptr = (char *) ALIGN_UP ((grub_addr_t) ptr, got_align);
+   mod->got = ptr;
+   mod->gotptr = ptr;
+   ptr += got;
diff --git a/0190-emu-Add-switch-root-to-grub-emu.patch b/0190-emu-Add-switch-root-to-grub-emu.patch
new file mode 100644
index 00000000..3fabaae5
--- /dev/null
+++ b/0190-emu-Add-switch-root-to-grub-emu.patch
@@ -0,0 +1,330 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nicolas Frayer <nfrayer@redhat.com>
+Date: Fri, 31 Mar 2023 20:47:58 +0200
+Subject: [PATCH] emu: Add switch-root to grub-emu
+
+If the kernel running grub emu is the same as the one we want to
+boot, it makes sense that we just switch-root instead of kexec
+the same kernel again by doing grub2-emu --switch-root
+
+Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ grub-core/kern/emu/main.c    |   5 +-
+ grub-core/kern/emu/misc.c    |  13 +++
+ grub-core/loader/emu/linux.c | 209 +++++++++++++++++++++++++++++++++++++++++--
+ include/grub/emu/exec.h      |   2 +-
+ include/grub/emu/misc.h      |   2 +
+ 5 files changed, 223 insertions(+), 8 deletions(-)
+
+diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
+index 38c1576a2ef..61b3181775b 100644
+--- a/grub-core/kern/emu/main.c
++++ b/grub-core/kern/emu/main.c
+@@ -108,6 +108,7 @@ static struct argp_option options[] = {
+   {"verbose",     'v', 0,      0, N_("print verbose messages."), 0},
+   {"hold",     'H', N_("SECS"),      OPTION_ARG_OPTIONAL, N_("wait until a debugger will attach"), 0},
+   {"kexec",       'X', 0,      0, N_("use kexec to boot Linux kernels via systemctl (pass twice to enable dangerous fallback to non-systemctl)."), 0},
++  {"switch-root",     'W', 0,      0, N_("use switch-root to only switch root filesystem without restarting the kernel."), 0},
+   { 0, 0, 0, 0, 0, 0 }
+ };
+ 
+@@ -168,7 +169,9 @@ argp_parser (int key, char *arg, struct argp_state *state)
+     case 'X':
+       grub_util_set_kexecute ();
+       break;
+-
++    case 'W':
++      grub_util_set_switch_root ();
++      break;
+     case ARGP_KEY_ARG:
+       {
+ 	/* Too many arguments. */
+diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
+index d145e5796b3..7b9731b7efa 100644
+--- a/grub-core/kern/emu/misc.c
++++ b/grub-core/kern/emu/misc.c
+@@ -40,6 +40,7 @@
+ 
+ int verbosity;
+ int kexecute;
++int switchroot = 0;
+ 
+ void
+ grub_util_warn (const char *fmt, ...)
+@@ -231,3 +232,15 @@ grub_util_get_kexecute (void)
+ {
+   return kexecute;
+ }
++
++void
++grub_util_set_switch_root (void)
++{
++  switchroot = 1;
++}
++
++int
++grub_util_get_switch_root (void)
++{
++  return switchroot;
++}
+diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c
+index 7de3f7f8610..6feb0412c58 100644
+--- a/grub-core/loader/emu/linux.c
++++ b/grub-core/loader/emu/linux.c
+@@ -15,7 +15,6 @@
+  *  You should have received a copy of the GNU General Public License
+  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+  */
+-
+ #include <grub/loader.h>
+ #include <grub/dl.h>
+ #include <grub/command.h>
+@@ -33,6 +32,196 @@ static char *kernel_path;
+ static char *initrd_path;
+ static char *boot_cmdline;
+ 
++static grub_err_t
++grub_switch_root (void)
++{
++  char *tmp = NULL;
++  char *options_cmd = NULL;
++  char *options = NULL;
++  char *subvol = NULL;
++  char *root_uuid = NULL;
++  char *kernel_release = NULL;
++  grub_err_t rc = GRUB_ERR_NONE;
++  const char *subvol_param = "subvol=";
++  const char *kernel_release_prefix = "/boot/vmlinuz-";
++  const char *root_prefix = "root=";
++  const char *systemctl[] = {"systemctl", "--force", "switch-root", "/sysroot", NULL};
++  const char *mountrootfs[] = {"mount", root_uuid, "/sysroot", options_cmd, options, NULL};
++  const char *unamer[] = {"uname", "-r", NULL};
++  char *uname_buf = NULL;
++  int i = 0;
++
++  /* Extract the kernel release tag from kernel_path */
++  if (!kernel_path)
++    {
++      rc = GRUB_ERR_BAD_ARGUMENT;
++      grub_dprintf ("linux", "switch_root: No kernel_path found\n");
++      goto out;
++    }
++
++  if ((kernel_release = grub_xasprintf ("%s", (kernel_path + grub_strlen (kernel_release_prefix)))) == NULL)
++    {
++      grub_dprintf ("linux", "switch_root: Failed to allocate memory\n");
++      rc = GRUB_ERR_BAD_ARGUMENT;
++      goto out;
++    }
++
++
++  /* Check for kernel mismatch  */
++  /* Retrieve the current kernel relase tag */
++  grub_util_exec_redirect (unamer, NULL, "/tmp/version");
++
++  grub_file_t f = grub_file_open ("/tmp/version", GRUB_FILE_TYPE_FS_SEARCH);
++
++  if (f == NULL)
++    {
++      grub_dprintf ("linux", "failed opening file.\n");
++      rc = GRUB_ERR_FILE_NOT_FOUND;
++      goto out;
++    }
++
++  if ((uname_buf = grub_malloc (f->size)) == NULL)
++    {
++      grub_dprintf ("linux", "switch_root: Failed to allocate memory\n");
++      rc = GRUB_ERR_OUT_OF_MEMORY;
++      goto out;
++    }
++
++  if (grub_file_read (f, uname_buf, f->size) < 0)
++    {
++      grub_dprintf ("linux", "switch_root: failed to read from file\n");
++      rc = GRUB_ERR_FILE_READ_ERROR;
++      goto out;
++    }
++
++  grub_file_close (f);
++
++  if (grub_strstr (uname_buf, kernel_release) == NULL)
++    {
++      grub_dprintf ("linux", "switch_root: kernel mismatch, not performing switch-root ...\n");
++      rc = GRUB_ERR_NO_KERNEL;
++      goto out;
++    }
++
++  /* Extract the root partition from boot_cmdline */
++  if (!boot_cmdline)
++    {
++      rc = GRUB_ERR_BAD_ARGUMENT;
++      goto out;
++    }
++
++  tmp = grub_strdup (boot_cmdline);
++
++  if (tmp == NULL)
++    {
++      rc = GRUB_ERR_OUT_OF_MEMORY;
++      goto out;
++    }
++
++  if ((root_uuid = grub_strstr (tmp, root_prefix)) == NULL)
++    {
++      rc = GRUB_ERR_BAD_ARGUMENT;
++      grub_dprintf ("linux", "switch_root: Can't find rootfs\n");
++      goto out;
++    }
++
++  root_uuid += grub_strlen (root_prefix);
++
++  while (root_uuid[i] != ' ' && root_uuid[i] != '\0')
++    i++;
++
++  root_uuid[i] = '\0';
++
++  /* Allocate a new buffer holding root_uuid */
++  root_uuid = grub_xasprintf ("%s", root_uuid);
++
++  if (root_uuid == NULL)
++    {
++      grub_dprintf ("linux", "switch_root: Failed to allocated memory\n");
++      rc = GRUB_ERR_OUT_OF_MEMORY;
++      goto out;
++    }
++
++  /* Check for subvol parameter */
++  grub_strcpy (tmp, boot_cmdline);
++
++  if ((subvol = grub_strstr(tmp, subvol_param)) != NULL)
++    {
++      i = 0;
++
++      while (subvol[i] != ' ' && subvol[i] != '\0')
++        i++;
++
++      subvol[i] = '\0';
++
++      /* Allocate a new buffer holding subvol */
++      subvol = grub_xasprintf("%s", subvol);
++
++      if (subvol == NULL)
++        {
++          grub_dprintf ("linux", "switch_root: Failed to allocated memory\n");
++          rc = GRUB_ERR_OUT_OF_MEMORY;
++          goto out;
++        }
++
++      options_cmd = grub_xasprintf("%s", "-o");
++      options = grub_xasprintf("%s", subvol);
++    }
++
++  if (options == NULL)
++    {
++      mountrootfs[3] = NULL;
++    }
++  else
++    {
++      mountrootfs[3] = options_cmd;
++      mountrootfs[4] = options;
++    }
++
++  mountrootfs[1] = root_uuid;
++
++  grub_dprintf ("linux", "Executing:\n");
++  grub_dprintf ("linux", "%s %s %s %s %s\n", mountrootfs[0], mountrootfs[1],
++    mountrootfs[2], mountrootfs[3], mountrootfs[4]);
++
++  /* Mount the rootfs */
++  rc = grub_util_exec (mountrootfs);
++
++  if (rc != GRUB_ERR_NONE)
++    {
++      grub_dprintf ("linux", "switch_root: Failed.\n");
++      rc = GRUB_ERR_INVALID_COMMAND;
++      goto out;
++    }
++
++  grub_dprintf ("linux", "Done.\n");
++
++  grub_dprintf ("linux", "%s %s %s %s\n", systemctl[0], systemctl[1],
++    systemctl[2], systemctl[3]);
++
++  /* Switch root */
++  rc = grub_util_exec (systemctl);
++
++  if (rc != GRUB_ERR_NONE)
++    {
++      grub_dprintf ("linux", "switch_root: Failed.\n");
++      rc = GRUB_ERR_INVALID_COMMAND;
++      goto out;
++    }
++
++  grub_dprintf ("linux", "Done.\n");
++
++out:
++  grub_free (tmp);
++  grub_free (options_cmd);
++  grub_free (options);
++  grub_free (subvol);
++  grub_free (root_uuid);
++  grub_free (uname_buf);
++  grub_free (kernel_release);
++  return rc;
++}
++
+ static grub_err_t
+ grub_linux_boot (void)
+ {
+@@ -51,12 +240,20 @@ grub_linux_boot (void)
+   else
+     initrd_param = grub_xasprintf ("%s", "");
+ 
+-  grub_dprintf ("linux", "%serforming 'kexec -la %s %s %s'\n",
+-                (kexecute) ? "P" : "Not p",
+-                kernel_path, initrd_param, boot_cmdline);
++  if (grub_util_get_switch_root() == 1)
++    {
++      rc = grub_switch_root();
++      if (rc != GRUB_ERR_NONE)
++        grub_fatal (N_("Failed to execute switch_root\n"));
++    }
++  else if (kexecute)
++    {
++      grub_dprintf ("linux", "%serforming 'kexec -la %s %s %s'\n",
++                    (kexecute) ? "P" : "Not p",
++                    kernel_path, initrd_param, boot_cmdline);
+ 
+-  if (kexecute)
+-    rc = grub_util_exec (kexec);
++      rc = grub_util_exec (kexec);
++    }
+ 
+   grub_free (initrd_param);
+ 
+diff --git a/include/grub/emu/exec.h b/include/grub/emu/exec.h
+index 1b61b4a2e5d..e82f13215e0 100644
+--- a/include/grub/emu/exec.h
++++ b/include/grub/emu/exec.h
+@@ -36,7 +36,7 @@ grub_util_exec_redirect_all (const char *const *argv, const char *stdin_file,
+ int
+ EXPORT_FUNC(grub_util_exec) (const char *const *argv);
+ int
+-grub_util_exec_redirect (const char *const *argv, const char *stdin_file,
++EXPORT_FUNC(grub_util_exec_redirect) (const char *const *argv, const char *stdin_file,
+ 			 const char *stdout_file);
+ int
+ grub_util_exec_redirect_null (const char *const *argv);
+diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
+index 01056954b96..f3a712a8b2f 100644
+--- a/include/grub/emu/misc.h
++++ b/include/grub/emu/misc.h
+@@ -59,6 +59,8 @@ void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format
+ 
+ void EXPORT_FUNC(grub_util_set_kexecute) (void);
+ int EXPORT_FUNC(grub_util_get_kexecute) (void) WARN_UNUSED_RESULT;
++void EXPORT_FUNC(grub_util_set_switch_root) (void);
++int EXPORT_FUNC(grub_util_get_switch_root) (void);
+ 
+ grub_uint64_t EXPORT_FUNC (grub_util_get_cpu_time_ms) (void);
+ 
diff --git a/0191-util-Enable-default-kernel-for-updates.patch b/0191-util-Enable-default-kernel-for-updates.patch
new file mode 100644
index 00000000..5682df04
--- /dev/null
+++ b/0191-util-Enable-default-kernel-for-updates.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Marta Lewandowska <mlewando@redhat.com>
+Date: Wed, 24 May 2023 11:22:47 +0200
+Subject: [PATCH] util: Enable default kernel for updates
+
+Several kernel variants can be installed on a system in parallel.
+In order to allow the user to choose which kernel will be set to
+default after an update, re-enable grub's usage of DEFAULTKERNEL as
+set in /etc/sysconfig/kernel
+
+Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
+---
+ util/grub-get-kernel-settings.in | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
+index 7e87dfccc0e..f71bc64360b 100644
+--- a/util/grub-get-kernel-settings.in
++++ b/util/grub-get-kernel-settings.in
+@@ -68,6 +68,14 @@ if test -f /etc/sysconfig/kernel ; then
+     . /etc/sysconfig/kernel
+ fi
+ 
++GRUB_DEFAULT_KERNEL_TYPE=${DEFAULTKERNEL/-core/}
++if [ "$GRUB_DEFAULT_KERNEL_TYPE" != "kernel" ]; then
++    echo GRUB_NON_STANDARD_KERNEL=true
++    echo export GRUB_NON_STANDARD_KERNEL
++    GRUB_DEFAULT_KERNEL_TYPE=${GRUB_DEFAULT_KERNEL_TYPE/kernel-/}
++fi
++echo GRUB_DEFAULT_KERNEL_TYPE=$GRUB_DEFAULT_KERNEL_TYPE
++echo export GRUB_DEFAULT_KERNEL_TYPE
+ if [ "$MAKEDEBUG" = "yes" ]; then
+     echo GRUB_LINUX_MAKE_DEBUG=true
+     echo export GRUB_LINUX_MAKE_DEBUG
diff --git a/0192-efi-http-change-uint32_t-to-uintn_t.patch b/0192-efi-http-change-uint32_t-to-uintn_t.patch
new file mode 100644
index 00000000..ec22c360
--- /dev/null
+++ b/0192-efi-http-change-uint32_t-to-uintn_t.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Keng-Yu Lin <kengyu@hpe.com>
+Date: Wed, 26 Apr 2023 01:43:16 -0400
+Subject: [PATCH] efi/http: change uint32_t to uintn_t
+
+Modify UINT32 to UINTN in EFI_HTTP_MESSAGE to
+be UEFI 2.9 compliant.
+
+Signed-off-by: Keng-Yu Lin <kengyu@hpe.com>
+Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ include/grub/efi/http.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h
+index c5e9a89f505..ad164ba1913 100644
+--- a/include/grub/efi/http.h
++++ b/include/grub/efi/http.h
+@@ -171,9 +171,9 @@ typedef struct {
+     grub_efi_http_request_data_t *request;
+     grub_efi_http_response_data_t *response;
+   } data;
+-  grub_efi_uint32_t header_count;
++  grub_efi_uintn_t header_count;
+   grub_efi_http_header_t *headers;
+-  grub_efi_uint32_t body_length;
++  grub_efi_uintn_t body_length;
+   void *body;
+ } grub_efi_http_message_t;
+ 
diff --git a/0193-Add-Install-section-to-aux-systemd-units.patch b/0193-Add-Install-section-to-aux-systemd-units.patch
new file mode 100644
index 00000000..69812255
--- /dev/null
+++ b/0193-Add-Install-section-to-aux-systemd-units.patch
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christian Glombek <cglombek@redhat.com>
+Date: Wed, 9 Aug 2023 18:11:25 +0200
+Subject: [PATCH] Add [Install] section to aux systemd units
+
+Currently in Fedora, these services are statically enabled by symlinks,
+with no other way to disable them than to manually delete those symlinks.
+This is problematic in Fedora IoT, where grub-boot-success.timer is
+not supposed to be enabled.
+
+This change adds `[Install]` sections to all systemd units that are
+currently enabled statically, so that they can be enabled dynamically
+via presets or manually instead.
+---
+ docs/grub-boot-indeterminate.service             | 3 +++
+ docs/grub-boot-success.timer                     | 3 +++
+ util/systemd/grub-systemd-integration.service.in | 3 +++
+ 3 files changed, 9 insertions(+)
+
+diff --git a/docs/grub-boot-indeterminate.service b/docs/grub-boot-indeterminate.service
+index 6c8dcb186b6..5bcb474a3d3 100644
+--- a/docs/grub-boot-indeterminate.service
++++ b/docs/grub-boot-indeterminate.service
+@@ -9,3 +9,6 @@ Before=system-update-pre.target
+ [Service]
+ Type=oneshot
+ ExecStart=/usr/bin/grub2-editenv - incr boot_indeterminate
++
++[Install]
++WantedBy=system-update.target
+diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer
+index 406f1720056..1d124cccc14 100644
+--- a/docs/grub-boot-success.timer
++++ b/docs/grub-boot-success.timer
+@@ -5,3 +5,6 @@ ConditionVirtualization=!container
+ 
+ [Timer]
+ OnActiveSec=2min
++
++[Install]
++WantedBy=timers.target
+diff --git a/util/systemd/grub-systemd-integration.service.in b/util/systemd/grub-systemd-integration.service.in
+index c81fb594ce1..22ca1ca4885 100644
+--- a/util/systemd/grub-systemd-integration.service.in
++++ b/util/systemd/grub-systemd-integration.service.in
+@@ -6,3 +6,6 @@ ConditionPathExists=/run/systemd/reboot-to-boot-loader-menu
+ 
+ [Service]
+ ExecStart=@libexecdir@/@grubdirname@/systemd-integration.sh
++
++[Install]
++WantedBy=reboot.target
diff --git a/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch b/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
deleted file mode 100644
index 7fc40f1f..00000000
--- a/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Erwan Velu <erwanaliasr1@gmail.com>
-Date: Wed, 25 Aug 2021 15:31:52 +0200
-Subject: [PATCH] fs/xfs: Fix unreadable filesystem with v4 superblock
-
-The commit 8b1e5d193 (fs/xfs: Add bigtime incompat feature support)
-introduced the bigtime support by adding some features in v3 inodes.
-This change extended grub_xfs_inode struct by 76 bytes but also changed
-the computation of XFS_V2_INODE_SIZE and XFS_V3_INODE_SIZE. Prior this
-commit, XFS_V2_INODE_SIZE was 100 bytes. After the commit it's 84 bytes
-XFS_V2_INODE_SIZE becomes 16 bytes too small.
-
-As a result, the data structures aren't properly aligned and the GRUB
-generates "attempt to read or write outside of partition" errors when
-trying to read the XFS filesystem:
-
-                             GNU GRUB  version 2.11
-	....
-	grub> set debug=efi,gpt,xfs
-	grub> insmod part_gpt
-	grub> ls (hd0,gpt1)/
-	partmap/gpt.c:93: Read a valid GPT header
-	partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125
-	fs/xfs.c:931: Reading sb
-	fs/xfs.c:270: Validating superblock
-	fs/xfs.c:295: XFS v4 superblock detected
-	fs/xfs.c:962: Reading root ino 128
-	fs/xfs.c:515: Reading inode (128) - 64, 0
-	fs/xfs.c:515: Reading inode (739521961424144223) - 344365866970255880, 3840
-	error: attempt to read or write outside of partition.
-
-This commit change the XFS_V2_INODE_SIZE computation by subtracting 76
-bytes instead of 92 bytes from the actual size of grub_xfs_inode struct.
-This 76 bytes value comes from added members:
-	20 grub_uint8_t   unused5
-	 1 grub_uint64_t  flags2
-        48 grub_uint8_t   unused6
-
-This patch explicitly splits the v2 and v3 parts of the structure.
-The unused4 is still ending of the v2 structures and the v3 starts
-at unused5. Thanks to this we will avoid future corruptions of v2
-or v3 inodes.
-
-The XFS_V2_INODE_SIZE is returning to its expected size and the
-filesystem is back to a readable state:
-
-                      GNU GRUB  version 2.11
-	....
-	grub> set debug=efi,gpt,xfs
-	grub> insmod part_gpt
-	grub> ls (hd0,gpt1)/
-	partmap/gpt.c:93: Read a valid GPT header
-	partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125
-	fs/xfs.c:931: Reading sb
-	fs/xfs.c:270: Validating superblock
-	fs/xfs.c:295: XFS v4 superblock detected
-	fs/xfs.c:962: Reading root ino 128
-	fs/xfs.c:515: Reading inode (128) - 64, 0
-	fs/xfs.c:515: Reading inode (128) - 64, 0
-	fs/xfs.c:931: Reading sb
-	fs/xfs.c:270: Validating superblock
-	fs/xfs.c:295: XFS v4 superblock detected
-	fs/xfs.c:962: Reading root ino 128
-	fs/xfs.c:515: Reading inode (128) - 64, 0
-	fs/xfs.c:515: Reading inode (128) - 64, 0
-	fs/xfs.c:515: Reading inode (128) - 64, 0
-	fs/xfs.c:515: Reading inode (131) - 64, 768
-	efi/ fs/xfs.c:515: Reading inode (3145856) - 1464904, 0
-	grub2/ fs/xfs.c:515: Reading inode (132) - 64, 1024
-	grub/ fs/xfs.c:515: Reading inode (139) - 64, 2816
-	grub>
-
-Fixes: 8b1e5d193 (fs/xfs: Add bigtime incompat feature support)
-
-Signed-off-by: Erwan Velu <e.velu@criteo.com>
-Tested-by: Carlos Maiolino <cmaiolino@redhat.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit a4b495520e4dc41a896a8b916a64eda9970c50ea)
----
- grub-core/fs/xfs.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
-index 0f524c3a8a..e3816d1ec4 100644
---- a/grub-core/fs/xfs.c
-+++ b/grub-core/fs/xfs.c
-@@ -192,6 +192,11 @@ struct grub_xfs_time_legacy
-   grub_uint32_t nanosec;
- } GRUB_PACKED;
- 
-+/*
-+ * The struct grub_xfs_inode layout was taken from the
-+ * struct xfs_dinode_core which is described here:
-+ * https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/docs/xfs_filesystem_structure.pdf
-+ */
- struct grub_xfs_inode
- {
-   grub_uint8_t magic[2];
-@@ -208,14 +213,15 @@ struct grub_xfs_inode
-   grub_uint32_t nextents;
-   grub_uint16_t unused3;
-   grub_uint8_t fork_offset;
--  grub_uint8_t unused4[37];
-+  grub_uint8_t unused4[17]; /* Last member of inode v2. */
-+  grub_uint8_t unused5[20]; /* First member of inode v3. */
-   grub_uint64_t flags2;
--  grub_uint8_t unused5[48];
-+  grub_uint8_t unused6[48]; /* Last member of inode v3. */
- } GRUB_PACKED;
- 
- #define XFS_V3_INODE_SIZE	sizeof(struct grub_xfs_inode)
--/* Size of struct grub_xfs_inode until fork_offset (included). */
--#define XFS_V2_INODE_SIZE	(XFS_V3_INODE_SIZE - 92)
-+/* Size of struct grub_xfs_inode v2, up to unused4 member included. */
-+#define XFS_V2_INODE_SIZE	(XFS_V3_INODE_SIZE - 76)
- 
- struct grub_xfs_dirblock_tail
- {
diff --git a/0194-Fix-missing-include-in-ofdisk.c.patch b/0194-Fix-missing-include-in-ofdisk.c.patch
new file mode 100644
index 00000000..a2b90476
--- /dev/null
+++ b/0194-Fix-missing-include-in-ofdisk.c.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Fri, 29 Sep 2023 10:56:11 -0400
+Subject: [PATCH] Fix missing #include in ofdisk.c
+
+Recently we started building with -Werror=implicit-function-declaration,
+and discovered that ofdisk.c is missing an include to declare
+grub_env_get().
+
+This patch adds that #include.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/disk/ieee1275/ofdisk.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
+index b413822bb87..57624fde55c 100644
+--- a/grub-core/disk/ieee1275/ofdisk.c
++++ b/grub-core/disk/ieee1275/ofdisk.c
+@@ -24,6 +24,7 @@
+ #include <grub/ieee1275/ofdisk.h>
+ #include <grub/i18n.h>
+ #include <grub/time.h>
++#include <grub/env.h>
+ 
+ static char *last_devpath;
+ static grub_ieee1275_ihandle_t last_ihandle;
diff --git a/0194-Print-module-name-on-license-check-failure.patch b/0194-Print-module-name-on-license-check-failure.patch
deleted file mode 100644
index 5c308593..00000000
--- a/0194-Print-module-name-on-license-check-failure.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 12 Oct 2021 12:34:23 -0400
-Subject: [PATCH] Print module name on license check failure
-
-At the very least, this will make it easier to track down the problem
-module - or, if something else has gone wrong, provide more information
-for debugging.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- grub-core/kern/dl.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 9557254035..f304494574 100644
---- a/grub-core/kern/dl.c
-+++ b/grub-core/kern/dl.c
-@@ -528,14 +528,16 @@ grub_dl_find_section_index (Elf_Ehdr *e, const char *name)
-    Be sure to understand your license obligations.
- */
- static grub_err_t
--grub_dl_check_license (Elf_Ehdr *e)
-+grub_dl_check_license (grub_dl_t mod, Elf_Ehdr *e)
- {
-   Elf_Shdr *s = grub_dl_find_section (e, ".module_license");
-   if (s && (grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv3") == 0
- 	    || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv3+") == 0
- 	    || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv2+") == 0))
-     return GRUB_ERR_NONE;
--  return grub_error (GRUB_ERR_BAD_MODULE, "incompatible license");
-+  return grub_error (GRUB_ERR_BAD_MODULE,
-+		     "incompatible license in module %s: %s", mod->name,
-+		     (char *) e + s->sh_offset);
- }
- 
- static grub_err_t
-@@ -743,8 +745,8 @@ grub_dl_load_core_noinit (void *addr, grub_size_t size)
-      constitutes linking) and GRUB core being licensed under GPLv3+.
-      Be sure to understand your license obligations.
-   */
--  if (grub_dl_check_license (e)
--      || grub_dl_resolve_name (mod, e)
-+  if (grub_dl_resolve_name (mod, e)
-+      || grub_dl_check_license (mod, e)
-       || grub_dl_resolve_dependencies (mod, e)
-       || grub_dl_load_segments (mod, e)
-       || grub_dl_resolve_symbols (mod, e)
diff --git a/0195-add-flag-to-only-search-root-dev.patch b/0195-add-flag-to-only-search-root-dev.patch
new file mode 100644
index 00000000..9061f39b
--- /dev/null
+++ b/0195-add-flag-to-only-search-root-dev.patch
@@ -0,0 +1,160 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Marta Lewandowska <mlewando@redhat.com>
+Date: Mon, 9 Oct 2023 08:53:18 +0200
+Subject: [PATCH] add flag to only search root dev
+
+fixes bz#2223437
+
+Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
+---
+ grub-core/commands/search.c      | 36 ++++++++++++++++++++++++++++++++++++
+ grub-core/commands/search_wrap.c |  5 +++++
+ grub-core/kern/misc.c            | 30 ++++++++++++++++++++++++++++++
+ include/grub/misc.h              |  1 +
+ include/grub/search.h            |  3 ++-
+ 5 files changed, 74 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
+index 263f1501cdf..db8692ffbfb 100644
+--- a/grub-core/commands/search.c
++++ b/grub-core/commands/search.c
+@@ -86,6 +86,42 @@ iterate_device (const char *name, void *data)
+       grub_device_close (dev);
+     }
+ 
++  /* Skip it if it's not the root device when requested. */
++  if (ctx->flags & SEARCH_FLAGS_ROOTDEV_ONLY)
++    {
++      const char *root_dev;
++      root_dev = grub_env_get ("root");
++      if (root_dev != NULL && *root_dev != '\0')
++      {
++        char *root_disk = grub_malloc (grub_strlen(root_dev) + 1);
++        char *name_disk = grub_malloc (grub_strlen(name) + 1);
++        char *rem_1 = grub_malloc(grub_strlen(root_dev) + 1);
++        char *rem_2 = grub_malloc(grub_strlen(name) + 1);
++
++	if (root_disk != NULL && name_disk != NULL && 
++	    rem_1 != NULL && rem_2 != NULL)
++  	  {
++            /* get just the disk name; partitions will be different. */
++            grub_str_sep (root_dev, root_disk, ',', rem_1);
++            grub_str_sep (name, name_disk, ',', rem_2);
++            if (root_disk != NULL && *root_disk != '\0' &&
++    	        name_disk != NULL && *name_disk != '\0')
++              if (grub_strcmp(root_disk, name_disk) != 0)
++                {
++                  grub_free (root_disk);
++                  grub_free (name_disk);
++                  grub_free (rem_1);
++                  grub_free (rem_2);
++                  return 0;
++                }
++	  }
++        grub_free (root_disk);
++        grub_free (name_disk);
++        grub_free (rem_1);
++        grub_free (rem_2);
++      }
++    }
++
+ #ifdef DO_SEARCH_FS_UUID
+ #define compare_fn grub_strcasecmp
+ #else
+diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
+index 318581f3b1e..4fe6440c65b 100644
+--- a/grub-core/commands/search_wrap.c
++++ b/grub-core/commands/search_wrap.c
+@@ -41,6 +41,7 @@ static const struct grub_arg_option options[] =
+      ARG_TYPE_STRING},
+     {"no-floppy",	'n', 0, N_("Do not probe any floppy drive."), 0, 0},
+     {"efidisk-only",	0, 0, N_("Only probe EFI disks."), 0, 0},
++    {"root-dev-only",  'r', 0, N_("Only probe root device."), 0, 0},
+     {"hint",	        'h', GRUB_ARG_OPTION_REPEATABLE,
+      N_("First try the device HINT. If HINT ends in comma, "
+ 	"also try subpartitions"), N_("HINT"), ARG_TYPE_STRING},
+@@ -75,6 +76,7 @@ enum options
+     SEARCH_SET,
+     SEARCH_NO_FLOPPY,
+     SEARCH_EFIDISK_ONLY,
++    SEARCH_ROOTDEV_ONLY,
+     SEARCH_HINT,
+     SEARCH_HINT_IEEE1275,
+     SEARCH_HINT_BIOS,
+@@ -189,6 +191,9 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
+   if (state[SEARCH_EFIDISK_ONLY].set)
+     flags |= SEARCH_FLAGS_EFIDISK_ONLY;
+ 
++  if (state[SEARCH_ROOTDEV_ONLY].set)
++    flags |= SEARCH_FLAGS_ROOTDEV_ONLY;
++
+   if (state[SEARCH_LABEL].set)
+     grub_search_label (id, var, flags, hints, nhints);
+   else if (state[SEARCH_FS_UUID].set)
+diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
+index f607244e7ae..96ab7c96b52 100644
+--- a/grub-core/kern/misc.c
++++ b/grub-core/kern/misc.c
+@@ -645,6 +645,36 @@ grub_reverse (char *str)
+     }
+ }
+ 
++/* Separate string into two parts, broken up by delimiter delim. */
++void
++grub_str_sep (const char *s, char *p, char delim, char *r)
++{
++  char* t = grub_strndup(s, grub_strlen(s));
++
++  if (t != NULL && *t != '\0')
++  {
++    char* tmp = t;
++  
++    while (((*p = *t) != '\0') && ((*p = *t) != delim))
++    {
++      p++;
++      t++;
++    }
++    *p = '\0';
++  
++    if (*t != '\0')
++    {
++      t++;
++      while ((*r++ = *t++) != '\0')
++        ;
++      *r = '\0';
++    }
++    grub_free (tmp);
++  }
++  else
++    grub_free (t);
++}
++
+ /* Divide N by D, return the quotient, and store the remainder in *R.  */
+ grub_uint64_t
+ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r)
+diff --git a/include/grub/misc.h b/include/grub/misc.h
+index c3c735371dc..3e9a00f0a9c 100644
+--- a/include/grub/misc.h
++++ b/include/grub/misc.h
+@@ -343,6 +343,7 @@ char *EXPORT_FUNC(grub_strdup) (const char *s) WARN_UNUSED_RESULT;
+ char *EXPORT_FUNC(grub_strndup) (const char *s, grub_size_t n) WARN_UNUSED_RESULT;
+ void *EXPORT_FUNC(grub_memset) (void *s, int c, grub_size_t n);
+ grub_size_t EXPORT_FUNC(grub_strlen) (const char *s) WARN_UNUSED_RESULT;
++void EXPORT_FUNC(grub_str_sep) (const char *s, char *p, char delim, char *r);
+ 
+ /* Replace all `ch' characters of `input' with `with' and copy the
+    result into `output'; return EOS address of `output'. */
+diff --git a/include/grub/search.h b/include/grub/search.h
+index ffd2411ca1a..9343c66b134 100644
+--- a/include/grub/search.h
++++ b/include/grub/search.h
+@@ -23,7 +23,8 @@ enum search_flags
+   {
+     SEARCH_FLAGS_NONE		= 0,
+     SEARCH_FLAGS_NO_FLOPPY	= 1,
+-    SEARCH_FLAGS_EFIDISK_ONLY	= 2
++    SEARCH_FLAGS_EFIDISK_ONLY	= 2,
++    SEARCH_FLAGS_ROOTDEV_ONLY	= 4
+   };
+ 
+ void grub_search_fs_file (const char *key, const char *var,
diff --git a/0196-cryptdisk-fix-incorrect-sign-comparison.patch b/0196-cryptdisk-fix-incorrect-sign-comparison.patch
new file mode 100644
index 00000000..dbb4fc2e
--- /dev/null
+++ b/0196-cryptdisk-fix-incorrect-sign-comparison.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jan 2024 15:44:27 -0500
+Subject: [PATCH] cryptdisk: fix incorrect sign comparison
+
+grub_util_get_fd_size() returns a signed integer, but we're assigning it
+to an unsigned integer and then testing against -1.  That's wrong.
+
+This patch makes the variable a signed integer.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/disk/cryptodisk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
+index 2246af51b6a..98e176a139c 100644
+--- a/grub-core/disk/cryptodisk.c
++++ b/grub-core/disk/cryptodisk.c
+@@ -721,7 +721,7 @@ grub_cryptodisk_open (const char *name, grub_disk_t disk)
+ #ifdef GRUB_UTIL
+   if (dev->cheat)
+     {
+-      grub_uint64_t cheat_dev_size;
++      grub_int64_t cheat_dev_size;
+       unsigned int cheat_log_sector_size;
+ 
+       if (!GRUB_UTIL_FD_IS_VALID (dev->cheat_fd))
diff --git a/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch b/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch
deleted file mode 100644
index 76b73f52..00000000
--- a/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Michael Chang via Grub-devel <grub-devel@gnu.org>
-Date: Fri, 3 Dec 2021 16:13:28 +0800
-Subject: [PATCH] grub-mkconfig: restore umask for grub.cfg
-
-Since commit:
-
-  ab2e53c8a grub-mkconfig: Honor a symlink when generating configuration
-by grub-mkconfig
-
-has inadvertently discarded umask for creating grub.cfg in the process
-of grub-mkconfig. The resulting wrong permission (0644) would allow
-unprivileged users to read grub's configuration file content. This
-presents a low confidentiality risk as grub.cfg may contain non-secured
-plain-text passwords.
-
-This patch restores the missing umask and set the file mode of creation
-to 0600 preventing unprivileged access.
-
-Fixes: CVE-2021-3981
-
-Signed-off-by: Michael Chang <mchang@suse.com>
----
- util/grub-mkconfig.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f55339a3f6..520a672cd2 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -311,7 +311,9 @@ and /etc/grub.d/* files or please file a bug report with
-     exit 1
-   else
-     # none of the children aborted with error, install the new grub.cfg
-+    oldumask=$(umask); umask 077
-     cat ${grub_cfg}.new > ${grub_cfg}
-+    umask $oldumask
-     rm -f ${grub_cfg}.new
-   fi
- fi
diff --git a/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch b/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch
deleted file mode 100644
index 3f7198f8..00000000
--- a/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Michael Chang <mchang@suse.com>
-Date: Mon, 13 Dec 2021 14:25:49 +0800
-Subject: [PATCH] fs/btrfs: Use full btrfs bootloader area
-
-Up to now GRUB can only embed to the first 64 KiB before primary
-superblock of btrfs, effectively limiting the GRUB core size. That
-could consequently pose restrictions to feature enablement like
-advanced zstd compression.
-
-This patch attempts to utilize full unused area reserved by btrfs for
-the bootloader outlined in the document [1]:
-
-  The first 1MiB on each device is unused with the exception of primary
-  superblock that is on the offset 64KiB and spans 4KiB.
-
-Apart from that, adjacent sectors to superblock and first block group
-are not used for embedding in case of overflow and logged access to
-adjacent sectors could be useful for tracing it up.
-
-This patch has been tested to provide out of the box support for btrfs
-zstd compression with which GRUB has been installed to the partition.
-
-[1] https://btrfs.wiki.kernel.org/index.php/Manpage/btrfs(5)#BOOTLOADER_SUPPORT
-
-Signed-off-by: Michael Chang <mchang@suse.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit b0f06a81c6f31b6fa20be67a96b6683bba8210c9)
----
- grub-core/fs/btrfs.c | 90 ++++++++++++++++++++++++++++++++++++++++++++--------
- include/grub/disk.h  |  2 ++
- 2 files changed, 79 insertions(+), 13 deletions(-)
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 4cc86e9b79..07c0ff874b 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -2476,6 +2476,33 @@ grub_btrfs_label (grub_device_t device, char **label)
- }
- 
- #ifdef GRUB_UTIL
-+
-+struct embed_region {
-+  unsigned int start;
-+  unsigned int secs;
-+};
-+
-+/*
-+ * https://btrfs.wiki.kernel.org/index.php/Manpage/btrfs(5)#BOOTLOADER_SUPPORT
-+ * The first 1 MiB on each device is unused with the exception of primary
-+ * superblock that is on the offset 64 KiB and spans 4 KiB.
-+ */
-+
-+static const struct {
-+  struct embed_region available;
-+  struct embed_region used[6];
-+} btrfs_head = {
-+  .available = {0, GRUB_DISK_KiB_TO_SECTORS (1024)}, /* The first 1 MiB. */
-+  .used = {
-+    {0, 1},                                                        /* boot.S. */
-+    {GRUB_DISK_KiB_TO_SECTORS (64) - 1, 1},                        /* Overflow guard. */
-+    {GRUB_DISK_KiB_TO_SECTORS (64), GRUB_DISK_KiB_TO_SECTORS (4)}, /* 4 KiB superblock. */
-+    {GRUB_DISK_KiB_TO_SECTORS (68), 1},                            /* Overflow guard. */
-+    {GRUB_DISK_KiB_TO_SECTORS (1024) - 1, 1},                      /* Overflow guard. */
-+    {0, 0}                                                         /* Array terminator. */
-+  }
-+};
-+
- static grub_err_t
- grub_btrfs_embed (grub_device_t device __attribute__ ((unused)),
- 		  unsigned int *nsectors,
-@@ -2483,25 +2510,62 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)),
- 		  grub_embed_type_t embed_type,
- 		  grub_disk_addr_t **sectors)
- {
--  unsigned i;
-+  unsigned int i, j, n = 0;
-+  const struct embed_region *u;
-+  grub_disk_addr_t *map;
- 
-   if (embed_type != GRUB_EMBED_PCBIOS)
-     return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
- 		       "BtrFS currently supports only PC-BIOS embedding");
- 
--  if (64 * 2 - 1 < *nsectors)
--    return grub_error (GRUB_ERR_OUT_OF_RANGE,
--		       N_("your core.img is unusually large.  "
--			  "It won't fit in the embedding area"));
--
--  *nsectors = 64 * 2 - 1;
--  if (*nsectors > max_nsectors)
--    *nsectors = max_nsectors;
--  *sectors = grub_calloc (*nsectors, sizeof (**sectors));
--  if (!*sectors)
-+  map = grub_calloc (btrfs_head.available.secs, sizeof (*map));
-+  if (map == NULL)
-     return grub_errno;
--  for (i = 0; i < *nsectors; i++)
--    (*sectors)[i] = i + 1;
-+
-+  /*
-+   * Populating the map array so that it can be used to index if a disk
-+   * address is available to embed:
-+   *   - 0: available,
-+   *   - 1: unavailable.
-+   */
-+  for (u = btrfs_head.used; u->secs; ++u)
-+    {
-+      unsigned int end = u->start + u->secs;
-+
-+      if (end > btrfs_head.available.secs)
-+        end = btrfs_head.available.secs;
-+      for (i = u->start; i < end; ++i)
-+        map[i] = 1;
-+    }
-+
-+  /* Adding up n until it matches total size of available embedding area. */
-+  for (i = 0; i < btrfs_head.available.secs; ++i)
-+    if (map[i] == 0)
-+      n++;
-+
-+  if (n < *nsectors)
-+    {
-+      grub_free (map);
-+      return grub_error (GRUB_ERR_OUT_OF_RANGE,
-+		         N_("your core.img is unusually large.  "
-+			    "It won't fit in the embedding area"));
-+    }
-+
-+  if (n > max_nsectors)
-+    n = max_nsectors;
-+
-+  /*
-+   * Populating the array so that it can used to index disk block address for
-+   * an image file's offset to be embedded on disk (the unit is in sectors):
-+   *   - i: The disk block address relative to btrfs_head.available.start,
-+   *   - j: The offset in image file.
-+   */
-+  for (i = 0, j = 0; i < btrfs_head.available.secs && j < n; ++i)
-+    if (map[i] == 0)
-+      map[j++] = btrfs_head.available.start + i;
-+
-+  *nsectors = n;
-+  *sectors = map;
- 
-   return GRUB_ERR_NONE;
- }
-diff --git a/include/grub/disk.h b/include/grub/disk.h
-index f95aca929a..06210a7049 100644
---- a/include/grub/disk.h
-+++ b/include/grub/disk.h
-@@ -182,6 +182,8 @@ typedef struct grub_disk_memberlist *grub_disk_memberlist_t;
- /* Return value of grub_disk_native_sectors() in case disk size is unknown. */
- #define GRUB_DISK_SIZE_UNKNOWN	 0xffffffffffffffffULL
- 
-+#define GRUB_DISK_KiB_TO_SECTORS(x) ((x) << (10 - GRUB_DISK_SECTOR_BITS))
-+
- /* Convert sector number from one sector size to another. */
- static inline grub_disk_addr_t
- grub_convert_sector (grub_disk_addr_t sector,
diff --git a/0197-grub-install-fix-a-sign-comparison-error.patch b/0197-grub-install-fix-a-sign-comparison-error.patch
new file mode 100644
index 00000000..7b63b082
--- /dev/null
+++ b/0197-grub-install-fix-a-sign-comparison-error.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jan 2024 15:45:57 -0500
+Subject: [PATCH] grub-install: fix a sign comparison error
+
+This is a trivial sign comparison fix.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ util/grub-install-common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub-install-common.c b/util/grub-install-common.c
+index b58539111da..67afc2eedf4 100644
+--- a/util/grub-install-common.c
++++ b/util/grub-install-common.c
+@@ -368,7 +368,7 @@ char *grub_install_themes_directory = NULL;
+ int
+ grub_install_is_short_mbrgap_supported (void)
+ {
+-  int i, j;
++  unsigned int i, j;
+   static const char *whitelist[] =
+     {
+      "part_msdos", "biosdisk", "affs", "afs", "bfs", "archelp",
diff --git a/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch b/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch
deleted file mode 100644
index c3e45e4d..00000000
--- a/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: fluteze <fluteze@gmail.com>
-Date: Sat, 27 Nov 2021 10:54:44 -0600
-Subject: [PATCH] Add Fedora location of DejaVu SANS font
-
-In Fedora 35, and possibly earlier, grub would fail to configure with a
-complaint about DejaVu being "not found" even though it was installed.
-The DejaVu sans font search path is updated to reflect the
-distribution's current install path.
-
-Signed-off-by: Erik Edwards <fluteze@gmail.com>
-[rharwood@redhat.com: slight commit message edits]
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f069d84039..88e33e0f0c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1785,7 +1785,7 @@ fi
- 
- if test x"$starfield_excuse" = x; then
-    for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
--     for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
-+     for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype /usr/share/fonts/dejavu-sans-fonts; do
-         if test -f "$dir/DejaVuSans.$ext"; then
-           DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
-           break 2
diff --git a/0198-grub-mount-work-around-bad-integer-comparison.patch b/0198-grub-mount-work-around-bad-integer-comparison.patch
new file mode 100644
index 00000000..d303801a
--- /dev/null
+++ b/0198-grub-mount-work-around-bad-integer-comparison.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jan 2024 15:54:31 -0500
+Subject: [PATCH] grub-mount: work around bad integer comparison.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gcc says:
+
+  util/grub-mount.c: In function ‘fuse_read’:
+  util/grub-mount.c:273:11: error: comparison of integer expressions of different signedness: ‘off_t’ {aka ‘long int’} and ‘grub_off_t’ {aka ‘long unsigned int’} [-Werror=sign-compare]
+    273 |   if (off > file->size)
+        |           ^
+
+This is happening because grub_off_t is unsigned but the system's off_t is
+signed.
+
+That's too much work to fix today, so this patch works around it with
+tests and typecasting.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ util/grub-mount.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/util/grub-mount.c b/util/grub-mount.c
+index bf4c8b891be..d369e21666e 100644
+--- a/util/grub-mount.c
++++ b/util/grub-mount.c
+@@ -269,11 +269,17 @@ fuse_read (const char *path, char *buf, size_t sz, off_t off,
+ {
+   grub_file_t file = files[fi->fh];
+   grub_ssize_t size;
++  grub_off_t offset;
+ 
+-  if (off > file->size)
++  if (off < 0)
+     return -EINVAL;
+ 
+-  file->offset = off;
++  if ((grub_off_t)off > file->size)
++    return -EINVAL;
++
++  offset = (grub_off_t)off;
++
++  file->offset = offset;
+ 
+   size = grub_file_read (file, buf, sz);
+   if (size < 0)
diff --git a/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch b/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch
deleted file mode 100644
index 200cd51a..00000000
--- a/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 28 Jan 2022 11:30:32 +0100
-Subject: [PATCH] normal/menu: Don't show "Booting `%s'" msg when auto-booting
- with TIMEOUT_STYLE_HIDDEN
-
-When the user has asked the menu code to be hidden/quiet and the current
-entry is being autobooted because the timeout has expired don't show
-the "Booting `%s'" msg.
-
-This is necessary to let flicker-free boots really be flicker free,
-otherwise the "Booting `%s'" msg will kick the EFI fb into text mode
-and show the msg, breaking the flicker-free experience.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- grub-core/normal/menu.c | 24 ++++++++++++++++--------
- 1 file changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index ec0c92bade..c8516a5a08 100644
---- a/grub-core/normal/menu.c
-+++ b/grub-core/normal/menu.c
-@@ -606,13 +606,15 @@ print_countdown (struct grub_term_coordinate *pos, int n)
-    entry to be executed is a result of an automatic default selection because
-    of the timeout.  */
- static int
--run_menu (grub_menu_t menu, int nested, int *auto_boot)
-+run_menu (grub_menu_t menu, int nested, int *auto_boot, int *notify_boot)
- {
-   grub_uint64_t saved_time;
-   int default_entry, current_entry;
-   int timeout;
-   enum timeout_style timeout_style;
- 
-+  *notify_boot = 1;
-+
-   default_entry = get_entry_number (menu, "default");
- 
-   /* If DEFAULT_ENTRY is not within the menu entries, fall back to
-@@ -687,6 +689,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
-   if (timeout == 0)
-     {
-       *auto_boot = 1;
-+      *notify_boot = timeout_style != TIMEOUT_STYLE_HIDDEN;
-       return default_entry;
-     }
- 
-@@ -840,12 +843,16 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
- 
- /* Callback invoked immediately before a menu entry is executed.  */
- static void
--notify_booting (grub_menu_entry_t entry,
--		void *userdata __attribute__((unused)))
-+notify_booting (grub_menu_entry_t entry, void *userdata)
- {
--  grub_printf ("  ");
--  grub_printf_ (N_("Booting `%s'"), entry->title);
--  grub_printf ("\n\n");
-+  int *notify_boot = userdata;
-+
-+  if (*notify_boot)
-+    {
-+      grub_printf ("  ");
-+      grub_printf_ (N_("Booting `%s'"), entry->title);
-+      grub_printf ("\n\n");
-+    }
- }
- 
- /* Callback invoked when a default menu entry executed because of a timeout
-@@ -893,8 +900,9 @@ show_menu (grub_menu_t menu, int nested, int autobooted)
-       int boot_entry;
-       grub_menu_entry_t e;
-       int auto_boot;
-+      int notify_boot;
- 
--      boot_entry = run_menu (menu, nested, &auto_boot);
-+      boot_entry = run_menu (menu, nested, &auto_boot, &notify_boot);
-       if (boot_entry < 0)
- 	break;
- 
-@@ -906,7 +914,7 @@ show_menu (grub_menu_t menu, int nested, int autobooted)
- 
-       if (auto_boot)
- 	grub_menu_execute_with_fallback (menu, e, autobooted,
--					 &execution_callback, 0);
-+					 &execution_callback, &notify_boot);
-       else
- 	grub_menu_execute_entry (e, 0);
-       if (autobooted)
diff --git a/0199-power-Fix-use-after-free-in-get_slave_from_dm.patch b/0199-power-Fix-use-after-free-in-get_slave_from_dm.patch
new file mode 100644
index 00000000..b4520e7d
--- /dev/null
+++ b/0199-power-Fix-use-after-free-in-get_slave_from_dm.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jan 2024 16:03:54 -0500
+Subject: [PATCH] power: Fix use after free in get_slave_from_dm()
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/osdep/linux/ofpath.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c
+index cc849d9c94c..72772c87a66 100644
+--- a/grub-core/osdep/linux/ofpath.c
++++ b/grub-core/osdep/linux/ofpath.c
+@@ -775,6 +775,8 @@ get_slave_from_dm(const char * device){
+ 
+     device_path = grub_xasprintf ("/sys/block/%s/slaves", curr_device);
+     dp = opendir(device_path);
++    if (dp == NULL)
++      grub_util_warn (_("cannot open directory `%s'"), device_path);
+     free(device_path);
+ 
+     if (dp != NULL)
+@@ -800,8 +802,6 @@ get_slave_from_dm(const char * device){
+       }
+       closedir (dp);
+     }
+-    else
+-      grub_util_warn (_("cannot open directory `%s'"), device_path);
+   }
+ 
+   free (directory);
diff --git a/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch b/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch
deleted file mode 100644
index 0f99c229..00000000
--- a/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 28 Jan 2022 11:30:33 +0100
-Subject: [PATCH] EFI: suppress the "Welcome to GRUB!" message in EFI builds
-
-Grub EFI builds are now often used in combination with flicker-free
-boot, but this breaks with upstream grub because the "Welcome to GRUB!"
-message will kick the EFI fb into text mode and show the msg,
-breaking the flicker-free experience.
-
-EFI systems are so fast, that when the menu or the countdown are enabled
-the message will be immediately overwritten, so in these cases not
-printing the message does not matter.
-
-And in case when the timeout_style is set to TIMEOUT_STYLE_HIDDEN,
-the user has asked grub to be quiet (for example to allow flickfree
-boot) annd thus the message should not be printed.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- grub-core/kern/main.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 3fc3401472..993b8a8598 100644
---- a/grub-core/kern/main.c
-+++ b/grub-core/kern/main.c
-@@ -317,10 +317,13 @@ grub_main (void)
- 
-   grub_boot_time ("After machine init.");
- 
-+  /* This breaks flicker-free boot on EFI systems, so disable it there. */
-+#ifndef GRUB_MACHINE_EFI
-   /* Hello.  */
-   grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
-   grub_printf ("Welcome to GRUB!\n\n");
-   grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
-+#endif
- 
-   /* Init verifiers API. */
-   grub_verifiers_init ();
diff --git a/0200-Fix-some-sign-comparison-errors.patch b/0200-Fix-some-sign-comparison-errors.patch
new file mode 100644
index 00000000..a3e5b250
--- /dev/null
+++ b/0200-Fix-some-sign-comparison-errors.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jan 2024 19:08:33 -0500
+Subject: [PATCH] Fix some sign comparison errors
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/loader/i386/pc/truecrypt.c | 2 +-
+ grub-core/loader/multiboot_elfxx.c   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/loader/i386/pc/truecrypt.c b/grub-core/loader/i386/pc/truecrypt.c
+index bae1ad031b3..7bf801603f4 100644
+--- a/grub-core/loader/i386/pc/truecrypt.c
++++ b/grub-core/loader/i386/pc/truecrypt.c
+@@ -176,7 +176,7 @@ grub_cmd_truecrypt (grub_command_t cmd __attribute__ ((unused)),
+ 
+   edx = (dh << 8) | grub_get_root_biosnumber ();
+ 
+-  destaddr = ALIGN_DOWN (grub_min (0x90000, grub_mmap_get_lower ())
++  destaddr = ALIGN_DOWN (grub_min (0x90000ull, grub_mmap_get_lower ())
+ 			 - truecryptmemsize, 64 * 1024);
+ 
+   {
+diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
+index 8d370b0b3f5..24480df5053 100644
+--- a/grub-core/loader/multiboot_elfxx.c
++++ b/grub-core/loader/multiboot_elfxx.c
+@@ -99,7 +99,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
+     return err;
+ 
+   /* FIXME: Should we support program headers at strange locations?  */
+-  phlimit = grub_min (MULTIBOOT_SEARCH, grub_file_size (mld->file));
++  phlimit = grub_min ((grub_off_t)MULTIBOOT_SEARCH, grub_file_size (mld->file));
+   if ((grub_off_t) ehdr->e_phoff + phnum * ehdr->e_phentsize > phlimit)
+     return grub_error (GRUB_ERR_BAD_OS, "program header at a too high offset");
+ 
diff --git a/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch b/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch
deleted file mode 100644
index ade6aae0..00000000
--- a/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 28 Jan 2022 12:43:48 +0100
-Subject: [PATCH] EFI: console: Do not set colorstate until the first text
- output
-
-GRUB_MOD_INIT(normal) does an unconditional:
-
-grub_env_set ("color_normal", "light-gray/black");
-
-which triggers a grub_term_setcolorstate() call. The original version
-of the "efi/console: Do not set text-mode until we actually need it" patch:
-https://lists.gnu.org/archive/html/grub-devel/2018-03/msg00125.html
-
-Protected against this by caching the requested state in
-grub_console_setcolorstate () and then only applying it when the first
-text output actually happens. During refactoring to move the
-grub_console_setcolorstate () up higher in the grub-core/term/efi/console.c
-file the code to cache the color-state + bail early was accidentally
-dropped.
-
-Restore the cache the color-state + bail early behavior from the original.
-
-Cc: Javier Martinez Canillas <javierm@redhat.com>
-Fixes: 2d7c3abd871f ("efi/console: Do not set text-mode until we actually need it")
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- grub-core/term/efi/console.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
-index 2f1ae85ba7..c44b2ac318 100644
---- a/grub-core/term/efi/console.c
-+++ b/grub-core/term/efi/console.c
-@@ -82,6 +82,16 @@ grub_console_setcolorstate (struct grub_term_output *term
- {
-   grub_efi_simple_text_output_interface_t *o;
- 
-+  if (grub_efi_is_finished || text_mode != GRUB_TEXT_MODE_AVAILABLE)
-+    {
-+      /*
-+       * Cache colorstate changes before the first text-output, this avoids
-+       * "color_normal" environment writes causing a switch to textmode.
-+       */
-+      text_colorstate = state;
-+      return;
-+    }
-+
-   if (grub_efi_is_finished)
-     return;
- 
diff --git a/0201-normal-Fix-a-discarded-const.patch b/0201-normal-Fix-a-discarded-const.patch
new file mode 100644
index 00000000..57598db1
--- /dev/null
+++ b/0201-normal-Fix-a-discarded-const.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jan 2024 19:12:15 -0500
+Subject: [PATCH] normal: Fix a discarded const.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/normal/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index e903f291732..803b9656d36 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -406,7 +406,7 @@ grub_try_normal_dev (const char *name, void *data)
+ static grub_err_t
+ grub_try_normal_discover (void)
+ {
+-  char *prefix = grub_env_get ("prefix");
++  const char *prefix = grub_env_get ("prefix");
+   grub_err_t err = GRUB_ERR_FILE_NOT_FOUND;
+ 
+   if (!prefix)
diff --git a/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch b/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch
deleted file mode 100644
index 5fab5db8..00000000
--- a/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 28 Jan 2022 12:43:49 +0100
-Subject: [PATCH] EFI: console: Do not set cursor until the first text output
-
-To allow flickerfree boot the EFI console code does not call
-grub_efi_set_text_mode (1) until some text is actually output.
-
-Depending on if the output text is because of an error loading
-e.g. the .cfg file; or because of showing the menu the cursor needs
-to be on or off when the first text is shown.
-
-So far the cursor was hardcoded to being on, but this is causing
-drawing artifacts + slow drawing of the menu as reported here:
-https://bugzilla.redhat.com/show_bug.cgi?id=1946969
-
-Handle the cursorstate in the same way as the colorstate to fix this,
-when no text has been output yet, just cache the cursorstate and
-then use the last set value when the first text is output.
-
-Fixes: 2d7c3abd871f ("efi/console: Do not set text-mode until we actually need it")
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- grub-core/term/efi/console.c | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
-index c44b2ac318..a3622e4fe5 100644
---- a/grub-core/term/efi/console.c
-+++ b/grub-core/term/efi/console.c
-@@ -31,7 +31,15 @@ typedef enum {
- }
- grub_text_mode;
- 
-+typedef enum {
-+    GRUB_CURSOR_MODE_UNDEFINED = -1,
-+    GRUB_CURSOR_MODE_OFF = 0,
-+    GRUB_CURSUR_MODE_ON
-+}
-+grub_cursor_mode;
-+
- static grub_text_mode text_mode = GRUB_TEXT_MODE_UNDEFINED;
-+static grub_cursor_mode cursor_mode = GRUB_CURSOR_MODE_UNDEFINED;
- static grub_term_color_state text_colorstate = GRUB_TERM_COLOR_UNDEFINED;
- 
- static grub_uint32_t
-@@ -119,8 +127,12 @@ grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),
- {
-   grub_efi_simple_text_output_interface_t *o;
- 
--  if (grub_efi_is_finished)
--    return;
-+  if (grub_efi_is_finished || text_mode != GRUB_TEXT_MODE_AVAILABLE)
-+    {
-+      /* Cache cursor changes before the first text-output */
-+      cursor_mode = on;
-+      return;
-+    }
- 
-   o = grub_efi_system_table->con_out;
-   efi_call_2 (o->enable_cursor, o, on);
-@@ -143,7 +155,8 @@ grub_prepare_for_text_output (struct grub_term_output *term)
-       return GRUB_ERR_BAD_DEVICE;
-     }
- 
--  grub_console_setcursor (term, 1);
-+  if (cursor_mode != GRUB_CURSOR_MODE_UNDEFINED)
-+    grub_console_setcursor (term, cursor_mode);
-   if (text_colorstate != GRUB_TERM_COLOR_UNDEFINED)
-     grub_console_setcolorstate (term, text_colorstate);
-   text_mode = GRUB_TEXT_MODE_AVAILABLE;
diff --git a/0202-at_keyboard-mark-grub_keyboard_controller_write-unus.patch b/0202-at_keyboard-mark-grub_keyboard_controller_write-unus.patch
new file mode 100644
index 00000000..058340d7
--- /dev/null
+++ b/0202-at_keyboard-mark-grub_keyboard_controller_write-unus.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 8 Jan 2024 19:14:06 -0500
+Subject: [PATCH] at_keyboard: mark grub_keyboard_controller_write unused
+
+It's used sometimes and not others by #ifdef, so mark it unused so the
+compiler doesn't complain.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/term/at_keyboard.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
+index e667d0a862c..d2b716b5b4f 100644
+--- a/grub-core/term/at_keyboard.c
++++ b/grub-core/term/at_keyboard.c
+@@ -93,7 +93,7 @@ at_command (grub_uint8_t data)
+   return (i != GRUB_AT_TRIES);
+ }
+ 
+-static void
++static void __attribute__((__unused__))
+ grub_keyboard_controller_write (grub_uint8_t c)
+ {
+   at_command (KEYBOARD_COMMAND_WRITE);
+@@ -170,7 +170,7 @@ query_mode (void)
+   grub_uint64_t endtime;
+   unsigned i;
+   int e;
+-  char *envvar;
++  const char *envvar;
+ 
+   for (i = 0; i < GRUB_AT_TRIES; i++) {
+     grub_dprintf ("atkeyb", "query_mode: sending command to controller\n");
diff --git a/0203-Fix-another-minor-sign-comparison-error.patch b/0203-Fix-another-minor-sign-comparison-error.patch
new file mode 100644
index 00000000..24c343cc
--- /dev/null
+++ b/0203-Fix-another-minor-sign-comparison-error.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 9 Jan 2024 14:37:25 -0500
+Subject: [PATCH] Fix another minor sign comparison error.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/kern/mm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
+index 1aeeba9e27e..819bc5126a6 100644
+--- a/grub-core/kern/mm.c
++++ b/grub-core/kern/mm.c
+@@ -505,7 +505,7 @@ grub_memalign (grub_size_t align, grub_size_t size)
+ 	goto fail;
+ 
+       /* Preallocate some extra space if heap growth is small. */
+-      grow = grub_max (grow, GRUB_MM_HEAP_GROW_EXTRA);
++      grow = grub_max (grow, (grub_size_t)GRUB_MM_HEAP_GROW_EXTRA);
+ 
+       /* Align up heap growth to make it friendly to CPU/MMU. */
+       if (grow > ~(grub_size_t) (GRUB_MM_HEAP_GROW_ALIGN - 1))
diff --git a/0203-Use-visual-indentation-in-config.h.in.patch b/0203-Use-visual-indentation-in-config.h.in.patch
deleted file mode 100644
index 978eb078..00000000
--- a/0203-Use-visual-indentation-in-config.h.in.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 15 Dec 2021 15:46:13 -0500
-Subject: [PATCH] Use visual indentation in config.h.in
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit de8051f34de0aa55c921a510974e5bb27e39c17b)
-[rharwood: GRUB_RPM_CONFIG presence]
----
- config.h.in | 58 +++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 29 insertions(+), 29 deletions(-)
-
-diff --git a/config.h.in b/config.h.in
-index c80e3e0aba..f2ed0066ec 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -23,47 +23,47 @@
- #define MINILZO_CFG_SKIP_LZO1X_DECOMPRESS 1
- 
- #if defined (GRUB_BUILD)
--#undef ENABLE_NLS
--#define BUILD_SIZEOF_LONG @BUILD_SIZEOF_LONG@
--#define BUILD_SIZEOF_VOID_P @BUILD_SIZEOF_VOID_P@
--#if defined __APPLE__
--# if defined __BIG_ENDIAN__
--#  define BUILD_WORDS_BIGENDIAN 1
--# else
--#  define BUILD_WORDS_BIGENDIAN 0
--# endif
--#else
--#define BUILD_WORDS_BIGENDIAN @BUILD_WORDS_BIGENDIAN@
--#endif
-+#  undef ENABLE_NLS
-+#  define BUILD_SIZEOF_LONG @BUILD_SIZEOF_LONG@
-+#  define BUILD_SIZEOF_VOID_P @BUILD_SIZEOF_VOID_P@
-+#  if defined __APPLE__
-+#    if defined __BIG_ENDIAN__
-+#      define BUILD_WORDS_BIGENDIAN 1
-+#    else
-+#      define BUILD_WORDS_BIGENDIAN 0
-+#    endif
-+#  else /* !defined __APPLE__ */
-+#    define BUILD_WORDS_BIGENDIAN @BUILD_WORDS_BIGENDIAN@
-+#  endif /* !defined __APPLE__ */
- #elif defined (GRUB_UTIL) || !defined (GRUB_MACHINE)
--#include <config-util.h>
--#else
--#define HAVE_FONT_SOURCE @HAVE_FONT_SOURCE@
-+#  include <config-util.h>
-+#else /* !defined GRUB_UTIL && defined GRUB_MACHINE */
-+#  define HAVE_FONT_SOURCE @HAVE_FONT_SOURCE@
- /* Define if C symbols get an underscore after compilation. */
--#define HAVE_ASM_USCORE @HAVE_ASM_USCORE@
-+#  define HAVE_ASM_USCORE @HAVE_ASM_USCORE@
- /* Define it to one of __bss_start, edata and _edata.  */
--#define BSS_START_SYMBOL @BSS_START_SYMBOL@
-+#  define BSS_START_SYMBOL @BSS_START_SYMBOL@
- /* Define it to either end or _end.  */
--#define END_SYMBOL @END_SYMBOL@
-+#  define END_SYMBOL @END_SYMBOL@
- /* Name of package.  */
--#define PACKAGE "@PACKAGE@"
-+#  define PACKAGE "@PACKAGE@"
- /* Version number of package.  */
--#define VERSION "@VERSION@"
-+#  define VERSION "@VERSION@"
- /* Define to the full name and version of this package. */
--#define PACKAGE_STRING "@PACKAGE_STRING@"
-+#  define PACKAGE_STRING "@PACKAGE_STRING@"
- /* Define to the version of this package. */
--#define PACKAGE_VERSION "@PACKAGE_VERSION@"
-+#  define PACKAGE_VERSION "@PACKAGE_VERSION@"
- /* Define to the full name of this package. */
--#define PACKAGE_NAME "@PACKAGE_NAME@"
-+#  define PACKAGE_NAME "@PACKAGE_NAME@"
- /* Define to the address where bug reports for this package should be sent. */
--#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
-+#  define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
- 
--#define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
--#define GRUB_PLATFORM "@GRUB_PLATFORM@"
--#define GRUB_RPM_VERSION "@GRUB_RPM_VERSION@"
-+#  define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
-+#  define GRUB_PLATFORM "@GRUB_PLATFORM@"
-+#  define GRUB_RPM_VERSION "@GRUB_RPM_VERSION@"
- 
--#define RE_ENABLE_I18N 1
-+#  define RE_ENABLE_I18N 1
- 
--#define _GNU_SOURCE 1
-+#  define _GNU_SOURCE 1
- 
- #endif
diff --git a/0204-Track-explicit-module-dependencies-in-Makefile.core..patch b/0204-Track-explicit-module-dependencies-in-Makefile.core..patch
new file mode 100644
index 00000000..c5311c1f
--- /dev/null
+++ b/0204-Track-explicit-module-dependencies-in-Makefile.core..patch
@@ -0,0 +1,124 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Oliver Steffen <osteffen@redhat.com>
+Date: Wed, 28 Feb 2024 13:36:00 +0100
+Subject: [PATCH] Track explicit module dependencies in Makefile.core.def
+
+Add a new keyword, "depends", to the module definition syntax
+used in Makefile.core.def. This allows specifying explicit module
+dependencies together with the module definition.
+
+Make use of this new keyword in the bli module definition.
+
+Signed-off-by: Oliver Steffen <osteffen@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Tested-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+---
+ grub-core/Makefile.core.def | 1 +
+ .gitignore                  | 1 -
+ conf/Makefile.common        | 1 +
+ gentpl.py                   | 7 +++++++
+ grub-core/Makefile.am       | 9 ++++++---
+ grub-core/genmoddep.awk     | 2 +-
+ 6 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index c9dcfa00e85..a5a3ee31800 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -2670,6 +2670,7 @@ module = {
+   name = bli;
+   efi = commands/bli.c;
+   enable = efi;
++  depends = part_gpt;
+ };
+ 
+ module = {
+diff --git a/.gitignore b/.gitignore
+index f2e8e1e42d7..c603c15d66c 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -11,7 +11,6 @@
+ *.img
+ *.log
+ *.lst
+-!/grub-core/extra_deps.lst
+ *.marker
+ *.mod
+ *.o
+diff --git a/conf/Makefile.common b/conf/Makefile.common
+index c8756d8146f..9feac7434da 100644
+--- a/conf/Makefile.common
++++ b/conf/Makefile.common
+@@ -115,6 +115,7 @@ MOD_FILES =
+ MODULE_FILES =
+ MARKER_FILES =
+ KERNEL_HEADER_FILES =
++EXTRA_DEPS =
+ 
+ bin_SCRIPTS =
+ bin_PROGRAMS =
+diff --git a/gentpl.py b/gentpl.py
+index 5826a6b14e8..0f8d009ef21 100644
+--- a/gentpl.py
++++ b/gentpl.py
+@@ -642,6 +642,9 @@ def platform_values(defn, platform, suffix):
+ def extra_dist(defn):
+     return foreach_value(defn, "extra_dist", lambda value: value + " ")
+ 
++def extra_dep(defn):
++    return foreach_value(defn, "depends", lambda value: value + " ")
++
+ def platform_sources(defn, p): return platform_values(defn, p, "")
+ def platform_nodist_sources(defn, p): return platform_values(defn, p, "_nodist")
+ 
+@@ -712,6 +715,10 @@ def module(defn, platform):
+     gvar_add("MOD_FILES", name + ".mod")
+     gvar_add("MARKER_FILES", name + ".marker")
+     gvar_add("CLEANFILES", name + ".marker")
++
++    for dep in defn.find_all("depends"):
++        gvar_add("EXTRA_DEPS", "depends " + name + " " + dep + ":")
++
+     output("""
+ """ + name + """.marker: $(""" + cname(defn) + """_SOURCES) $(nodist_""" + cname(defn) + """_SOURCES)
+ 	$(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(""" + cname(defn) + """_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1)
+diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
+index 7953ba95399..77f8329cd43 100644
+--- a/grub-core/Makefile.am
++++ b/grub-core/Makefile.am
+@@ -456,8 +456,11 @@ crypto.lst: $(srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
+ platform_DATA += crypto.lst
+ CLEANFILES += crypto.lst
+ 
+-syminfo.lst: gensyminfo.sh kernel_syms.lst $(top_srcdir)/grub-core/extra_deps.lst $(MODULE_FILES)
+-	cat kernel_syms.lst $(top_srcdir)/grub-core/extra_deps.lst > $@.new
++extra_deps.lst:
++	@echo $(EXTRA_DEPS) | sed "s/\s*:\s*/\n/g" > $@
++
++syminfo.lst: gensyminfo.sh kernel_syms.lst extra_deps.lst $(MODULE_FILES)
++	cat kernel_syms.lst extra_deps.lst > $@.new
+ 	for m in $(MODULE_FILES); do \
+ 	  sh $< $$m >> $@.new || exit 1; \
+ 	done
+@@ -467,7 +470,7 @@ syminfo.lst: gensyminfo.sh kernel_syms.lst $(top_srcdir)/grub-core/extra_deps.ls
+ moddep.lst: syminfo.lst genmoddep.awk video.lst
+ 	cat $< | sort | $(AWK) -f $(srcdir)/genmoddep.awk > $@ || (rm -f $@; exit 1)
+ platform_DATA += moddep.lst
+-CLEANFILES += config.log syminfo.lst moddep.lst
++CLEANFILES += config.log syminfo.lst moddep.lst extra_deps.lst
+ 
+ $(MOD_FILES): %.mod : genmod.sh moddep.lst %.module$(EXEEXT) build-grub-module-verifier$(BUILD_EXEEXT)
+ 	TARGET_OBJ2ELF=@TARGET_OBJ2ELF@ sh $^ $@
+diff --git a/grub-core/genmoddep.awk b/grub-core/genmoddep.awk
+index cc987a53aa8..ab457cb2b56 100644
+--- a/grub-core/genmoddep.awk
++++ b/grub-core/genmoddep.awk
+@@ -35,7 +35,7 @@ BEGIN {
+     for (i = 3; i <= NF; i++) {
+       modtab[$2] = modtab[$2] " " $i;
+     }
+-  }
++  } else if ($1 == "") {} #Skip empty lines
+   else {
+     printf "error: %u: unrecognized input format\n", NR >"/dev/stderr";
+     error++;
diff --git a/0204-Where-present-ensure-config-util.h-precedes-config.h.patch b/0204-Where-present-ensure-config-util.h-precedes-config.h.patch
deleted file mode 100644
index 626c4b4d..00000000
--- a/0204-Where-present-ensure-config-util.h-precedes-config.h.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 22 Feb 2022 16:57:54 -0500
-Subject: [PATCH] Where present, ensure config-util.h precedes config.h
-
-gnulib defines go in config-util.h, and we need to know whether to
-provide duplicates in config.h or not.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit 46e82b28e1a75703d0424c7e13d009171310c6cd)
-[rharwood: gensymlist isn't part of tarballs]
----
- grub-core/disk/host.c                | 2 +-
- grub-core/kern/emu/argp_common.c     | 2 +-
- grub-core/kern/emu/main.c            | 2 +-
- grub-core/osdep/aros/config.c        | 2 +-
- grub-core/osdep/basic/emunet.c       | 2 +-
- grub-core/osdep/basic/init.c         | 2 +-
- grub-core/osdep/haiku/getroot.c      | 2 +-
- grub-core/osdep/linux/emunet.c       | 2 +-
- grub-core/osdep/unix/config.c        | 2 +-
- grub-core/osdep/unix/cputime.c       | 2 +-
- grub-core/osdep/unix/dl.c            | 2 +-
- grub-core/osdep/unix/emuconsole.c    | 2 +-
- grub-core/osdep/unix/getroot.c       | 2 +-
- grub-core/osdep/windows/config.c     | 2 +-
- grub-core/osdep/windows/cputime.c    | 2 +-
- grub-core/osdep/windows/dl.c         | 2 +-
- grub-core/osdep/windows/emuconsole.c | 2 +-
- grub-core/osdep/windows/init.c       | 2 +-
- 18 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/grub-core/disk/host.c b/grub-core/disk/host.c
-index c151d225df..f34529f86a 100644
---- a/grub-core/disk/host.c
-+++ b/grub-core/disk/host.c
-@@ -20,8 +20,8 @@
- /* When using the disk, make a reference to this module.  Otherwise
-    the user will end up with a useless module :-).  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/dl.h>
- #include <grub/disk.h>
-diff --git a/grub-core/kern/emu/argp_common.c b/grub-core/kern/emu/argp_common.c
-index 1668858703..8cb4608c3d 100644
---- a/grub-core/kern/emu/argp_common.c
-+++ b/grub-core/kern/emu/argp_common.c
-@@ -17,8 +17,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #pragma GCC diagnostic ignored "-Wmissing-prototypes"
- #pragma GCC diagnostic ignored "-Wmissing-declarations"
-diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 846fe9715e..3e7929cc4a 100644
---- a/grub-core/kern/emu/main.c
-+++ b/grub-core/kern/emu/main.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <time.h>
- #include <stdio.h>
-diff --git a/grub-core/osdep/aros/config.c b/grub-core/osdep/aros/config.c
-index c82d0ea8e7..55f5728efc 100644
---- a/grub-core/osdep/aros/config.c
-+++ b/grub-core/osdep/aros/config.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/emu/hostdisk.h>
- #include <grub/emu/exec.h>
-diff --git a/grub-core/osdep/basic/emunet.c b/grub-core/osdep/basic/emunet.c
-index 6362e5cfbb..dbfd316d61 100644
---- a/grub-core/osdep/basic/emunet.c
-+++ b/grub-core/osdep/basic/emunet.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/i18n.h>
- #include <grub/emu/net.h>
-diff --git a/grub-core/osdep/basic/init.c b/grub-core/osdep/basic/init.c
-index c54c710dbc..b104c7e162 100644
---- a/grub-core/osdep/basic/init.c
-+++ b/grub-core/osdep/basic/init.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/util/misc.h>
- #include <grub/i18n.h>
-diff --git a/grub-core/osdep/haiku/getroot.c b/grub-core/osdep/haiku/getroot.c
-index 4e123c0903..927a1ebc94 100644
---- a/grub-core/osdep/haiku/getroot.c
-+++ b/grub-core/osdep/haiku/getroot.c
-@@ -1,5 +1,5 @@
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <string.h>
-diff --git a/grub-core/osdep/linux/emunet.c b/grub-core/osdep/linux/emunet.c
-index 19b188f09e..d5a6417355 100644
---- a/grub-core/osdep/linux/emunet.c
-+++ b/grub-core/osdep/linux/emunet.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <sys/socket.h>
- #include <sys/types.h>
-diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
-index 46a881530c..0ce0e309ac 100644
---- a/grub-core/osdep/unix/config.c
-+++ b/grub-core/osdep/unix/config.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/emu/hostdisk.h>
- #include <grub/emu/exec.h>
-diff --git a/grub-core/osdep/unix/cputime.c b/grub-core/osdep/unix/cputime.c
-index cff359a3b9..fb6ff55a1a 100644
---- a/grub-core/osdep/unix/cputime.c
-+++ b/grub-core/osdep/unix/cputime.c
-@@ -1,5 +1,5 @@
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <sys/times.h>
- #include <unistd.h>
-diff --git a/grub-core/osdep/unix/dl.c b/grub-core/osdep/unix/dl.c
-index 562b101a28..99b189bc1c 100644
---- a/grub-core/osdep/unix/dl.c
-+++ b/grub-core/osdep/unix/dl.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/dl.h>
- #include <grub/misc.h>
-diff --git a/grub-core/osdep/unix/emuconsole.c b/grub-core/osdep/unix/emuconsole.c
-index 7308798efe..cac159424d 100644
---- a/grub-core/osdep/unix/emuconsole.c
-+++ b/grub-core/osdep/unix/emuconsole.c
-@@ -17,8 +17,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/term.h>
- #include <grub/types.h>
-diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c
-index 46d7116c6e..4f436284ce 100644
---- a/grub-core/osdep/unix/getroot.c
-+++ b/grub-core/osdep/unix/getroot.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config-util.h>
- #include <config.h>
-+#include <config-util.h>
- 
- #include <sys/stat.h>
- #include <sys/types.h>
-diff --git a/grub-core/osdep/windows/config.c b/grub-core/osdep/windows/config.c
-index 928ab1a49b..2bb8a2fd88 100644
---- a/grub-core/osdep/windows/config.c
-+++ b/grub-core/osdep/windows/config.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/emu/hostfile.h>
- #include <grub/emu/config.h>
-diff --git a/grub-core/osdep/windows/cputime.c b/grub-core/osdep/windows/cputime.c
-index 3568aa2d35..5d06d79dd5 100644
---- a/grub-core/osdep/windows/cputime.c
-+++ b/grub-core/osdep/windows/cputime.c
-@@ -1,5 +1,5 @@
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/emu/misc.h>
- #include <windows.h>
-diff --git a/grub-core/osdep/windows/dl.c b/grub-core/osdep/windows/dl.c
-index eec6a24ad7..8eab7057e4 100644
---- a/grub-core/osdep/windows/dl.c
-+++ b/grub-core/osdep/windows/dl.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/dl.h>
- #include <grub/misc.h>
-diff --git a/grub-core/osdep/windows/emuconsole.c b/grub-core/osdep/windows/emuconsole.c
-index 4fb3693cc0..17a44de469 100644
---- a/grub-core/osdep/windows/emuconsole.c
-+++ b/grub-core/osdep/windows/emuconsole.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- 
- #include <grub/term.h>
- #include <grub/misc.h>
-diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c
-index 6297de6326..51a9647dde 100644
---- a/grub-core/osdep/windows/init.c
-+++ b/grub-core/osdep/windows/init.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <config.h>
- #include <config-util.h>
-+#include <config.h>
- #include <grub/util/misc.h>
- #include <grub/osdep/hostfile.h>
- #include <grub/util/windows.h>
diff --git a/0205-Drop-gnulib-fix-base64.patch.patch b/0205-Drop-gnulib-fix-base64.patch.patch
deleted file mode 100644
index 054e476e..00000000
--- a/0205-Drop-gnulib-fix-base64.patch.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Thu, 28 Oct 2021 15:07:50 -0400
-Subject: [PATCH] Drop gnulib fix-base64.patch
-
-Originally added in 9fbdec2f6b4fa8b549daa4d49134d1fe89d95ef9 and
-subsequently modified in 552c9fd08122a3036c724ce96dfe68aa2f75705f,
-fix-base64.patch handled two problems we have using gnulib, which are
-exerciesd by the base64 module but not directly caused by it.
-
-First, grub2 defines its own bool type, while gnulib expects the
-equivalent of stdbool.h to be present.  Rather than patching gnulib,
-instead use gnulib's stdbool module to provide a bool type if needed.
-(Suggested by Simon Josefsson.)
-
-Second, our config.h doesn't always inherit config-util.h, which is
-where gnulib-related options like _GL_ATTRIBUTE_CONST end up.
-fix-base64.h worked around this by defining the attribute away, but this
-workaround is better placed in config.h itself, not a gnulib patch.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit 54fd1c3301dd15f6b6212c12887265e8a6cbc076)
----
- grub-core/lib/posix_wrap/sys/types.h          |  7 +++----
- grub-core/lib/xzembed/xz.h                    |  5 +----
- bootstrap.conf                                |  3 ++-
- conf/Makefile.extra-dist                      |  1 -
- config.h.in                                   |  4 ++++
- grub-core/lib/gnulib-patches/fix-base64.patch | 21 ---------------------
- 6 files changed, 10 insertions(+), 31 deletions(-)
- delete mode 100644 grub-core/lib/gnulib-patches/fix-base64.patch
-
-diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h
-index f63412c8da..2f3e865495 100644
---- a/grub-core/lib/posix_wrap/sys/types.h
-+++ b/grub-core/lib/posix_wrap/sys/types.h
-@@ -23,11 +23,10 @@
- 
- #include <stddef.h>
- 
-+/* Provided by gnulib if not present. */
-+#include <stdbool.h>
-+
- typedef grub_ssize_t ssize_t;
--#ifndef GRUB_POSIX_BOOL_DEFINED
--typedef enum { false = 0, true = 1 } bool;
--#define GRUB_POSIX_BOOL_DEFINED 1
--#endif
- 
- typedef grub_uint8_t uint8_t;
- typedef grub_uint16_t uint16_t;
-diff --git a/grub-core/lib/xzembed/xz.h b/grub-core/lib/xzembed/xz.h
-index f7b32d8003..d1417039aa 100644
---- a/grub-core/lib/xzembed/xz.h
-+++ b/grub-core/lib/xzembed/xz.h
-@@ -29,10 +29,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <grub/misc.h>
--
--#ifndef GRUB_POSIX_BOOL_DEFINED
--typedef enum { false = 0, true = 1 } bool;
--#endif
-+#include <stdbool.h>
- 
- /**
-  * enum xz_ret - Return codes
-diff --git a/bootstrap.conf b/bootstrap.conf
-index 52d4af44be..645e3a459c 100644
---- a/bootstrap.conf
-+++ b/bootstrap.conf
-@@ -35,6 +35,7 @@ gnulib_modules="
-   realloc-gnu
-   regex
-   save-cwd
-+  stdbool
- "
- 
- gnulib_tool_option_extras="\
-@@ -79,7 +80,7 @@ cp -a INSTALL INSTALL.grub
- 
- bootstrap_post_import_hook () {
-   set -e
--  for patchname in fix-base64 fix-null-deref fix-null-state-deref fix-regcomp-uninit-token \
-+  for patchname in fix-null-deref fix-null-state-deref fix-regcomp-uninit-token \
-       fix-regexec-null-deref fix-uninit-structure fix-unused-value fix-width no-abort; do
-     patch -d grub-core/lib/gnulib -p2 \
-       < "grub-core/lib/gnulib-patches/$patchname.patch"
-diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index ad235de7fc..f4791dc6ca 100644
---- a/conf/Makefile.extra-dist
-+++ b/conf/Makefile.extra-dist
-@@ -31,7 +31,6 @@ EXTRA_DIST += grub-core/gensymlist.sh
- EXTRA_DIST += grub-core/genemuinit.sh
- EXTRA_DIST += grub-core/genemuinitheader.sh
- 
--EXTRA_DIST += grub-core/lib/gnulib-patches/fix-base64.patch
- EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch
- EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch
- EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
-diff --git a/config.h.in b/config.h.in
-index f2ed0066ec..9c7b4afaaa 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -66,4 +66,8 @@
- 
- #  define _GNU_SOURCE 1
- 
-+#  ifndef _GL_INLINE_HEADER_BEGIN
-+#    define _GL_ATTRIBUTE_CONST __attribute__ ((const))
-+#  endif /* !_GL_INLINE_HEADER_BEGIN */
-+
- #endif
-diff --git a/grub-core/lib/gnulib-patches/fix-base64.patch b/grub-core/lib/gnulib-patches/fix-base64.patch
-deleted file mode 100644
-index 985db12797..0000000000
---- a/grub-core/lib/gnulib-patches/fix-base64.patch
-+++ /dev/null
-@@ -1,21 +0,0 @@
--diff --git a/lib/base64.h b/lib/base64.h
--index 9cd0183b8..185a2afa1 100644
----- a/lib/base64.h
--+++ b/lib/base64.h
--@@ -21,8 +21,14 @@
-- /* Get size_t. */
-- # include <stddef.h>
-- 
---/* Get bool. */
---# include <stdbool.h>
--+#ifndef GRUB_POSIX_BOOL_DEFINED
--+typedef enum { false = 0, true = 1 } bool;
--+#define GRUB_POSIX_BOOL_DEFINED 1
--+#endif
--+
--+#ifndef _GL_ATTRIBUTE_CONST
--+# define _GL_ATTRIBUTE_CONST /* empty */
--+#endif
-- 
-- # ifdef __cplusplus
-- extern "C" {
diff --git a/0205-Revert-mm-Assert-that-we-preserve-header-vs-region-a.patch b/0205-Revert-mm-Assert-that-we-preserve-header-vs-region-a.patch
new file mode 100644
index 00000000..1a224b3d
--- /dev/null
+++ b/0205-Revert-mm-Assert-that-we-preserve-header-vs-region-a.patch
@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Fri, 8 Mar 2024 16:54:43 -0600
+Subject: [PATCH] Revert "mm: Assert that we preserve header vs region
+ alignment"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 1df8fe66c57087eb33bd6dc69f786ed124615aa7.
+
+This is temporal while we find the reason for
+
+In file included from ../../include/grub/mm_private.h:23,
+                 from ../../include/grub/relocator_private.h:24,
+                 from ../../grub-core/lib/efi/relocator.c:20:
+../../include/grub/mm_private.h: In function ‘grub_mm_size_sanity_check’:
+../../include/grub/misc.h:36:56: error: duplicate case value
+   36 | #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; }
+      |                                                        ^~~~
+../../include/grub/mm_private.h:105:3: note: in expansion of macro ‘COMPILE_TIME_ASSERT’
+  105 |   COMPILE_TIME_ASSERT ((sizeof (struct grub_mm_region) %
+      |   ^~~~~~~~~~~~~~~~~~~
+../../include/grub/misc.h:36:48: note: previously used here
+   36 | #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; }
+      |                                                ^~~~
+../../include/grub/mm_private.h:105:3: note: in expansion of macro ‘COMPILE_TIME_ASSERT’
+  105 |   COMPILE_TIME_ASSERT ((sizeof (struct grub_mm_region) %
+      |   ^~~~~~~~~~~~~~~~~~~
+../../include/grub/misc.h:36:56: error: duplicate case value
+   36 | #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; }
+      |                                                        ^~~~
+../../include/grub/mm_private.h:112:3: note: in expansion of macro ‘COMPILE_TIME_ASSERT’
+  112 |   COMPILE_TIME_ASSERT (sizeof (struct grub_mm_header) == GRUB_MM_ALIGN);
+      |   ^~~~~~~~~~~~~~~~~~~
+../../include/grub/misc.h:36:48: note: previously used here
+   36 | #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; }
+      |                                                ^~~~
+../../include/grub/mm_private.h:112:3: note: in expansion of macro ‘COMPILE_TIME_ASSERT’
+  112 |   COMPILE_TIME_ASSERT (sizeof (struct grub_mm_header) == GRUB_MM_ALIGN);
+      |   ^~~~~~~~~~~~~~~~~~~
+---
+ include/grub/mm_private.h | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/include/grub/mm_private.h b/include/grub/mm_private.h
+index 96c2d816be6..2481ee1fa20 100644
+--- a/include/grub/mm_private.h
++++ b/include/grub/mm_private.h
+@@ -20,7 +20,6 @@
+ #define GRUB_MM_PRIVATE_H	1
+ 
+ #include <grub/mm.h>
+-#include <grub/misc.h>
+ 
+ /* For context, see kern/mm.c */
+ 
+@@ -99,17 +98,4 @@ typedef struct grub_mm_region
+ extern grub_mm_region_t EXPORT_VAR (grub_mm_base);
+ #endif
+ 
+-static inline void
+-grub_mm_size_sanity_check (void) {
+-  /* Ensure we preserve alignment when doing h = (grub_mm_header_t) (r + 1). */
+-  COMPILE_TIME_ASSERT ((sizeof (struct grub_mm_region) %
+-		        sizeof (struct grub_mm_header)) == 0);
+-
+-  /*
+-   * GRUB_MM_ALIGN is supposed to represent cell size, and a mm_header is
+-   * supposed to be 1 cell.
+-   */
+-  COMPILE_TIME_ASSERT (sizeof (struct grub_mm_header) == GRUB_MM_ALIGN);
+-}
+-
+ #endif
diff --git a/0206-Drop-gnulib-no-abort.patch.patch b/0206-Drop-gnulib-no-abort.patch.patch
deleted file mode 100644
index a12789f3..00000000
--- a/0206-Drop-gnulib-no-abort.patch.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 5 Jan 2022 16:42:11 -0500
-Subject: [PATCH] Drop gnulib no-abort.patch
-
-Originally added in db7337a3d353a817ffe9eb4a3702120527100be9, this
-patched out all relevant invocations of abort() in gnulib.  While it was
-not documented why at the time, testing suggests that there's no abort()
-implementation available for gnulib to use.
-
-gnulib's position is that the use of abort() is correct here, since it
-happens when input violates a "shall" from POSIX.  Additionally, the
-code in question is probably not reachable.  Since abort() is more
-friendly to user-space, they prefer to make no change, so we can just
-carry a define instead.  (Suggested by Paul Eggert.)
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit 5137c8eb3ec11c3217acea1a93a3f88f3fa4cbca)
----
- bootstrap.conf                              |  2 +-
- conf/Makefile.extra-dist                    |  1 -
- config.h.in                                 |  3 +++
- grub-core/lib/gnulib-patches/no-abort.patch | 26 --------------------------
- 4 files changed, 4 insertions(+), 28 deletions(-)
- delete mode 100644 grub-core/lib/gnulib-patches/no-abort.patch
-
-diff --git a/bootstrap.conf b/bootstrap.conf
-index 645e3a459c..71ce943c7d 100644
---- a/bootstrap.conf
-+++ b/bootstrap.conf
-@@ -81,7 +81,7 @@ cp -a INSTALL INSTALL.grub
- bootstrap_post_import_hook () {
-   set -e
-   for patchname in fix-null-deref fix-null-state-deref fix-regcomp-uninit-token \
--      fix-regexec-null-deref fix-uninit-structure fix-unused-value fix-width no-abort; do
-+      fix-regexec-null-deref fix-uninit-structure fix-unused-value fix-width; do
-     patch -d grub-core/lib/gnulib -p2 \
-       < "grub-core/lib/gnulib-patches/$patchname.patch"
-   done
-diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index f4791dc6ca..5eef708338 100644
---- a/conf/Makefile.extra-dist
-+++ b/conf/Makefile.extra-dist
-@@ -38,7 +38,6 @@ EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
- EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch
- EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch
- EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch
--EXTRA_DIST += grub-core/lib/gnulib-patches/no-abort.patch
- 
- EXTRA_DIST += grub-core/lib/libgcrypt
- EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
-diff --git a/config.h.in b/config.h.in
-index 9c7b4afaaa..c3134309c6 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -68,6 +68,9 @@
- 
- #  ifndef _GL_INLINE_HEADER_BEGIN
- #    define _GL_ATTRIBUTE_CONST __attribute__ ((const))
-+
-+/* We don't have an abort() for gnulib to call in regexp. */
-+#    define abort __builtin_unreachable
- #  endif /* !_GL_INLINE_HEADER_BEGIN */
- 
- #endif
-diff --git a/grub-core/lib/gnulib-patches/no-abort.patch b/grub-core/lib/gnulib-patches/no-abort.patch
-deleted file mode 100644
-index e469c4762e..0000000000
---- a/grub-core/lib/gnulib-patches/no-abort.patch
-+++ /dev/null
-@@ -1,26 +0,0 @@
--diff --git a/lib/regcomp.c b/lib/regcomp.c
--index cc85f35ac..de45ebb5c 100644
----- a/lib/regcomp.c
--+++ b/lib/regcomp.c
--@@ -528,9 +528,9 @@ regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf,
--        to this routine.  If we are given anything else, or if other regex
--        code generates an invalid error code, then the program has a bug.
--        Dump core so we can fix it.  */
---    abort ();
---
---  msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
--+    msg = gettext ("unknown regexp error");
--+  else
--+    msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
-- 
--   msg_size = strlen (msg) + 1; /* Includes the null.  */
-- 
--@@ -1136,7 +1136,7 @@ optimize_utf8 (re_dfa_t *dfa)
-- 	}
-- 	break;
--       default:
---	abort ();
--+	break;
--       }
-- 
--   if (mb_chars || has_period)
diff --git a/0206-make-use-the-_CPU-variety-of-build-flags-for-PROGRAM.patch b/0206-make-use-the-_CPU-variety-of-build-flags-for-PROGRAM.patch
new file mode 100644
index 00000000..4f56149d
--- /dev/null
+++ b/0206-make-use-the-_CPU-variety-of-build-flags-for-PROGRAM.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 13 Mar 2024 15:11:15 -0600
+Subject: [PATCH] make: use the _CPU variety of build flags for PROGRAM and
+ LIBRARY
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ conf/Makefile.common | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/conf/Makefile.common b/conf/Makefile.common
+index 9feac7434da..f8c2f6bd881 100644
+--- a/conf/Makefile.common
++++ b/conf/Makefile.common
+@@ -60,15 +60,14 @@ LDFLAGS_IMAGE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-S
+ CPPFLAGS_IMAGE = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+ CCASFLAGS_IMAGE = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+ 
+-CFLAGS_PROGRAM = $(UTILS_CFLAGS)
+-LDFLAGS_PROGRAM = $(UTILS_LDFLAGS)
+-CPPFLAGS_PROGRAM = $(UTILS_CPPFLAGS)
+-CCASFLAGS_PROGRAM = $(UTILS_CCASFLAGS)
++CFLAGS_PROGRAM = $(CFLAGS_CPU)
++LDFLAGS_PROGRAM = $(LDFLAGS_CPU)
++CPPFLAGS_PROGRAM = $(CPPFLAGS_CPU)
++CCASFLAGS_PROGRAM = $(CCASFLAGS_CPU)
+ 
+-CFLAGS_LIBRARY = $(UTILS_CFLAGS)
+-LDFLAGS_LIBRARY = $(UTILS_LDFLAGS)
+-CPPFLAGS_LIBRARY = $(UTILS_CPPFLAGS)
+-CCASFLAGS_LIBRARY = $(UTILS_CCASFLAGS)
++CFLAGS_LIBRARY = $(CFLAGS_CPU)
++CPPFLAGS_LIBRARY = $(CPPFLAGS_CPU)
++CCASFLAGS_LIBRARY = $(CCASFLAGS_CPU)
+ 
+ # Other variables
+ 
diff --git a/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch b/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch
deleted file mode 100644
index f0e2cc02..00000000
--- a/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch
+++ /dev/null
@@ -1,832 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 15 Dec 2021 15:07:50 -0500
-Subject: [PATCH] Update gnulib version and drop most gnulib patches
-
-In addition to the changes carried in our gnulib patches, several
-Coverity and code hygiene fixes that were previously downstream are also
-included in this 3-year gnulib increment.
-
-Unfortunately, fix-width.patch is retained.
-
-Bump minimum autoconf version from 2.63 to 2.64 and automake from 1.11
-to 1.14, as required by gnulib.
-
-Sync bootstrap script itself with gnulib.
-
-Update regexp module for new dynarray dependency.
-
-Fix various new warnings.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit deb18ff931c3133c2aa536a92bd92e50d6615303)
-[rharwood: backport around requirements in INSTALL]
----
- configure.ac                                       |   2 +-
- grub-core/Makefile.core.def                        |   3 +
- grub-core/disk/luks2.c                             |   4 +-
- grub-core/lib/posix_wrap/limits.h                  |   6 +-
- include/grub/compiler.h                            |   4 +-
- include/grub/list.h                                |   2 +-
- INSTALL                                            |   2 +-
- bootstrap                                          | 291 ++++++++++++---------
- bootstrap.conf                                     |  22 +-
- conf/Makefile.extra-dist                           |   6 -
- config.h.in                                        |  68 +++++
- grub-core/lib/gnulib-patches/fix-null-deref.patch  |  13 -
- .../lib/gnulib-patches/fix-null-state-deref.patch  |  12 -
- .../gnulib-patches/fix-regcomp-uninit-token.patch  |  15 --
- .../gnulib-patches/fix-regexec-null-deref.patch    |  12 -
- .../lib/gnulib-patches/fix-uninit-structure.patch  |  11 -
- .../lib/gnulib-patches/fix-unused-value.patch      |  14 -
- 17 files changed, 262 insertions(+), 225 deletions(-)
- delete mode 100644 grub-core/lib/gnulib-patches/fix-null-deref.patch
- delete mode 100644 grub-core/lib/gnulib-patches/fix-null-state-deref.patch
- delete mode 100644 grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
- delete mode 100644 grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
- delete mode 100644 grub-core/lib/gnulib-patches/fix-uninit-structure.patch
- delete mode 100644 grub-core/lib/gnulib-patches/fix-unused-value.patch
-
-diff --git a/configure.ac b/configure.ac
-index 88e33e0f0c..871235b91b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -49,7 +49,7 @@ AC_CANONICAL_TARGET
- program_prefix="${save_program_prefix}"
- 
- AM_INIT_AUTOMAKE([1.11])
--AC_PREREQ(2.63)
-+AC_PREREQ(2.64)
- AC_CONFIG_SRCDIR([include/grub/dl.h])
- AC_CONFIG_HEADER([config-util.h])
- 
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 6b00eb5557..39233096f2 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -762,6 +762,9 @@ module = {
-   name = regexp;
-   common = commands/regexp.c;
-   common = commands/wildcard.c;
-+  common = lib/gnulib/malloc/dynarray_finalize.c;
-+  common = lib/gnulib/malloc/dynarray_emplace_enlarge.c;
-+  common = lib/gnulib/malloc/dynarray_resize.c;
-   common = lib/gnulib/regex.c;
-   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
-   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
-diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
-index 371a53b837..c917a5f91e 100644
---- a/grub-core/disk/luks2.c
-+++ b/grub-core/disk/luks2.c
-@@ -389,7 +389,7 @@ luks2_verify_key (grub_luks2_digest_t *d, grub_uint8_t *candidate_key,
- {
-   grub_uint8_t candidate_digest[GRUB_CRYPTODISK_MAX_KEYLEN];
-   grub_uint8_t digest[GRUB_CRYPTODISK_MAX_KEYLEN], salt[GRUB_CRYPTODISK_MAX_KEYLEN];
--  grub_size_t saltlen = sizeof (salt), digestlen = sizeof (digest);
-+  idx_t saltlen = sizeof (salt), digestlen = sizeof (digest);
-   const gcry_md_spec_t *hash;
-   gcry_err_code_t gcry_ret;
- 
-@@ -428,7 +428,7 @@ luks2_decrypt_key (grub_uint8_t *out_key,
-   grub_uint8_t area_key[GRUB_CRYPTODISK_MAX_KEYLEN];
-   grub_uint8_t salt[GRUB_CRYPTODISK_MAX_KEYLEN];
-   grub_uint8_t *split_key = NULL;
--  grub_size_t saltlen = sizeof (salt);
-+  idx_t saltlen = sizeof (salt);
-   char cipher[32], *p;
-   const gcry_md_spec_t *hash;
-   gcry_err_code_t gcry_ret;
-diff --git a/grub-core/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h
-index 591dbf3289..4be7b40806 100644
---- a/grub-core/lib/posix_wrap/limits.h
-+++ b/grub-core/lib/posix_wrap/limits.h
-@@ -25,7 +25,11 @@
- #define USHRT_MAX GRUB_USHRT_MAX
- #define UINT_MAX GRUB_UINT_MAX
- #define ULONG_MAX GRUB_ULONG_MAX
--#define SIZE_MAX GRUB_SIZE_MAX
-+
-+/* gnulib also defines this type */
-+#ifndef SIZE_MAX
-+#  define SIZE_MAX GRUB_SIZE_MAX
-+#endif
- 
- #define SCHAR_MIN GRUB_SCHAR_MIN
- #define SCHAR_MAX GRUB_SCHAR_MAX
-diff --git a/include/grub/compiler.h b/include/grub/compiler.h
-index ebafec6895..441a9eca07 100644
---- a/include/grub/compiler.h
-+++ b/include/grub/compiler.h
-@@ -30,10 +30,10 @@
- 
- /* Does this compiler support compile-time error attributes? */
- #if GNUC_PREREQ(4,3)
--#  define ATTRIBUTE_ERROR(msg) \
-+#  define GRUB_ATTRIBUTE_ERROR(msg) \
- 	__attribute__ ((__error__ (msg)))
- #else
--#  define ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
-+#  define GRUB_ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
- #endif
- 
- #if GNUC_PREREQ(4,4)
-diff --git a/include/grub/list.h b/include/grub/list.h
-index b13acb9624..21f4b4b44a 100644
---- a/include/grub/list.h
-+++ b/include/grub/list.h
-@@ -40,7 +40,7 @@ void EXPORT_FUNC(grub_list_remove) (grub_list_t item);
- 
- static inline void *
- grub_bad_type_cast_real (int line, const char *file)
--     ATTRIBUTE_ERROR ("bad type cast between incompatible grub types");
-+     GRUB_ATTRIBUTE_ERROR ("bad type cast between incompatible grub types");
- 
- static inline void *
- grub_bad_type_cast_real (int line, const char *file)
-diff --git a/INSTALL b/INSTALL
-index 79a0af7d93..ee9f536f76 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -42,7 +42,7 @@ If you use a development snapshot or want to hack on GRUB you may
- need the following.
- 
- * Python 2.6 or later
--* Autoconf 2.63 or later
-+* Autoconf 2.64 or later
- * Automake 1.11 or later
- 
- Prerequisites for make-check:
-diff --git a/bootstrap b/bootstrap
-index 5b08e7e2d4..dc2238f4ad 100755
---- a/bootstrap
-+++ b/bootstrap
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Print a version string.
--scriptversion=2019-01-04.17; # UTC
-+scriptversion=2022-01-26.05; # UTC
- 
- # Bootstrap this package from checked-out sources.
- 
--# Copyright (C) 2003-2019 Free Software Foundation, Inc.
-+# Copyright (C) 2003-2022 Free Software Foundation, Inc.
- 
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -47,7 +47,7 @@ PERL="${PERL-perl}"
- 
- me=$0
- 
--default_gnulib_url=git://git.sv.gnu.org/gnulib
-+default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git
- 
- usage() {
-   cat <<EOF
-@@ -71,7 +71,9 @@ Options:
-  --no-git                 do not use git to update gnulib.  Requires that
-                           --gnulib-srcdir point to a correct gnulib snapshot
-  --skip-po                do not download po files
--
-+EOF
-+  bootstrap_print_option_usage_hook
-+  cat <<EOF
- If the file $me.conf exists in the same directory as this script, its
- contents are read as shell variables to configure the bootstrap.
- 
-@@ -113,6 +115,12 @@ Running without arguments will suffice in most cases.
- EOF
- }
- 
-+copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'`
-+copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc.
-+License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.
-+This is free software: you are free to change and redistribute it.
-+There is NO WARRANTY, to the extent permitted by law."
-+
- # warnf_ FORMAT-STRING ARG1...
- warnf_ ()
- {
-@@ -154,6 +162,18 @@ gnulib_files=
- : ${AUTOPOINT=autopoint}
- : ${AUTORECONF=autoreconf}
- 
-+# A function to be called for each unrecognized option.  Returns 0 if
-+# the option in $1 has been processed by the function.  Returns 1 if
-+# the option has not been processed by the function.  Override it via
-+# your own definition in bootstrap.conf
-+
-+bootstrap_option_hook() { return 1; }
-+
-+# A function to be called in order to print the --help information
-+# corresponding to user-defined command-line options.
-+
-+bootstrap_print_option_usage_hook() { :; }
-+
- # A function to be called right after gnulib-tool is run.
- # Override it via your own definition in bootstrap.conf.
- bootstrap_post_import_hook() { :; }
-@@ -166,11 +186,11 @@ bootstrap_epilogue() { :; }
- # specified directory.  Fill in the first %s with the destination
- # directory and the second with the domain name.
- po_download_command_format=\
--"wget --mirror --level=1 -nd -q -A.po -P '%s' \
-+"wget --mirror --level=1 -nd -nv -A.po -P '%s' \
-  https://translationproject.org/latest/%s/"
- 
- # Prefer a non-empty tarname (4th argument of AC_INIT if given), else
--# fall back to the package name (1st argument with munging)
-+# fall back to the package name (1st argument with munging).
- extract_package_name='
-   /^AC_INIT(\[*/{
-      s///
-@@ -187,8 +207,11 @@ extract_package_name='
-      p
-   }
- '
--package=$(sed -n "$extract_package_name" configure.ac) \
--  || die 'cannot find package name in configure.ac'
-+package=$(${AUTOCONF:-autoconf} --trace AC_INIT:\$4 configure.ac 2>/dev/null)
-+if test -z "$package"; then
-+  package=$(sed -n "$extract_package_name" configure.ac) \
-+      || die 'cannot find package name in configure.ac'
-+fi
- gnulib_name=lib$package
- 
- build_aux=build-aux
-@@ -290,6 +313,116 @@ find_tool ()
-   eval "export $find_tool_envvar"
- }
- 
-+# Strip blank and comment lines to leave significant entries.
-+gitignore_entries() {
-+  sed '/^#/d; /^$/d' "$@"
-+}
-+
-+# If $STR is not already on a line by itself in $FILE, insert it at the start.
-+# Entries are inserted at the start of the ignore list to ensure existing
-+# entries starting with ! are not overridden.  Such entries support
-+# whitelisting exceptions after a more generic blacklist pattern.
-+insert_if_absent() {
-+  file=$1
-+  str=$2
-+  test -f $file || touch $file
-+  test -r $file || die "Error: failed to read ignore file: $file"
-+  duplicate_entries=$(gitignore_entries $file | sort | uniq -d)
-+  if [ "$duplicate_entries" ] ; then
-+    die "Error: Duplicate entries in $file: " $duplicate_entries
-+  fi
-+  linesold=$(gitignore_entries $file | wc -l)
-+  linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l)
-+  if [ $linesold != $linesnew ] ; then
-+    { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
-+      || die "insert_if_absent $file $str: failed"
-+  fi
-+}
-+
-+# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
-+# insert_if_absent.
-+insert_vc_ignore() {
-+  vc_ignore_file="$1"
-+  pattern="$2"
-+  case $vc_ignore_file in
-+  *.gitignore)
-+    # A .gitignore entry that does not start with '/' applies
-+    # recursively to subdirectories, so prepend '/' to every
-+    # .gitignore entry.
-+    pattern=$(echo "$pattern" | sed s,^,/,);;
-+  esac
-+  insert_if_absent "$vc_ignore_file" "$pattern"
-+}
-+
-+symlink_to_dir()
-+{
-+  src=$1/$2
-+  dst=${3-$2}
-+
-+  test -f "$src" && {
-+
-+    # If the destination directory doesn't exist, create it.
-+    # This is required at least for "lib/uniwidth/cjk.h".
-+    dst_dir=$(dirname "$dst")
-+    if ! test -d "$dst_dir"; then
-+      mkdir -p "$dst_dir"
-+
-+      # If we've just created a directory like lib/uniwidth,
-+      # tell version control system(s) it's ignorable.
-+      # FIXME: for now, this does only one level
-+      parent=$(dirname "$dst_dir")
-+      for dot_ig in x $vc_ignore; do
-+        test $dot_ig = x && continue
-+        ig=$parent/$dot_ig
-+        insert_vc_ignore $ig "${dst_dir##*/}"
-+      done
-+    fi
-+
-+    if $copy; then
-+      {
-+        test ! -h "$dst" || {
-+          echo "$me: rm -f $dst" &&
-+          rm -f "$dst"
-+        }
-+      } &&
-+      test -f "$dst" &&
-+      cmp -s "$src" "$dst" || {
-+        echo "$me: cp -fp $src $dst" &&
-+        cp -fp "$src" "$dst"
-+      }
-+    else
-+      # Leave any existing symlink alone, if it already points to the source,
-+      # so that broken build tools that care about symlink times
-+      # aren't confused into doing unnecessary builds.  Conversely, if the
-+      # existing symlink's timestamp is older than the source, make it afresh,
-+      # so that broken tools aren't confused into skipping needed builds.  See
-+      # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>.
-+      test -h "$dst" &&
-+      src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
-+      dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
-+      test "$src_i" = "$dst_i" &&
-+      both_ls=$(ls -dt "$src" "$dst") &&
-+      test "X$both_ls" = "X$dst$nl$src" || {
-+        dot_dots=
-+        case $src in
-+        /*) ;;
-+        *)
-+          case /$dst/ in
-+          *//* | */../* | */./* | /*/*/*/*/*/)
-+             die "invalid symlink calculation: $src -> $dst";;
-+          /*/*/*/*/)    dot_dots=../../../;;
-+          /*/*/*/)      dot_dots=../../;;
-+          /*/*/)        dot_dots=../;;
-+          esac;;
-+        esac
-+
-+        echo "$me: ln -fs $dot_dots$src $dst" &&
-+        ln -fs "$dot_dots$src" "$dst"
-+      }
-+    fi
-+  }
-+}
-+
- # Override the default configuration, if necessary.
- # Make sure that bootstrap.conf is sourced from the current directory
- # if we were invoked as "sh bootstrap".
-@@ -320,6 +453,12 @@ do
-   --help)
-     usage
-     exit;;
-+  --version)
-+    set -e
-+    echo "bootstrap $scriptversion"
-+    echo "$copyright"
-+    exit 0
-+    ;;
-   --gnulib-srcdir=*)
-     GNULIB_SRCDIR=${option#--gnulib-srcdir=};;
-   --skip-po)
-@@ -335,7 +474,7 @@ do
-   --no-git)
-     use_git=false;;
-   *)
--    die "$option: unknown option";;
-+    bootstrap_option_hook $option || die "$option: unknown option";;
-   esac
- done
- 
-@@ -346,47 +485,6 @@ if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
-   die "Bootstrapping from a non-checked-out distribution is risky."
- fi
- 
--# Strip blank and comment lines to leave significant entries.
--gitignore_entries() {
--  sed '/^#/d; /^$/d' "$@"
--}
--
--# If $STR is not already on a line by itself in $FILE, insert it at the start.
--# Entries are inserted at the start of the ignore list to ensure existing
--# entries starting with ! are not overridden.  Such entries support
--# whitelisting exceptions after a more generic blacklist pattern.
--insert_if_absent() {
--  file=$1
--  str=$2
--  test -f $file || touch $file
--  test -r $file || die "Error: failed to read ignore file: $file"
--  duplicate_entries=$(gitignore_entries $file | sort | uniq -d)
--  if [ "$duplicate_entries" ] ; then
--    die "Error: Duplicate entries in $file: " $duplicate_entries
--  fi
--  linesold=$(gitignore_entries $file | wc -l)
--  linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l)
--  if [ $linesold != $linesnew ] ; then
--    { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
--      || die "insert_if_absent $file $str: failed"
--  fi
--}
--
--# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
--# insert_if_absent.
--insert_vc_ignore() {
--  vc_ignore_file="$1"
--  pattern="$2"
--  case $vc_ignore_file in
--  *.gitignore)
--    # A .gitignore entry that does not start with '/' applies
--    # recursively to subdirectories, so prepend '/' to every
--    # .gitignore entry.
--    pattern=$(echo "$pattern" | sed s,^,/,);;
--  esac
--  insert_if_absent "$vc_ignore_file" "$pattern"
--}
--
- # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
- found_aux_dir=no
- grep '^[	 ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
-@@ -665,9 +763,25 @@ if $use_gnulib; then
-       shallow=
-       if test -z "$GNULIB_REVISION"; then
-         git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
-+        git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
-+          || cleanup_gnulib
-+      else
-+        git fetch -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
-+        mkdir -p "$gnulib_path"
-+        # Only want a shallow checkout of $GNULIB_REVISION, but git does not
-+        # support cloning by commit hash. So attempt a shallow fetch by commit
-+        # hash to minimize the amount of data downloaded and changes needed to
-+        # be processed, which can drastically reduce download and processing
-+        # time for checkout. If the fetch by commit fails, a shallow fetch can
-+        # not be performed because we do not know what the depth of the commit
-+        # is without fetching all commits. So fallback to fetching all commits.
-+        git -C "$gnulib_path" init
-+        git -C "$gnulib_path" remote add origin ${GNULIB_URL:-$default_gnulib_url}
-+        git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" \
-+          || git -C "$gnulib_path" fetch origin \
-+          || cleanup_gnulib
-+        git -C "$gnulib_path" reset --hard FETCH_HEAD
-       fi
--      git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
--        || cleanup_gnulib
- 
-       trap - 1 2 13 15
-     fi
-@@ -784,75 +898,6 @@ case $SKIP_PO in
-   fi;;
- esac
- 
--symlink_to_dir()
--{
--  src=$1/$2
--  dst=${3-$2}
--
--  test -f "$src" && {
--
--    # If the destination directory doesn't exist, create it.
--    # This is required at least for "lib/uniwidth/cjk.h".
--    dst_dir=$(dirname "$dst")
--    if ! test -d "$dst_dir"; then
--      mkdir -p "$dst_dir"
--
--      # If we've just created a directory like lib/uniwidth,
--      # tell version control system(s) it's ignorable.
--      # FIXME: for now, this does only one level
--      parent=$(dirname "$dst_dir")
--      for dot_ig in x $vc_ignore; do
--        test $dot_ig = x && continue
--        ig=$parent/$dot_ig
--        insert_vc_ignore $ig "${dst_dir##*/}"
--      done
--    fi
--
--    if $copy; then
--      {
--        test ! -h "$dst" || {
--          echo "$me: rm -f $dst" &&
--          rm -f "$dst"
--        }
--      } &&
--      test -f "$dst" &&
--      cmp -s "$src" "$dst" || {
--        echo "$me: cp -fp $src $dst" &&
--        cp -fp "$src" "$dst"
--      }
--    else
--      # Leave any existing symlink alone, if it already points to the source,
--      # so that broken build tools that care about symlink times
--      # aren't confused into doing unnecessary builds.  Conversely, if the
--      # existing symlink's timestamp is older than the source, make it afresh,
--      # so that broken tools aren't confused into skipping needed builds.  See
--      # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>.
--      test -h "$dst" &&
--      src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
--      dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
--      test "$src_i" = "$dst_i" &&
--      both_ls=$(ls -dt "$src" "$dst") &&
--      test "X$both_ls" = "X$dst$nl$src" || {
--        dot_dots=
--        case $src in
--        /*) ;;
--        *)
--          case /$dst/ in
--          *//* | */../* | */./* | /*/*/*/*/*/)
--             die "invalid symlink calculation: $src -> $dst";;
--          /*/*/*/*/)    dot_dots=../../../;;
--          /*/*/*/)      dot_dots=../../;;
--          /*/*/)        dot_dots=../;;
--          esac;;
--        esac
--
--        echo "$me: ln -fs $dot_dots$src $dst" &&
--        ln -fs "$dot_dots$src" "$dst"
--      }
--    fi
--  }
--}
--
- version_controlled_file() {
-   parent=$1
-   file=$2
-@@ -970,7 +1015,7 @@ bootstrap_post_import_hook \
- # Uninitialized submodules are listed with an initial dash.
- if $use_git && git submodule | grep '^-' >/dev/null; then
-   die "some git submodules are not initialized. "     \
--      "Run 'git submodule init' and bootstrap again."
-+      "Run 'git submodule update --init' and bootstrap again."
- fi
- 
- # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
-@@ -1064,7 +1109,7 @@ bootstrap_epilogue
- 
- echo "$0: done.  Now you can run './configure'."
- 
--# Local variables:
-+# Local Variables:
- # eval: (add-hook 'before-save-hook 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
-diff --git a/bootstrap.conf b/bootstrap.conf
-index 71ce943c7d..e4e5f3750a 100644
---- a/bootstrap.conf
-+++ b/bootstrap.conf
-@@ -1,6 +1,6 @@
- # Bootstrap configuration.
- 
--# Copyright (C) 2006-2019 Free Software Foundation, Inc.
-+# Copyright (C) 2006-2022 Free Software Foundation, Inc.
- 
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -16,11 +16,10 @@
- # along with this program.  If not, see <https://www.gnu.org/licenses/>.
- 
- 
--GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263
-+GNULIB_REVISION=9f48fb992a3d7e96610c4ce8be969cff2d61a01b
- 
- # gnulib modules used by this package.
--# mbswidth is used by gnulib-fix-width.diff's changes to argp rather than
--# directly.
-+# mbswidth is used by fix-width.diff's changes to argp rather than directly.
- gnulib_modules="
-   argp
-   base64
-@@ -67,8 +66,8 @@ SKIP_PO=t
- 
- # Build prerequisites
- buildreq="\
--autoconf   2.63
--automake   1.11
-+autoconf   2.64
-+automake   1.14
- gettext    0.18.3
- git        1.5.5
- tar        -
-@@ -80,11 +79,12 @@ cp -a INSTALL INSTALL.grub
- 
- bootstrap_post_import_hook () {
-   set -e
--  for patchname in fix-null-deref fix-null-state-deref fix-regcomp-uninit-token \
--      fix-regexec-null-deref fix-uninit-structure fix-unused-value fix-width; do
--    patch -d grub-core/lib/gnulib -p2 \
--      < "grub-core/lib/gnulib-patches/$patchname.patch"
--  done
-+
-+  # Instead of patching our gnulib and therefore maintaining a fork, submit
-+  # changes to gnulib and update the hash above when they've merged.  Do not
-+  # add new patches here.
-+  patch -d grub-core/lib/gnulib -p2 < grub-core/lib/gnulib-patches/fix-width.patch
-+
-   for patchname in \
-       0001-Support-POTFILES-shell \
-       0002-Handle-gettext_printf-shell-function \
-diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index 5eef708338..26ac8765e3 100644
---- a/conf/Makefile.extra-dist
-+++ b/conf/Makefile.extra-dist
-@@ -31,12 +31,6 @@ EXTRA_DIST += grub-core/gensymlist.sh
- EXTRA_DIST += grub-core/genemuinit.sh
- EXTRA_DIST += grub-core/genemuinitheader.sh
- 
--EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch
--EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch
--EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
--EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
--EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch
--EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch
- EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch
- 
- EXTRA_DIST += grub-core/lib/libgcrypt
-diff --git a/config.h.in b/config.h.in
-index c3134309c6..512d1bbe13 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -67,10 +67,78 @@
- #  define _GNU_SOURCE 1
- 
- #  ifndef _GL_INLINE_HEADER_BEGIN
-+/* gnulib gets configured against the host, not the target, and the rest of
-+ * our buildsystem works around that.  This is difficult to avoid as gnulib's
-+ * detection requires a more capable system than our target.  Instead, we
-+ * reach in and set values appropriately - intentionally setting more than the
-+ * bare minimum.  If, when updating gnulib, something breaks, there's probably
-+ * a change needed here or in grub-core/Makefile.core.def. */
-+#    define SIZE_MAX ((size_t) -1)
-+#    define _GL_ATTRIBUTE_ALLOC_SIZE(args) \
-+    __attribute__ ((__alloc_size__ args))
-+#    define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__))
-+#    define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__))
-+#    define _GL_ATTRIBUTE_COLD __attribute__ ((cold))
- #    define _GL_ATTRIBUTE_CONST __attribute__ ((const))
-+#    define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute ((__malloc__ (f, i)))
-+#    define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1)
-+#    define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
-+#    define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg)))
-+#    define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE \
-+    __attribute__ ((externally_visible))
-+#    define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-+#    define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__))
-+#    define _GL_ATTRIBUTE_MALLOC __attribute__ ((malloc))
-+#    define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED
-+#    define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__))
-+#    define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__))
-+#    define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__))
-+#    define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args))
-+#    define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__))
-+#    define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__))
-+#    define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-+#    define _GL_ATTRIBUTE_RETURNS_NONNULL \
-+    __attribute__ ((__returns_nonnull__))
-+#    define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos))
-+#    define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-+#    define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg)))
-+#    define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2)))
-+#    define _GL_GNUC_PREREQ GNUC_PREREQ
-+#    define _GL_INLINE inline
-+#    define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED
-+
-+/* We can't use __has_attribute for these because gcc-5.1 is too old for
-+ * that.  Everything above is present in that version, though. */
-+#    if __GNUC__ >= 7
-+#      define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((fallthrough))
-+#    else
-+#      define _GL_ATTRIBUTE_FALLTHROUGH /* empty */
-+#    endif
-+
-+#    ifndef ASM_FILE
-+typedef __INT_FAST32_TYPE__ int_fast32_t;
-+typedef __UINT_FAST32_TYPE__ uint_fast32_t;
-+#    endif
-+
-+/* Ensure ialloc nests static/non-static inline properly. */
-+#    define IALLOC_INLINE static inline
-+
-+/* gnulib uses these for blocking out warnings they can't/won't fix.  gnulib
-+ * also makes the decision about whether to provide a declaration for
-+ * reallocarray() at compile-time, so this is a convenient place to override -
-+ * it's used by the ialloc module, which is used by base64. */
-+#    define _GL_INLINE_HEADER_BEGIN _Pragma ("GCC diagnostic push")	\
-+    void *								\
-+    reallocarray (void *ptr, unsigned int nmemb, unsigned int size);
-+#    define _GL_INLINE_HEADER_END   _Pragma ("GCC diagnostic pop")
- 
- /* We don't have an abort() for gnulib to call in regexp. */
- #    define abort __builtin_unreachable
- #  endif /* !_GL_INLINE_HEADER_BEGIN */
- 
-+/* gnulib doesn't build cleanly with older compilers. */
-+#  if __GNUC__ < 11
-+_Pragma ("GCC diagnostic ignored \"-Wtype-limits\"")
-+#  endif
-+
- #endif
-diff --git a/grub-core/lib/gnulib-patches/fix-null-deref.patch b/grub-core/lib/gnulib-patches/fix-null-deref.patch
-deleted file mode 100644
-index 8fafa153a4..0000000000
---- a/grub-core/lib/gnulib-patches/fix-null-deref.patch
-+++ /dev/null
-@@ -1,13 +0,0 @@
--diff --git a/lib/argp-parse.c b/lib/argp-parse.c
--index 6dec57310..900adad54 100644
----- a/lib/argp-parse.c
--+++ b/lib/argp-parse.c
--@@ -940,7 +940,7 @@ weak_alias (__argp_parse, argp_parse)
-- void *
-- __argp_input (const struct argp *argp, const struct argp_state *state)
-- {
---  if (state)
--+  if (state && state->pstate)
--     {
--       struct group *group;
--       struct parser *parser = state->pstate;
-diff --git a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch
-deleted file mode 100644
-index 813ec09c8a..0000000000
---- a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch
-+++ /dev/null
-@@ -1,12 +0,0 @@
----- a/lib/argp-help.c	2020-10-28 14:32:19.189215988 +0000
--+++ b/lib/argp-help.c	2020-10-28 14:38:21.204673940 +0000
--@@ -145,7 +145,8 @@
--       if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin)
--         {
--           __argp_failure (state, 0, 0,
---                          dgettext (state->root_argp->argp_domain,
--+                          dgettext (state == NULL ? NULL
--+                                    : state->root_argp->argp_domain,
--                                     "\
-- ARGP_HELP_FMT: %s value is less than or equal to %s"),
--                           "rmargin", up->name);
-diff --git a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
-deleted file mode 100644
-index 02e06315df..0000000000
---- a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
-+++ /dev/null
-@@ -1,15 +0,0 @@
----- a/lib/regcomp.c	2020-11-24 17:06:08.159223858 +0000
--+++ b/lib/regcomp.c	2020-11-24 17:06:15.630253923 +0000
--@@ -3808,11 +3808,7 @@
-- create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
-- 	     re_token_type_t type)
-- {
---  re_token_t t;
---#if defined GCC_LINT || defined lint
---  memset (&t, 0, sizeof t);
---#endif
---  t.type = type;
--+  re_token_t t = { .type = type };
--   return create_token_tree (dfa, left, right, &t);
-- }
-- 
-diff --git a/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch b/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
-deleted file mode 100644
-index db6dac9c9e..0000000000
---- a/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
-+++ /dev/null
-@@ -1,12 +0,0 @@
----- a/lib/regexec.c	2020-10-21 14:25:35.310195912 +0000
--+++ b/lib/regexec.c	2020-11-05 10:55:09.621542984 +0000
--@@ -1692,6 +1692,9 @@
-- {
--   Idx top = mctx->state_log_top;
--
--+  if (mctx->state_log == NULL)
--+    return REG_NOERROR;
--+
--   if ((next_state_log_idx >= mctx->input.bufs_len
--        && mctx->input.bufs_len < mctx->input.len)
--       || (next_state_log_idx >= mctx->input.valid_len
-diff --git a/grub-core/lib/gnulib-patches/fix-uninit-structure.patch b/grub-core/lib/gnulib-patches/fix-uninit-structure.patch
-deleted file mode 100644
-index 7b4d9f67af..0000000000
---- a/grub-core/lib/gnulib-patches/fix-uninit-structure.patch
-+++ /dev/null
-@@ -1,11 +0,0 @@
----- a/lib/regcomp.c	2020-10-22 13:49:06.770168928 +0000
--+++ b/lib/regcomp.c	2020-10-22 13:50:37.026528298 +0000
--@@ -3662,7 +3662,7 @@
--   Idx alloc = 0;
-- #endif /* not RE_ENABLE_I18N */
--   reg_errcode_t ret;
---  re_token_t br_token;
--+  re_token_t br_token = {0};
--   bin_tree_t *tree;
-- 
--   sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
-diff --git a/grub-core/lib/gnulib-patches/fix-unused-value.patch b/grub-core/lib/gnulib-patches/fix-unused-value.patch
-deleted file mode 100644
-index ba51f1bf22..0000000000
---- a/grub-core/lib/gnulib-patches/fix-unused-value.patch
-+++ /dev/null
-@@ -1,14 +0,0 @@
----- a/lib/regexec.c	2020-10-21 14:25:35.310195912 +0000
--+++ b/lib/regexec.c	2020-10-21 14:32:07.961765604 +0000
--@@ -828,7 +828,11 @@
-- 		    break;
-- 		  if (__glibc_unlikely (err != REG_NOMATCH))
-- 		    goto free_return;
--+#ifdef DEBUG
--+		  /* Only used for assertion below when DEBUG is set, otherwise
--+		     it will be over-written when we loop around.  */
-- 		  match_last = -1;
--+#endif
-- 		}
-- 	      else
-- 		break; /* We found a match.  */
diff --git a/0207-Work-around-extra_deps.lst-issue.patch b/0207-Work-around-extra_deps.lst-issue.patch
new file mode 100644
index 00000000..0481cd55
--- /dev/null
+++ b/0207-Work-around-extra_deps.lst-issue.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 13 Mar 2024 14:06:43 -0400
+Subject: [PATCH] Work around extra_deps.lst issue
+
+---
+ grub-core/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
+index 77f8329cd43..aa172391fdf 100644
+--- a/grub-core/Makefile.am
++++ b/grub-core/Makefile.am
+@@ -460,6 +460,10 @@ extra_deps.lst:
+ 	@echo $(EXTRA_DEPS) | sed "s/\s*:\s*/\n/g" > $@
+ 
+ syminfo.lst: gensyminfo.sh kernel_syms.lst extra_deps.lst $(MODULE_FILES)
++	if ! [ -f extra_deps.lst ] ; then \
++	  echo Missing extra_deps.lst ; \
++	  echo $(EXTRA_DEPS) | sed "s/\s*:\s*/\n/g" > extra_deps.lst ; \
++	fi
+ 	cat kernel_syms.lst extra_deps.lst > $@.new
+ 	for m in $(MODULE_FILES); do \
+ 	  sh $< $$m >> $@.new || exit 1; \
diff --git a/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch b/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
deleted file mode 100644
index 4f7feb93..00000000
--- a/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
-Date: Tue, 8 Feb 2022 08:39:10 +0100
-Subject: [PATCH] commands/search: Fix bug stopping iteration when --no-floppy
- is used
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When using --no-floppy and a floppy was encountered, iterate_device()
-was returning 1, causing the iteration to stop instead of continuing.
-
-Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 68ba54c2298604146be83cae144dafd1cfd1fe2d)
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- grub-core/commands/search.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
-index ed090b3af8..51656e361c 100644
---- a/grub-core/commands/search.c
-+++ b/grub-core/commands/search.c
-@@ -64,7 +64,7 @@ iterate_device (const char *name, void *data)
-   /* Skip floppy drives when requested.  */
-   if (ctx->no_floppy &&
-       name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
--    return 1;
-+    return 0;
- 
- #ifdef DO_SEARCH_FS_UUID
- #define compare_fn grub_strcasecmp
diff --git a/0208-include-proper-attribute-for-an-EFI-API-call-definit.patch b/0208-include-proper-attribute-for-an-EFI-API-call-definit.patch
new file mode 100644
index 00000000..ad965b6c
--- /dev/null
+++ b/0208-include-proper-attribute-for-an-EFI-API-call-definit.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Thu, 21 Mar 2024 16:27:25 -0600
+Subject: [PATCH] include proper attribute for an EFI API call definition
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise we observe the following issue
+
+../../grub-core/net/efi/http.c: In function ‘efihttp_request’:
+../../grub-core/net/efi/http.c:233:28: error: passing argument 3 of ‘b->create_event’ from incompatible pointer type [-Wincompatible-pointer-types]
+  233 |                            grub_efi_http_request_callback, NULL,
+      |                            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      |                            |
+      |                            void (*)(void *, void *)
+../../grub-core/net/efi/http.c:233:28: note: expected ‘void (__attribute__((ms_abi)) *)(void *, void *)’ but argument is of type ‘void (*)(void *, void *)’
+---
+ grub-core/net/efi/http.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
+index 0568ea5d43e..6fecb261c55 100644
+--- a/grub-core/net/efi/http.c
++++ b/grub-core/net/efi/http.c
+@@ -131,14 +131,14 @@ static grub_efi_boolean_t request_callback_done;
+ static grub_efi_boolean_t response_callback_done;
+ 
+ static void
+-grub_efi_http_request_callback (grub_efi_event_t event __attribute__ ((unused)),
++__grub_efi_api grub_efi_http_request_callback (grub_efi_event_t event __attribute__ ((unused)),
+ 				void *context __attribute__ ((unused)))
+ {
+   request_callback_done = 1;
+ }
+ 
+ static void
+-grub_efi_http_response_callback (grub_efi_event_t event __attribute__ ((unused)),
++__grub_efi_api grub_efi_http_response_callback (grub_efi_event_t event __attribute__ ((unused)),
+ 				void *context __attribute__ ((unused)))
+ {
+   response_callback_done = 1;
diff --git a/0209-cast-grub_error-status-parameter.patch b/0209-cast-grub_error-status-parameter.patch
new file mode 100644
index 00000000..0cea65b2
--- /dev/null
+++ b/0209-cast-grub_error-status-parameter.patch
@@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Fri, 22 Mar 2024 12:12:02 -0600
+Subject: [PATCH] cast grub_error status parameter
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For some reason, the compiler concludes that the status variable is
+ultimately a 'long unsigned int' but status is a 'unsigned' (not a
+long) so temporally cast it to unsigned otherwise we see the following
+
+../../grub-core/net/efi/http.c: In function ‘efihttp_request’:
+../../grub-core/net/efi/http.c:251:39: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 5 has type ‘grub_efi_status_t’ {aka ‘long unsigned int’} [-Wformat=]
+  251 |       return grub_error (GRUB_ERR_IO, "Fail to send a request! status=0x%x\n", status);
+      |                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~  ~~~~~~
+      |                                                                                |
+      |                                                                                grub_efi_status_t {aka long unsigned int}
+---
+ grub-core/net/efi/http.c | 6 +++---
+ grub-core/net/efi/net.c  | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
+index 6fecb261c55..5bdb47548f8 100644
+--- a/grub-core/net/efi/http.c
++++ b/grub-core/net/efi/http.c
+@@ -236,7 +236,7 @@ efihttp_request (grub_efi_http_t *http, char *server, char *name, int use_https,
+   if (status != GRUB_EFI_SUCCESS)
+     {
+       grub_free (request_data.url);
+-      return grub_error (GRUB_ERR_IO, "Fail to create an event! status=0x%x\n", status);
++      return grub_error (GRUB_ERR_IO, "Fail to create an event! status=0x%x\n", (unsigned) status);
+     }
+ 
+   status = http->request(http, &request_token);
+@@ -248,7 +248,7 @@ efihttp_request (grub_efi_http_t *http, char *server, char *name, int use_https,
+     {
+       b->close_event(request_token.event);
+       grub_free (request_data.url);
+-      return grub_error (GRUB_ERR_IO, "Fail to send a request! status=0x%x\n", status);
++      return grub_error (GRUB_ERR_IO, "Fail to send a request! status=0x%x\n", (unsigned) status);
+     }
+   /* TODO: Add Timeout */
+   while (!request_callback_done)
+@@ -273,7 +273,7 @@ efihttp_request (grub_efi_http_t *http, char *server, char *name, int use_https,
+     {
+       b->close_event(request_token.event);
+       grub_free (request_data.url);
+-      return grub_error (GRUB_ERR_IO, "Fail to create an event! status=0x%x\n", status);
++      return grub_error (GRUB_ERR_IO, "Fail to create an event! status=0x%x\n", (unsigned) status);
+     }
+ 
+   response_token.status = GRUB_EFI_SUCCESS;
+diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
+index 0a1e604b5bd..1b13603a63c 100644
+--- a/grub-core/net/efi/net.c
++++ b/grub-core/net/efi/net.c
+@@ -706,7 +706,7 @@ grub_efi_service_binding (grub_efi_handle_t dev, grub_guid_t *service_binding_gu
+   status = service->create_child(service, &child_dev);
+   if (status != GRUB_EFI_SUCCESS)
+     {
+-      grub_error (GRUB_ERR_IO, N_("Failed to create child device of http service %x"), status);
++      grub_error (GRUB_ERR_IO, N_("Failed to create child device of http service %x"), (unsigned) status);
+       return NULL;
+     }
+ 
diff --git a/0209-search-new-efidisk-only-option-on-EFI-systems.patch b/0209-search-new-efidisk-only-option-on-EFI-systems.patch
deleted file mode 100644
index 3f6194ab..00000000
--- a/0209-search-new-efidisk-only-option-on-EFI-systems.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
-Date: Tue, 8 Feb 2022 08:39:11 +0100
-Subject: [PATCH] search: new --efidisk-only option on EFI systems
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When using 'search' on EFI systems, we sometimes want to exclude devices
-that are not EFI disks (e.g. md, lvm).
-This is typically used when wanting to chainload when having a software
-raid (md) for EFI partition:
-with no option, 'search --file /EFI/redhat/shimx64.efi' sets root envvar
-to 'md/boot_efi' which cannot be used for chainloading since there is no
-effective EFI device behind.
-
-This commit also refactors handling of --no-floppy option.
-
-Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
-[rharwood: apply rmetrich's flags initialization fix]
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- grub-core/commands/search.c      | 27 +++++++++++++++++++++++----
- grub-core/commands/search_wrap.c | 18 ++++++++++++------
- include/grub/search.h            | 15 ++++++++++++---
- 3 files changed, 47 insertions(+), 13 deletions(-)
-
-diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
-index 51656e361c..57d26ced8a 100644
---- a/grub-core/commands/search.c
-+++ b/grub-core/commands/search.c
-@@ -47,7 +47,7 @@ struct search_ctx
- {
-   const char *key;
-   const char *var;
--  int no_floppy;
-+  enum search_flags flags;
-   char **hints;
-   unsigned nhints;
-   int count;
-@@ -62,10 +62,29 @@ iterate_device (const char *name, void *data)
-   int found = 0;
- 
-   /* Skip floppy drives when requested.  */
--  if (ctx->no_floppy &&
-+  if (ctx->flags & SEARCH_FLAGS_NO_FLOPPY &&
-       name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
-     return 0;
- 
-+  /* Limit to EFI disks when requested.  */
-+  if (ctx->flags & SEARCH_FLAGS_EFIDISK_ONLY)
-+    {
-+      grub_device_t dev;
-+      dev = grub_device_open (name);
-+      if (! dev)
-+	{
-+	  grub_errno = GRUB_ERR_NONE;
-+	  return 0;
-+	}
-+      if (! dev->disk || dev->disk->dev->id != GRUB_DISK_DEVICE_EFIDISK_ID)
-+	{
-+	  grub_device_close (dev);
-+	  grub_errno = GRUB_ERR_NONE;
-+	  return 0;
-+	}
-+      grub_device_close (dev);
-+    }
-+
- #ifdef DO_SEARCH_FS_UUID
- #define compare_fn grub_strcasecmp
- #else
-@@ -261,13 +280,13 @@ try (struct search_ctx *ctx)
- }
- 
- void
--FUNC_NAME (const char *key, const char *var, int no_floppy,
-+FUNC_NAME (const char *key, const char *var, enum search_flags flags,
- 	   char **hints, unsigned nhints)
- {
-   struct search_ctx ctx = {
-     .key = key,
-     .var = var,
--    .no_floppy = no_floppy,
-+    .flags = flags,
-     .hints = hints,
-     .nhints = nhints,
-     .count = 0,
-diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
-index 47fc8eb996..0b62acf853 100644
---- a/grub-core/commands/search_wrap.c
-+++ b/grub-core/commands/search_wrap.c
-@@ -40,6 +40,7 @@ static const struct grub_arg_option options[] =
-      N_("Set a variable to the first device found."), N_("VARNAME"),
-      ARG_TYPE_STRING},
-     {"no-floppy",	'n', 0, N_("Do not probe any floppy drive."), 0, 0},
-+    {"efidisk-only",	0, 0, N_("Only probe EFI disks."), 0, 0},
-     {"hint",	        'h', GRUB_ARG_OPTION_REPEATABLE,
-      N_("First try the device HINT. If HINT ends in comma, "
- 	"also try subpartitions"), N_("HINT"), ARG_TYPE_STRING},
-@@ -73,6 +74,7 @@ enum options
-     SEARCH_FS_UUID,
-     SEARCH_SET,
-     SEARCH_NO_FLOPPY,
-+    SEARCH_EFIDISK_ONLY,
-     SEARCH_HINT,
-     SEARCH_HINT_IEEE1275,
-     SEARCH_HINT_BIOS,
-@@ -89,6 +91,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
-   const char *id = 0;
-   int i = 0, j = 0, nhints = 0;
-   char **hints = NULL;
-+  enum search_flags flags = 0;
- 
-   if (state[SEARCH_HINT].set)
-     for (i = 0; state[SEARCH_HINT].args[i]; i++)
-@@ -180,15 +183,18 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
-       goto out;
-     }
- 
-+  if (state[SEARCH_NO_FLOPPY].set)
-+    flags |= SEARCH_FLAGS_NO_FLOPPY;
-+
-+  if (state[SEARCH_EFIDISK_ONLY].set)
-+    flags |= SEARCH_FLAGS_EFIDISK_ONLY;
-+
-   if (state[SEARCH_LABEL].set)
--    grub_search_label (id, var, state[SEARCH_NO_FLOPPY].set, 
--		       hints, nhints);
-+    grub_search_label (id, var, flags, hints, nhints);
-   else if (state[SEARCH_FS_UUID].set)
--    grub_search_fs_uuid (id, var, state[SEARCH_NO_FLOPPY].set,
--			 hints, nhints);
-+    grub_search_fs_uuid (id, var, flags, hints, nhints);
-   else if (state[SEARCH_FILE].set)
--    grub_search_fs_file (id, var, state[SEARCH_NO_FLOPPY].set, 
--			 hints, nhints);
-+    grub_search_fs_file (id, var, flags, hints, nhints);
-   else
-     grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type");
- 
-diff --git a/include/grub/search.h b/include/grub/search.h
-index d80347df34..4190aeb2cb 100644
---- a/include/grub/search.h
-+++ b/include/grub/search.h
-@@ -19,11 +19,20 @@
- #ifndef GRUB_SEARCH_HEADER
- #define GRUB_SEARCH_HEADER 1
- 
--void grub_search_fs_file (const char *key, const char *var, int no_floppy,
-+enum search_flags
-+  {
-+    SEARCH_FLAGS_NO_FLOPPY	= 1,
-+    SEARCH_FLAGS_EFIDISK_ONLY	= 2
-+  };
-+
-+void grub_search_fs_file (const char *key, const char *var,
-+			  enum search_flags flags,
- 			  char **hints, unsigned nhints);
--void grub_search_fs_uuid (const char *key, const char *var, int no_floppy,
-+void grub_search_fs_uuid (const char *key, const char *var,
-+			  enum search_flags flags,
- 			  char **hints, unsigned nhints);
--void grub_search_label (const char *key, const char *var, int no_floppy,
-+void grub_search_label (const char *key, const char *var,
-+			enum search_flags flags,
- 			char **hints, unsigned nhints);
- 
- #endif
diff --git a/0210-remove-unused-varible.patch b/0210-remove-unused-varible.patch
new file mode 100644
index 00000000..2a10b101
--- /dev/null
+++ b/0210-remove-unused-varible.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Fri, 22 Mar 2024 14:20:06 -0600
+Subject: [PATCH] remove unused varible
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise compiler complains with:
+
+../../grub-core/commands/efi/connectefi.c:143:20: error: unused variable ‘j’ [-Werror=unused-variable]
+  143 |           unsigned j;
+      |                    ^
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/commands/efi/connectefi.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/grub-core/commands/efi/connectefi.c b/grub-core/commands/efi/connectefi.c
+index 6c397f8f508..9d02f2780f6 100644
+--- a/grub-core/commands/efi/connectefi.c
++++ b/grub-core/commands/efi/connectefi.c
+@@ -140,7 +140,6 @@ loop:
+ 	{
+ 	  grub_efi_handle_t handle = handles[i];
+ 	  grub_efi_status_t status;
+-	  unsigned j;
+ 
+ 	  /* Skip already handled handles  */
+ 	  if (is_in_list (handle))
diff --git a/0211-cast-grub_net_bootp_packet-pointer.patch b/0211-cast-grub_net_bootp_packet-pointer.patch
new file mode 100644
index 00000000..b98d9b21
--- /dev/null
+++ b/0211-cast-grub_net_bootp_packet-pointer.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Fri, 22 Mar 2024 18:28:17 -0600
+Subject: [PATCH] cast grub_net_bootp_packet pointer
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise compiler complains with:
+
+../../grub-core/net/drivers/efi/efinet.c: In function ‘grub_efi_net_config_real’:
+../../grub-core/net/drivers/efi/efinet.c:876:28: error: cannot convert to a pointer type
+  876 |         dhcp_ack = (struct grub_net_bootp_packet *) pxe_mode->dhcp_ack;
+      |                            ^~~~~~~~~~~~~~~~~~~~~
+../../grub-core/net/drivers/efi/efinet.c:881:57: error: initialization of ‘struct grub_net_bootp_packet *’ from incompatible pointer type ‘grub_efi_pxe_packet_t *’ [-Wincompatible-pointer-types]
+  881 |             struct grub_net_bootp_packet *proxy_offer = &pxe_mode->proxy_offer;
+      |                                                         ^
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/net/drivers/efi/efinet.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
+index 83005ea9f88..4591d0757ec 100644
+--- a/grub-core/net/drivers/efi/efinet.c
++++ b/grub-core/net/drivers/efi/efinet.c
+@@ -872,12 +872,12 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+       {
+ 	grub_dprintf ("efinet", "using ipv4 and dhcp\n");
+ 
+-        struct grub_net_bootp_packet *dhcp_ack = &pxe_mode->dhcp_ack;
++        struct grub_net_bootp_packet *dhcp_ack = (struct grub_net_bootp_packet *) &pxe_mode->dhcp_ack;
+ 
+         if (pxe_mode->proxy_offer_received)
+           {
+             grub_dprintf ("efinet", "proxy offer receive");
+-            struct grub_net_bootp_packet *proxy_offer = &pxe_mode->proxy_offer;
++            struct grub_net_bootp_packet *proxy_offer =  (struct grub_net_bootp_packet *) &pxe_mode->proxy_offer;
+ 
+             if (proxy_offer && dhcp_ack->boot_file[0] == '\0')
+               {
diff --git a/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch b/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch
deleted file mode 100644
index 5b450f9f..00000000
--- a/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
-Date: Fri, 4 Mar 2022 11:29:31 +0100
-Subject: [PATCH] grub-core/loader/arm64/linux.c: do not validate kernel twice
-
-Call to grub_file_open(, GRUB_FILE_TYPE_LINUX_KERNEL) already passes
-the kernel file through shim-lock verifier when secureboot is on. Thus
-there is no need to validate the kernel image again. And when doing so
-again, duplicate PCR measurement is performed, breaking measurements
-compatibility with 2.04+linuxefi.
-
-This patch must not be ported to older editions of grub code bases
-that do not have verifiers framework, or it is not builtin, or
-shim-lock-verifier is an optional module.
-
-Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
----
- grub-core/loader/arm64/linux.c | 13 -------------
- 1 file changed, 13 deletions(-)
-
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index f18d90bd74..d2af47c2c0 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -34,7 +34,6 @@
- #include <grub/i18n.h>
- #include <grub/lib/cmdline.h>
- #include <grub/verify.h>
--#include <grub/efi/sb.h>
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
-@@ -341,7 +340,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   grub_off_t filelen;
-   grub_uint32_t align;
-   void *kernel = NULL;
--  int rc;
- 
-   grub_dl_ref (my_mod);
- 
-@@ -370,17 +368,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-       goto fail;
-     }
- 
--  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
--    {
--      rc = grub_linuxefi_secure_validate (kernel, filelen);
--      if (rc <= 0)
--	{
--	  grub_error (GRUB_ERR_INVALID_COMMAND,
--		      N_("%s has invalid signature"), argv[0]);
--	  goto fail;
--	}
--    }
--
-   if (grub_arch_efi_linux_check_image (kernel) != GRUB_ERR_NONE)
-     goto fail;
-   if (parse_pe_header (kernel, &kernel_size, &handover_offset, &align) != GRUB_ERR_NONE)
diff --git a/0212-libtasn1-fix-string-overflow-warning.patch b/0212-libtasn1-fix-string-overflow-warning.patch
new file mode 100644
index 00000000..50d151ab
--- /dev/null
+++ b/0212-libtasn1-fix-string-overflow-warning.patch
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Thu, 11 Jan 2024 12:05:20 -0600
+Subject: [PATCH] libtasn1: fix string overflow warning
+
+Patched also at the libtasn1 project with commit
+
+    c54e523d9dacdb7eec7f20964df12df9b80f467c
+    Author:     Simo Sorce <simo@redhat.com>
+    AuthorDate: Tue May 11 14:18:10 2021 -0400
+    Commit:     Simo Sorce <simo@redhat.com>
+    CommitDate: Tue May 11 14:26:04 2021 -0400
+
+    Parent:     890a8a9 Fix resource leak (node)
+    Contained:  master
+    Follows:    v4.16.0 (48)
+    Precedes:   v4.17.0 (5)
+
+    Fix String overflow warning
+
+    Scanner Output
+    --------------
+    rror: COMPILER_WARNING (CWE-758): [#def2]
+    libtasn1-4.16.0/lib/element.c: scope_hint: In function '_asn1_append_sequence_set'
+    libtasn1-4.16.0/lib/element.c:186:7: warning[-Wstringop-overflow=]: '_asn1_ltostr' accessing 22 bytes in a region of size 21
+     #  186 |       _asn1_ltostr (n, temp + 1);
+     #      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~
+    libtasn1-4.16.0/lib/element.c:186:7: note: referencing argument 2 of type 'char *'
+    libtasn1-4.16.0/lib/element.c:30: included_from: Included from here.
+    libtasn1-4.16.0/lib/parser_aux.h:70:7: note: in a call to function '_asn1_ltostr'
+     #   70 | char *_asn1_ltostr (int64_t v, char str[LTOSTR_MAX_SIZE]);
+     #      |       ^~~~~~~~~~~~
+     #  184|         n++;
+     #  185|         temp[0] = '?';
+     #  186|->       _asn1_ltostr (n, temp + 1);
+     #  187|       }
+     #  188|     _asn1_set_name (p2, temp);
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/lib/libtasn1/lib/element.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c
+index ed761ff56bd..8cc73455aee 100644
+--- a/grub-core/lib/libtasn1/lib/element.c
++++ b/grub-core/lib/libtasn1/lib/element.c
+@@ -143,7 +143,7 @@ int
+ _asn1_append_sequence_set (asn1_node node, struct node_tail_cache_st *pcache)
+ {
+   asn1_node p, p2;
+-  char temp[LTOSTR_MAX_SIZE];
++  char temp[LTOSTR_MAX_SIZE + 1];
+   long n;
+ 
+   if (!node || !(node->down))
diff --git a/0004-Add-support-for-Linux-EFI-stub-loading.patch b/0213-Add-support-for-Linux-EFI-stub-loading.patch
similarity index 55%
rename from 0004-Add-support-for-Linux-EFI-stub-loading.patch
rename to 0213-Add-support-for-Linux-EFI-stub-loading.patch
index 745973e5..c930f1c3 100644
--- a/0004-Add-support-for-Linux-EFI-stub-loading.patch
+++ b/0213-Add-support-for-Linux-EFI-stub-loading.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
-Date: Tue, 10 Jul 2012 11:58:52 -0400
+Date: Mon, 1 Apr 2024 13:20:18 -0600
 Subject: [PATCH] Add support for Linux EFI stub loading.
 
 Also:
@@ -26,32 +26,25 @@ grub-2.00-no-insmod-on-sb.patch), but this should be more correct.  It
 moves the check into grub_dl_load_file.
 ---
  grub-core/Makefile.core.def       |  16 +-
- grub-core/kern/dl.c               |  21 +++
- grub-core/kern/efi/efi.c          |  28 ++++
+ grub-core/kern/dl.c               |  22 +++
  grub-core/kern/efi/mm.c           |  32 ++++
- grub-core/loader/arm64/linux.c    | 118 +++++++-------
- grub-core/loader/arm64/xen_boot.c |   1 -
- grub-core/loader/efi/linux.c      |  70 ++++++++
+ grub-core/loader/efi/linux.c      |  47 ++++++
  grub-core/loader/i386/efi/linux.c | 335 ++++++++++++++++++++++++++++++++++++++
  grub-core/loader/i386/pc/linux.c  |  10 +-
- include/grub/arm/linux.h          |   9 +
- include/grub/arm64/linux.h        |   9 +
- include/grub/efi/efi.h            |   7 +-
+ include/grub/efi/efi.h            |   3 +
  include/grub/efi/linux.h          |  31 ++++
- 13 files changed, 618 insertions(+), 69 deletions(-)
- create mode 100644 grub-core/loader/efi/linux.c
+ 8 files changed, 485 insertions(+), 11 deletions(-)
  create mode 100644 grub-core/loader/i386/efi/linux.c
  create mode 100644 include/grub/efi/linux.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 8022e1c0a7..45d3edaa4d 100644
+index a5a3ee31800..3f6e944d6a5 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -1734,13 +1734,6 @@ module = {
-   enable = i386_pc;
+@@ -1831,12 +1831,6 @@ module = {
  };
  
--
+ 
 -module = {
 -  name = linux16;
 -  common = loader/i386/pc/linux.c;
@@ -61,37 +54,47 @@ index 8022e1c0a7..45d3edaa4d 100644
  module = {
    name = ntldr;
    i386_pc = loader/i386/pc/ntldr.c;
-@@ -1796,7 +1789,9 @@ module = {
+@@ -1892,10 +1886,9 @@ module = {
  
  module = {
    name = linux;
 -  x86 = loader/i386/linux.c;
-+  i386_pc = loader/i386/pc/linux.c;
-+  x86_64_efi = loader/i386/efi/linux.c;
-+  i386_efi = loader/i386/efi/linux.c;
    i386_xen_pvh = loader/i386/linux.c;
    xen = loader/i386/xen.c;
-   i386_pc = lib/i386/pc/vesa_modes_table.c;
-@@ -1811,9 +1806,14 @@ module = {
-   arm64 = loader/arm64/linux.c;
-   riscv32 = loader/riscv/linux.c;
-   riscv64 = loader/riscv/linux.c;
-+  emu = loader/emu/linux.c;
+-  i386_pc = lib/i386/pc/vesa_modes_table.c;
++  i386_pc = loader/i386/pc/linux.c;
+   i386_xen_pvh = lib/i386/pc/vesa_modes_table.c;
+   mips = loader/mips/linux.c;
+   powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
+@@ -1908,11 +1901,14 @@ module = {
+   loongarch64 = loader/efi/linux.c;
+   riscv32 = loader/efi/linux.c;
+   riscv64 = loader/efi/linux.c;
+-  i386_efi = loader/efi/linux.c;
+-  x86_64_efi = loader/efi/linux.c;
++  i386_efi = loader/i386/efi/linux.c;
++  x86_64_efi = loader/i386/efi/linux.c;
+   emu = loader/emu/linux.c;
 +  fdt = lib/fdt.c;
-+
    common = loader/linux.c;
    common = lib/cmdline.c;
-   enable = noemu;
-+
 +  efi = loader/efi/linux.c;
++  efi = loader/i386/linux.c;
  };
  
  module = {
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 48f8a79073..b714937095 100644
+index c55f0ecf931..d48d4131ba7 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
-@@ -38,6 +38,14 @@
+@@ -32,12 +32,21 @@
+ #include <grub/env.h>
+ #include <grub/cache.h>
+ #include <grub/i18n.h>
++#include <grub/efi/sb.h>
+ 
+ /* Platforms where modules are in a readonly area of memory.  */
+ #if defined(GRUB_MACHINE_QEMU)
  #define GRUB_MODULES_MACHINE_READONLY
  #endif
  
@@ -106,12 +109,12 @@ index 48f8a79073..b714937095 100644
  
  
  #pragma GCC diagnostic ignored "-Wcast-align"
-@@ -695,6 +703,19 @@ grub_dl_load_file (const char *filename)
+@@ -861,6 +870,19 @@ grub_dl_load_file (const char *filename)
    void *core = 0;
    grub_dl_t mod = 0;
  
 +#ifdef GRUB_MACHINE_EFI
-+  if (grub_efi_secure_boot ())
++  if (grub_efi_get_secureboot ())
 +    {
 +#if 0
 +      /* This is an error, but grub2-mkconfig still generates a pile of
@@ -126,50 +129,11 @@ index 48f8a79073..b714937095 100644
    grub_boot_time ("Loading module %s", filename);
  
    file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);
-diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 8cff7be028..35b8f67060 100644
---- a/grub-core/kern/efi/efi.c
-+++ b/grub-core/kern/efi/efi.c
-@@ -286,6 +286,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
-   return grub_efi_get_variable_with_attributes (var, guid, datasize_out, data_out, NULL);
- }
- 
-+grub_efi_boolean_t
-+grub_efi_secure_boot (void)
-+{
-+  grub_efi_guid_t efi_var_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID;
-+  grub_size_t datasize;
-+  char *secure_boot = NULL;
-+  char *setup_mode = NULL;
-+  grub_efi_boolean_t ret = 0;
-+
-+  secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
-+
-+  if (datasize != 1 || !secure_boot)
-+    goto out;
-+
-+  setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
-+
-+  if (datasize != 1 || !setup_mode)
-+    goto out;
-+
-+  if (*secure_boot && !*setup_mode)
-+    ret = 1;
-+
-+ out:
-+  grub_free (secure_boot);
-+  grub_free (setup_mode);
-+  return ret;
-+}
-+
- #pragma GCC diagnostic ignored "-Wcast-align"
- 
- /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 9838fb2f50..f6aef0ef64 100644
+index df443f434d4..fb9dbf52528 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
-@@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,
+@@ -112,6 +112,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,
      }
  }
  
@@ -186,7 +150,7 @@ index 9838fb2f50..f6aef0ef64 100644
 +    return 0;
 +
 +  b = grub_efi_system_table->boot_services;
-+  status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
++  status = b->allocate_pages (GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
 +
 +  if (status != GRUB_EFI_SUCCESS)
 +    return 0;
@@ -196,7 +160,7 @@ index 9838fb2f50..f6aef0ef64 100644
 +      /* Uggh, the address 0 was allocated... This is too annoying,
 +	 so reallocate another one.  */
 +      address = max;
-+      status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
++      status = b->allocate_pages (GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
 +      grub_efi_free_pages (0, pages);
 +      if (status != GRUB_EFI_SUCCESS)
 +	return 0;
@@ -208,231 +172,27 @@ index 9838fb2f50..f6aef0ef64 100644
  /* Allocate pages. Return the pointer to the first of allocated pages.  */
  void *
  grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index ef3e9f9444..a312c66868 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -29,6 +29,7 @@
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index bfbd95aeef0..925394d1767 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -25,10 +25,12 @@
+ #include <grub/loader.h>
+ #include <grub/mm.h>
+ #include <grub/types.h>
++#include <grub/cpu/linux.h>
  #include <grub/efi/efi.h>
  #include <grub/efi/fdtload.h>
  #include <grub/efi/memory.h>
-+#include <grub/efi/linux.h>
  #include <grub/efi/pe32.h>
++#include <grub/efi/linux.h>
+ #include <grub/efi/sb.h>
  #include <grub/i18n.h>
  #include <grub/lib/cmdline.h>
-@@ -41,6 +42,7 @@ static int loaded;
+@@ -87,6 +89,51 @@ static grub_efi_load_file2_t initrd_lf2 = {
+   grub_efi_initrd_load_file2
+ };
  
- static void *kernel_addr;
- static grub_uint64_t kernel_size;
-+static grub_uint32_t handover_offset;
- 
- static char *linux_args;
- static grub_uint32_t cmdline_size;
-@@ -67,7 +69,8 @@ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
- static grub_err_t
- finalize_params_linux (void)
- {
--  int node, retval;
-+  grub_efi_loaded_image_t *loaded_image = NULL;
-+  int node, retval, len;
- 
-   void *fdt;
- 
-@@ -102,79 +105,70 @@ finalize_params_linux (void)
-   if (grub_fdt_install() != GRUB_ERR_NONE)
-     goto failure;
- 
--  return GRUB_ERR_NONE;
--
--failure:
--  grub_fdt_unload();
--  return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
--}
--
--grub_err_t
--grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
--{
--  grub_efi_memory_mapped_device_path_t *mempath;
--  grub_efi_handle_t image_handle;
--  grub_efi_boot_services_t *b;
--  grub_efi_status_t status;
--  grub_efi_loaded_image_t *loaded_image;
--  int len;
--
--  mempath = grub_malloc (2 * sizeof (grub_efi_memory_mapped_device_path_t));
--  if (!mempath)
--    return grub_errno;
--
--  mempath[0].header.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE;
--  mempath[0].header.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE;
--  mempath[0].header.length = grub_cpu_to_le16_compile_time (sizeof (*mempath));
--  mempath[0].memory_type = GRUB_EFI_LOADER_DATA;
--  mempath[0].start_address = addr;
--  mempath[0].end_address = addr + size;
--
--  mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE;
--  mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
--  mempath[1].header.length = sizeof (grub_efi_device_path_t);
--
--  b = grub_efi_system_table->boot_services;
--  status = b->load_image (0, grub_efi_image_handle,
--			  (grub_efi_device_path_t *) mempath,
--			  (void *) addr, size, &image_handle);
--  if (status != GRUB_EFI_SUCCESS)
--    return grub_error (GRUB_ERR_BAD_OS, "cannot load image");
--
--  grub_dprintf ("linux", "linux command line: '%s'\n", args);
-+  grub_dprintf ("linux", "Installed/updated FDT configuration table @ %p\n",
-+                fdt);
- 
-   /* Convert command line to UCS-2 */
--  loaded_image = grub_efi_get_loaded_image (image_handle);
-+  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
-+  if (!loaded_image)
-+    goto failure;
-+
-   loaded_image->load_options_size = len =
--    (grub_strlen (args) + 1) * sizeof (grub_efi_char16_t);
-+    (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t);
-   loaded_image->load_options =
-     grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
-   if (!loaded_image->load_options)
--    return grub_errno;
-+    return grub_error(GRUB_ERR_BAD_OS, "failed to create kernel parameters");
- 
-   loaded_image->load_options_size =
-     2 * grub_utf8_to_utf16 (loaded_image->load_options, len,
--			    (grub_uint8_t *) args, len, NULL);
-+                           (grub_uint8_t *) linux_args, len, NULL);
- 
--  grub_dprintf ("linux", "starting image %p\n", image_handle);
--  status = b->start_image (image_handle, 0, NULL);
-+  return GRUB_ERR_NONE;
- 
--  /* When successful, not reached */
--  b->unload_image (image_handle);
--  grub_efi_free_pages ((grub_addr_t) loaded_image->load_options,
--		       GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
-+failure:
-+  grub_fdt_unload();
-+  return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
-+}
- 
--  return grub_errno;
-+static void
-+free_params (void)
-+{
-+  grub_efi_loaded_image_t *loaded_image = NULL;
-+
-+  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
-+  if (loaded_image)
-+    {
-+      if (loaded_image->load_options)
-+       grub_efi_free_pages ((grub_efi_physical_address_t)(grub_efi_uintn_t)loaded_image->load_options,
-+                            GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
-+      loaded_image->load_options = NULL;
-+      loaded_image->load_options_size = 0;
-+    }
-+}
-+
-+grub_err_t
-+grub_arch_efi_linux_boot_image (grub_addr_t addr, char *args)
-+{
-+  grub_err_t retval;
-+
-+  retval = finalize_params_linux ();
-+  if (retval != GRUB_ERR_NONE)
-+    return grub_errno;
-+
-+  grub_dprintf ("linux", "linux command line: '%s'\n", args);
-+
-+  retval = grub_efi_linux_boot ((char *)addr, handover_offset, (void *)addr);
-+
-+  /* Never reached... */
-+  free_params();
-+  return retval;
- }
- 
- static grub_err_t
- grub_linux_boot (void)
- {
--  if (finalize_params_linux () != GRUB_ERR_NONE)
--    return grub_errno;
--
--  return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr,
--                                          kernel_size, linux_args));
-+  return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr, linux_args));
- }
- 
- static grub_err_t
-@@ -288,6 +282,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
- {
-   grub_file_t file = 0;
-   struct linux_arch_kernel_header lh;
-+  struct grub_armxx_linux_pe_header *pe;
-   grub_err_t err;
- 
-   grub_dl_ref (my_mod);
-@@ -333,6 +328,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
- 
-   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
- 
-+  if (!grub_linuxefi_secure_validate (kernel_addr, kernel_size))
-+    {
-+      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
-+      goto fail;
-+    }
-+
-+  pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset);
-+  handover_offset = pe->opt.entry_addr;
-+
-   cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);
-   linux_args = grub_malloc (cmdline_size);
-   if (!linux_args)
-diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
-index 22cc25eccd..d9b7a9ba40 100644
---- a/grub-core/loader/arm64/xen_boot.c
-+++ b/grub-core/loader/arm64/xen_boot.c
-@@ -266,7 +266,6 @@ xen_boot (void)
-     return err;
- 
-   return grub_arch_efi_linux_boot_image (xen_hypervisor->start,
--					  xen_hypervisor->size,
- 					  xen_hypervisor->cmdline);
- }
- 
-diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-new file mode 100644
-index 0000000000..c24202a5dd
---- /dev/null
-+++ b/grub-core/loader/efi/linux.c
-@@ -0,0 +1,70 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2014 Free Software Foundation, Inc.
-+ *
-+ *  GRUB is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  GRUB is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <grub/err.h>
-+#include <grub/mm.h>
-+#include <grub/types.h>
-+#include <grub/cpu/linux.h>
-+#include <grub/efi/efi.h>
-+#include <grub/efi/pe32.h>
-+#include <grub/efi/linux.h>
-+
 +#define SHIM_LOCK_GUID \
 + { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
 +
@@ -445,7 +205,7 @@ index 0000000000..c24202a5dd
 +grub_efi_boolean_t
 +grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
 +{
-+  grub_efi_guid_t guid = SHIM_LOCK_GUID;
++  grub_guid_t guid = SHIM_LOCK_GUID;
 +  grub_efi_shim_lock_t *shim_lock;
 +
 +  shim_lock = grub_efi_locate_protocol(&guid, NULL);
@@ -465,21 +225,25 @@ index 0000000000..c24202a5dd
 +typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
 +
 +grub_err_t
-+grub_efi_linux_boot (void *kernel_addr, grub_off_t offset,
++grub_efi_linux_boot (void *kernel_address, grub_off_t offset,
 +		     void *kernel_params)
 +{
 +  handover_func hf;
 +
-+  hf = (handover_func)((char *)kernel_addr + offset);
++  hf = (handover_func)((char *)kernel_address + offset);
 +  hf (grub_efi_image_handle, grub_efi_system_table, kernel_params);
 +
 +  return GRUB_ERR_BUG;
 +}
 +
 +#pragma GCC diagnostic pop
++
+ grub_err_t
+ grub_arch_efi_linux_load_image_header (grub_file_t file,
+                                       struct linux_arch_kernel_header * lh)
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
 new file mode 100644
-index 0000000000..bb2616a809
+index 00000000000..9bfb4ab9e3e
 --- /dev/null
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -0,0 +1,335 @@
@@ -537,7 +301,7 @@ index 0000000000..bb2616a809
 +  asm volatile ("cli");
 +
 +  return grub_efi_linux_boot ((char *)kernel_mem, handover_offset + offset,
-+			      params);
++                              params);
 +}
 +
 +static grub_err_t
@@ -547,17 +311,17 @@ index 0000000000..bb2616a809
 +  loaded = 0;
 +  if (initrd_mem)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem,
-+			 BYTES_TO_PAGES(params->ramdisk_size));
++                         BYTES_TO_PAGES(params->ramdisk_size));
 +  if (linux_cmdline)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
-+			 linux_cmdline,
-+			 BYTES_TO_PAGES(params->cmdline_size + 1));
++                         linux_cmdline,
++                         BYTES_TO_PAGES(params->cmdline_size + 1));
 +  if (kernel_mem)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
-+			 BYTES_TO_PAGES(kernel_size));
++                         BYTES_TO_PAGES(kernel_size));
 +  if (params)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params,
-+			 BYTES_TO_PAGES(16384));
++                         BYTES_TO_PAGES(16384));
 +  return GRUB_ERR_NONE;
 +}
 +
@@ -631,14 +395,14 @@ index 0000000000..bb2616a809
 +
 +  if (initrd_mem && grub_errno)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem,
-+			 BYTES_TO_PAGES(size));
++                         BYTES_TO_PAGES(size));
 +
 +  return grub_errno;
 +}
 +
 +static grub_err_t
 +grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-+		int argc, char *argv[])
++                int argc, char *argv[])
 +{
 +  grub_file_t file = 0;
 +  struct linux_i386_kernel_header lh;
@@ -676,7 +440,7 @@ index 0000000000..bb2616a809
 +  if (! grub_linuxefi_secure_validate (kernel, filelen))
 +    {
 +      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"),
-+		  argv[0]);
++                  argv[0]);
 +      goto fail;
 +    }
 +
@@ -718,7 +482,7 @@ index 0000000000..bb2616a809
 +
 +  grub_dprintf ("linux", "setting up cmdline\n");
 +  linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
-+					 BYTES_TO_PAGES(lh.cmdline_size + 1));
++                                         BYTES_TO_PAGES(lh.cmdline_size + 1));
 +
 +  if (!linux_cmdline)
 +    {
@@ -729,8 +493,8 @@ index 0000000000..bb2616a809
 +  grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
 +  grub_create_loader_cmdline (argc, argv,
 +                              linux_cmdline + sizeof (LINUX_IMAGE) - 1,
-+			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
-+			      GRUB_VERIFY_KERNEL_CMDLINE);
++                              lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
++                              GRUB_VERIFY_KERNEL_CMDLINE);
 +
 +  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
 +
@@ -740,11 +504,11 @@ index 0000000000..bb2616a809
 +  len = grub_file_size(file) - start;
 +
 +  kernel_mem = grub_efi_allocate_pages_max(lh.pref_address,
-+					   BYTES_TO_PAGES(lh.init_size));
++                                           BYTES_TO_PAGES(lh.init_size));
 +
 +  if (!kernel_mem)
 +    kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,
-+					     BYTES_TO_PAGES(lh.init_size));
++                                             BYTES_TO_PAGES(lh.init_size));
 +
 +  if (!kernel_mem)
 +    {
@@ -777,16 +541,16 @@ index 0000000000..bb2616a809
 +
 +  if (linux_cmdline && !loaded)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
-+			 linux_cmdline,
-+			 BYTES_TO_PAGES(lh.cmdline_size + 1));
++                         linux_cmdline,
++                         BYTES_TO_PAGES(lh.cmdline_size + 1));
 +
 +  if (kernel_mem && !loaded)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
-+			 BYTES_TO_PAGES(kernel_size));
++                         BYTES_TO_PAGES(kernel_size));
 +
 +  if (params && !loaded)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params,
-+			 BYTES_TO_PAGES(16384));
++                         BYTES_TO_PAGES(16384));
 +
 +  return grub_errno;
 +}
@@ -819,10 +583,10 @@ index 0000000000..bb2616a809
 +  grub_unregister_command (cmd_initrdefi);
 +}
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 2a29952016..8be4c3b3f4 100644
+index 600530a742b..8593d74737f 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
-@@ -474,14 +474,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+@@ -483,14 +483,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_errno;
  }
  
@@ -844,7 +608,7 @@ index 2a29952016..8be4c3b3f4 100644
      grub_register_command ("initrd16", grub_cmd_initrd,
  			   0, N_("Load initrd."));
    my_mod = mod;
-@@ -490,5 +496,7 @@ GRUB_MOD_INIT(linux16)
+@@ -499,5 +505,7 @@ GRUB_MOD_INIT(linux16)
  GRUB_MOD_FINI(linux16)
  {
    grub_unregister_command (cmd_linux);
@@ -852,71 +616,11 @@ index 2a29952016..8be4c3b3f4 100644
    grub_unregister_command (cmd_initrd);
 +  grub_unregister_command (cmd_initrd16);
  }
-diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
-index bcd5a7eb18..b582f67f66 100644
---- a/include/grub/arm/linux.h
-+++ b/include/grub/arm/linux.h
-@@ -20,6 +20,7 @@
- #ifndef GRUB_ARM_LINUX_HEADER
- #define GRUB_ARM_LINUX_HEADER 1
- 
-+#include <grub/efi/pe32.h>
- #include "system.h"
- 
- #define GRUB_LINUX_ARM_MAGIC_SIGNATURE 0x016f2818
-@@ -34,9 +35,17 @@ struct linux_arm_kernel_header {
-   grub_uint32_t hdr_offset;
- };
- 
-+struct grub_arm_linux_pe_header
-+{
-+  grub_uint32_t magic;
-+  struct grub_pe32_coff_header coff;
-+  struct grub_pe32_optional_header opt;
-+};
-+
- #if defined(__arm__)
- # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
- # define linux_arch_kernel_header linux_arm_kernel_header
-+# define grub_armxx_linux_pe_header grub_arm_linux_pe_header
- #endif
- 
- #if defined GRUB_MACHINE_UBOOT
-diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
-index 7e22b4ab69..ea030312df 100644
---- a/include/grub/arm64/linux.h
-+++ b/include/grub/arm64/linux.h
-@@ -19,6 +19,7 @@
- #ifndef GRUB_ARM64_LINUX_HEADER
- #define GRUB_ARM64_LINUX_HEADER 1
- 
-+#include <grub/efi/pe32.h>
- #include <grub/types.h>
- 
- #define GRUB_LINUX_ARM64_MAGIC_SIGNATURE 0x644d5241 /* 'ARM\x64' */
-@@ -38,9 +39,17 @@ struct linux_arm64_kernel_header
-   grub_uint32_t hdr_offset;	/* Offset of PE/COFF header */
- };
- 
-+struct grub_arm64_linux_pe_header
-+{
-+  grub_uint32_t magic;
-+  struct grub_pe32_coff_header coff;
-+  struct grub_pe64_optional_header opt;
-+};
-+
- #if defined(__aarch64__)
- # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
- # define linux_arch_kernel_header linux_arm64_kernel_header
-+# define grub_armxx_linux_pe_header grub_arm64_linux_pe_header
- #endif
- 
- #endif /* ! GRUB_ARM64_LINUX_HEADER */
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 83d958f994..6295df85f3 100644
+index 3670eddc52b..83ddbe26e57 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
+@@ -75,6 +75,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
  				      grub_efi_uintn_t pages);
  void *
  EXPORT_FUNC(grub_efi_allocate_any_pages) (grub_efi_uintn_t pages);
@@ -926,27 +630,9 @@ index 83d958f994..6295df85f3 100644
  void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
  				       grub_efi_uintn_t pages);
  grub_efi_uintn_t EXPORT_FUNC(grub_efi_find_mmap_size) (void);
-@@ -88,6 +91,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
- 				     const grub_efi_guid_t *guid,
- 				     void *data,
- 				     grub_size_t datasize);
-+grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);
- int
- EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
- 					     const grub_efi_device_path_t *dp2);
-@@ -101,8 +105,7 @@ void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);
- grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
- #include <grub/cpu/linux.h>
- grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh);
--grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
--                                           char *args);
-+grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, char *args);
- #endif
- 
- grub_addr_t grub_efi_modules_addr (void);
 diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
 new file mode 100644
-index 0000000000..d9ede36773
+index 00000000000..d224daafa4f
 --- /dev/null
 +++ b/include/grub/efi/linux.h
 @@ -0,0 +1,31 @@
@@ -978,6 +664,6 @@ index 0000000000..d9ede36773
 +EXPORT_FUNC(grub_linuxefi_secure_validate) (void *data, grub_uint32_t size);
 +grub_err_t
 +EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
-+				  void *kernel_param);
++                                  void *kernel_param);
 +
 +#endif /* ! GRUB_EFI_LINUX_HEADER */
diff --git a/0214-fix-i386_pc-on-legacycfg-module.patch b/0214-fix-i386_pc-on-legacycfg-module.patch
new file mode 100644
index 00000000..9461a9f2
--- /dev/null
+++ b/0214-fix-i386_pc-on-legacycfg-module.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Tue, 2 Apr 2024 12:59:10 -0600
+Subject: [PATCH] fix i386_pc on legacycfg module
+
+---
+ grub-core/Makefile.core.def | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 3f6e944d6a5..b045aac7c91 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -2459,6 +2459,7 @@ module = {
+   common = commands/legacycfg.c;
+   common = lib/legacy_parse.c;
+   emu = lib/i386/pc/vesa_modes_table.c;
++  i386_pc = lib/i386/pc/vesa_modes_table.c;
+   i386_efi = lib/i386/pc/vesa_modes_table.c;
+   x86_64_efi = lib/i386/pc/vesa_modes_table.c;
+   xen = lib/i386/pc/vesa_modes_table.c;
diff --git a/0007-Add-secureboot-support-on-efi-chainloader.patch b/0215-Add-secureboot-support-on-efi-chainloader.patch
similarity index 88%
rename from 0007-Add-secureboot-support-on-efi-chainloader.patch
rename to 0215-Add-secureboot-support-on-efi-chainloader.patch
index 34ead63b..2e993cb6 100644
--- a/0007-Add-secureboot-support-on-efi-chainloader.patch
+++ b/0215-Add-secureboot-support-on-efi-chainloader.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raymund Will <rw@suse.com>
-Date: Mon, 8 Jul 2019 11:55:18 +0200
+Date: Tue, 2 Apr 2024 16:39:53 -0600
 Subject: [PATCH] Add secureboot support on efi chainloader
 
 Expand the chainloader to be able to verify the image by means of shim
@@ -180,103 +180,77 @@ supported yet. This patch might need a new revision once that's the case.
 
 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
 ---
- grub-core/kern/efi/efi.c           |  14 +-
- grub-core/loader/arm64/linux.c     |   4 +-
- grub-core/loader/efi/chainloader.c | 820 +++++++++++++++++++++++++++++++++----
+ grub-core/loader/efi/chainloader.c | 849 +++++++++++++++++++++++++++++++++----
  grub-core/loader/efi/linux.c       |  25 +-
  grub-core/loader/i386/efi/linux.c  |  17 +-
  include/grub/efi/linux.h           |   2 +-
- include/grub/efi/pe32.h            |  52 ++-
- 7 files changed, 844 insertions(+), 90 deletions(-)
+ include/grub/efi/pe32.h            |  51 ++-
+ 5 files changed, 848 insertions(+), 96 deletions(-)
 
-diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 35b8f67060..4a2259aa1c 100644
---- a/grub-core/kern/efi/efi.c
-+++ b/grub-core/kern/efi/efi.c
-@@ -296,14 +296,20 @@ grub_efi_secure_boot (void)
-   grub_efi_boolean_t ret = 0;
- 
-   secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
--
-   if (datasize != 1 || !secure_boot)
--    goto out;
-+    {
-+      grub_dprintf ("secureboot", "No SecureBoot variable\n");
-+      goto out;
-+    }
-+  grub_dprintf ("secureboot", "SecureBoot: %d\n", *secure_boot);
- 
-   setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
--
-   if (datasize != 1 || !setup_mode)
--    goto out;
-+    {
-+      grub_dprintf ("secureboot", "No SetupMode variable\n");
-+      goto out;
-+    }
-+  grub_dprintf ("secureboot", "SetupMode: %d\n", *setup_mode);
- 
-   if (*secure_boot && !*setup_mode)
-     ret = 1;
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index a312c66868..04994d5c67 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -284,6 +284,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   struct linux_arch_kernel_header lh;
-   struct grub_armxx_linux_pe_header *pe;
-   grub_err_t err;
-+  int rc;
- 
-   grub_dl_ref (my_mod);
- 
-@@ -328,7 +329,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
- 
-   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
- 
--  if (!grub_linuxefi_secure_validate (kernel_addr, kernel_size))
-+  rc = grub_linuxefi_secure_validate (kernel_addr, kernel_size);
-+  if (rc < 0)
-     {
-       grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
-       goto fail;
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 2bd80f4db3..e6a8d4ad0e 100644
+index 2036924504b..e4ac39c87b4 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -32,6 +32,8 @@
+@@ -32,6 +32,9 @@
  #include <grub/efi/api.h>
  #include <grub/efi/efi.h>
  #include <grub/efi/disk.h>
 +#include <grub/efi/pe32.h>
++#include <grub/efi/sb.h>
 +#include <grub/efi/linux.h>
+ #include <grub/efi/memory.h>
  #include <grub/command.h>
  #include <grub/i18n.h>
- #include <grub/net.h>
-@@ -46,9 +48,14 @@ static grub_dl_t my_mod;
+@@ -45,13 +48,24 @@ GRUB_MOD_LICENSE ("GPLv3+");
  
- static grub_efi_physical_address_t address;
- static grub_efi_uintn_t pages;
+ static grub_dl_t my_mod;
+ 
++static grub_efi_physical_address_t address;
++static grub_efi_uintn_t pages;
 +static grub_ssize_t fsize;
- static grub_efi_device_path_t *file_path;
- static grub_efi_handle_t image_handle;
- static grub_efi_char16_t *cmdline;
++static grub_efi_device_path_t *file_path;
++static grub_efi_handle_t image_handle;
++static grub_efi_char16_t *cmdline;
 +static grub_ssize_t cmdline_len;
 +static grub_efi_handle_t dev_handle;
 +
-+static grub_efi_status_t (*entry_point) (grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
- 
++static grub_efi_status_t (__grub_efi_api *entry_point) (grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
++
  static grub_err_t
- grub_chainloader_unload (void)
-@@ -63,6 +70,7 @@ grub_chainloader_unload (void)
-   grub_free (cmdline);
-   cmdline = 0;
-   file_path = 0;
-+  dev_handle = 0;
+ grub_chainloader_unload (void *context)
+ {
+-  grub_efi_handle_t image_handle = (grub_efi_handle_t) context;
+   grub_efi_loaded_image_t *loaded_image;
+   grub_efi_boot_services_t *b;
  
-   grub_dl_unref (my_mod);
-   return GRUB_ERR_NONE;
-@@ -213,20 +221,694 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
++  image_handle = (grub_efi_handle_t) context;
+   loaded_image = grub_efi_get_loaded_image (image_handle);
+   if (loaded_image != NULL)
+     grub_free (loaded_image->load_options);
+@@ -66,12 +80,12 @@ grub_chainloader_unload (void *context)
+ static grub_err_t
+ grub_chainloader_boot (void *context)
+ {
+-  grub_efi_handle_t image_handle = (grub_efi_handle_t) context;
+   grub_efi_boot_services_t *b;
+   grub_efi_status_t status;
+   grub_efi_uintn_t exit_data_size;
+   grub_efi_char16_t *exit_data = NULL;
+ 
++  image_handle = (grub_efi_handle_t) context;
+   b = grub_efi_system_table->boot_services;
+   status = b->start_image (image_handle, &exit_data_size, &exit_data);
+   if (status != GRUB_EFI_SUCCESS)
+@@ -136,7 +150,7 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
+   char *dir_start;
+   char *dir_end;
+   grub_size_t size;
+-  grub_efi_device_path_t *d, *file_path;
++  grub_efi_device_path_t *d;
+ 
+   dir_start = grub_strchr (filename, ')');
+   if (! dir_start)
+@@ -209,24 +223,701 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
    return file_path;
  }
  
@@ -327,7 +301,7 @@ index 2bd80f4db3..e6a8d4ad0e 100644
 +read_header (void *data, grub_efi_uint32_t size,
 +	     pe_coff_loader_image_context_t *context)
 +{
-+  grub_efi_guid_t guid = SHIM_LOCK_GUID;
++  grub_guid_t guid = SHIM_LOCK_GUID;
 +  grub_efi_shim_lock_t *shim_lock;
 +  grub_efi_status_t status;
 +
@@ -640,8 +614,8 @@ index 2bd80f4db3..e6a8d4ad0e 100644
 +  grub_dprintf ("chain", "image size is %08"PRIxGRUB_UINT64_T", datasize is %08x\n",
 +	       context.image_size, datasize);
 +
-+  efi_status = efi_call_3 (b->allocate_pool, GRUB_EFI_LOADER_DATA,
-+			   buffer_size, &buffer);
++  efi_status = b->allocate_pool (GRUB_EFI_LOADER_DATA,
++                                 buffer_size, (void**)&buffer);
 +
 +  if (efi_status != GRUB_EFI_SUCCESS)
 +    {
@@ -868,19 +842,19 @@ index 2bd80f4db3..e6a8d4ad0e 100644
 +    }
 +
 +  grub_dprintf ("chain", "booting via entry point\n");
-+  efi_status = efi_call_2 (entry_point, grub_efi_image_handle,
-+			   grub_efi_system_table);
++  efi_status = entry_point (grub_efi_image_handle,
++                            grub_efi_system_table);
 +
 +  grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
 +  grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
-+  efi_status = efi_call_1 (b->free_pool, buffer);
++  efi_status = b->free_pool (buffer);
 +
 +  return 1;
 +
 +error_exit:
 +  grub_dprintf ("chain", "error_exit: grub_errno: %d\n", grub_errno);
 +  if (buffer)
-+      efi_call_1 (b->free_pool, buffer);
++    b->free_pool (buffer);
 +
 +  return 0;
 +}
@@ -891,7 +865,7 @@ index 2bd80f4db3..e6a8d4ad0e 100644
 +  grub_efi_boot_services_t *b;
 +
 +  b = grub_efi_system_table->boot_services;
-+  efi_call_2 (b->free_pages, address, pages);
++  b->free_pages (address, pages);
 +  grub_free (file_path);
 +  grub_free (cmdline);
 +  cmdline = 0;
@@ -911,8 +885,8 @@ index 2bd80f4db3..e6a8d4ad0e 100644
 +
 +  b = grub_efi_system_table->boot_services;
 +
-+  status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, file_path,
-+		       boot_image, fsize, &image_handle);
++  status = b->load_image (0, grub_efi_image_handle, file_path,
++                          boot_image, fsize, &image_handle);
 +  if (status != GRUB_EFI_SUCCESS)
 +    {
 +      if (status == GRUB_EFI_OUT_OF_RESOURCES)
@@ -965,20 +939,28 @@ index 2bd80f4db3..e6a8d4ad0e 100644
    grub_efi_status_t status;
    grub_efi_boot_services_t *b;
    grub_device_t dev = 0;
-   grub_efi_device_path_t *dp = 0;
+-  grub_efi_device_path_t *dp = NULL, *file_path = NULL;
 -  grub_efi_loaded_image_t *loaded_image;
++  grub_efi_device_path_t *dp = NULL;
    char *filename;
    void *boot_image = 0;
 -  grub_efi_handle_t dev_handle = 0;
+-  grub_efi_physical_address_t address = 0;
+-  grub_efi_uintn_t pages = 0;
+-  grub_efi_char16_t *cmdline = NULL;
+-  grub_efi_handle_t image_handle = NULL;
 +  int rc;
++
++  file_path = NULL;
++  address = 0;
++  pages = 0;
++  cmdline = NULL;
++  image_handle = NULL;
++  dev_handle = 0;
  
    if (argc == 0)
      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-@@ -238,15 +920,45 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
-   address = 0;
-   image_handle = 0;
-   file_path = 0;
-+  dev_handle = 0;
+@@ -236,12 +927,42 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  
    b = grub_efi_system_table->boot_services;
  
@@ -1007,6 +989,7 @@ index 2bd80f4db3..e6a8d4ad0e 100644
 +        }
 +      *(--p16) = 0;
 +    }
++
 +
    file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);
    if (! file)
@@ -1019,16 +1002,18 @@ index 2bd80f4db3..e6a8d4ad0e 100644
 +  dev = grub_device_open (devname);
 +  if (devname)
 +    grub_free (devname);
-   if (! dev)
-     goto fail;
- 
-@@ -283,17 +995,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
-   if (! file_path)
-     goto fail;
- 
--  grub_printf ("file path: ");
--  grub_efi_print_device_path (file_path);
+   if (dev == NULL)
+     ;
+   else if (dev->disk)
+@@ -272,19 +993,16 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+       file_path = make_file_path (dp, filename);
+       if (file_path == NULL)
+ 	goto fail;
 -
+-      grub_printf ("file path: ");
+-      grub_efi_print_device_path (file_path);
+     }
+ 
 -  size = grub_file_size (file);
 -  if (!size)
 +  fsize = grub_file_size (file);
@@ -1038,12 +1023,12 @@ index 2bd80f4db3..e6a8d4ad0e 100644
  		  filename);
        goto fail;
      }
--  pages = (((grub_efi_uintn_t) size + ((1 << 12) - 1)) >> 12);
-+  pages = (((grub_efi_uintn_t) fsize + ((1 << 12) - 1)) >> 12);
+-  pages = (grub_efi_uintn_t) GRUB_EFI_BYTES_TO_PAGES (size);
++  pages = (grub_efi_uintn_t) GRUB_EFI_BYTES_TO_PAGES (fsize);
  
-   status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ANY_PAGES,
+   status = b->allocate_pages (GRUB_EFI_ALLOCATE_ANY_PAGES,
  			      GRUB_EFI_LOADER_CODE,
-@@ -307,7 +1016,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -298,7 +1016,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  
    boot_image = (void *) ((grub_addr_t) address);
@@ -1052,7 +1037,7 @@ index 2bd80f4db3..e6a8d4ad0e 100644
      {
        if (grub_errno == GRUB_ERR_NONE)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -317,7 +1026,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -308,7 +1026,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  
  #if defined (__i386__) || defined (__x86_64__)
@@ -1061,7 +1046,7 @@ index 2bd80f4db3..e6a8d4ad0e 100644
      {
        struct grub_macho_fat_header *head = boot_image;
        if (head->magic
-@@ -326,6 +1035,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -317,6 +1035,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  	  grub_uint32_t i;
  	  struct grub_macho_fat_arch *archs
  	    = (struct grub_macho_fat_arch *) (head + 1);
@@ -1076,7 +1061,7 @@ index 2bd80f4db3..e6a8d4ad0e 100644
  	  for (i = 0; i < grub_cpu_to_le32 (head->nfat_arch); i++)
  	    {
  	      if (GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT (archs[i].cputype))
-@@ -340,79 +1057,39 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -331,83 +1057,39 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  	      > ~grub_cpu_to_le32 (archs[i].size)
  	      || grub_cpu_to_le32 (archs[i].offset)
  	      + grub_cpu_to_le32 (archs[i].size)
@@ -1094,9 +1079,9 @@ index 2bd80f4db3..e6a8d4ad0e 100644
      }
  #endif
  
--  status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, file_path,
--		       boot_image, size,
--		       &image_handle);
+-  status = b->load_image (0, grub_efi_image_handle, file_path,
+-			  boot_image, size,
+-			  &image_handle);
 -  if (status != GRUB_EFI_SUCCESS)
 +  rc = grub_linuxefi_secure_validate((void *)(unsigned long)address, fsize);
 +  grub_dprintf ("chain", "linuxefi_secure_validate: %d\n", rc);
@@ -1127,6 +1112,7 @@ index 2bd80f4db3..e6a8d4ad0e 100644
 -    }
 -  loaded_image->device_handle = dev_handle;
 -
+-  /* Build load options with arguments from chainloader command line. */
 -  if (argc > 1)
 -    {
 -      int i, len;
@@ -1142,7 +1128,7 @@ index 2bd80f4db3..e6a8d4ad0e 100644
 +      grub_load_and_start_image(boot_image);
 +      grub_file_close (file);
 +      grub_device_close (dev);
-+      grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
++      grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0);
  
 -      for (i = 1; i < argc; i++)
 -        {
@@ -1164,30 +1150,33 @@ index 2bd80f4db3..e6a8d4ad0e 100644
 -  grub_file_close (file);
 -  grub_device_close (dev);
 -
--  grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
+-  /* We're finished with the source image buffer and file path now. */
+-  b->free_pages (address, pages);
+-  grub_free (file_path);
+-
+-  grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0);
 -  return 0;
 -
 - fail:
--
 +fail:
+ 
    if (dev)
      grub_device_close (dev);
- 
-@@ -424,6 +1101,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -421,6 +1103,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    if (address)
-     efi_call_2 (b->free_pages, address, pages);
+     grub_efi_free_pages (address, pages);
  
 +  if (cmdline)
 +    grub_free (cmdline);
 +
-   grub_dl_unref (my_mod);
+   if (image_handle != NULL)
+     b->unload_image (image_handle);
  
-   return grub_errno;
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index c24202a5dd..c8ecce6dfd 100644
+index 925394d1767..0a7f8208022 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
-@@ -33,21 +33,34 @@ struct grub_efi_shim_lock
+@@ -98,21 +98,36 @@ struct grub_efi_shim_lock
  };
  typedef struct grub_efi_shim_lock grub_efi_shim_lock_t;
  
@@ -1195,12 +1184,12 @@ index c24202a5dd..c8ecce6dfd 100644
 +int
  grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
  {
-   grub_efi_guid_t guid = SHIM_LOCK_GUID;
+   grub_guid_t guid = SHIM_LOCK_GUID;
    grub_efi_shim_lock_t *shim_lock;
 +  grub_efi_status_t status;
  
    shim_lock = grub_efi_locate_protocol(&guid, NULL);
--
+ 
 +  grub_dprintf ("secureboot", "shim_lock: %p\n", shim_lock);
    if (!shim_lock)
 -    return 1;
@@ -1219,17 +1208,18 @@ index c24202a5dd..c8ecce6dfd 100644
 +      grub_dprintf ("secureboot", "Kernel signature verification passed\n");
 +      return 1;
 +    }
- 
--  return 0;
++
 +  grub_dprintf ("secureboot", "Kernel signature verification failed (0x%lx)\n",
 +		(unsigned long) status);
 +
 +  return -1;
+ 
+-  return 0;
  }
  
  #pragma GCC diagnostic push
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index bb2616a809..6b24cbb948 100644
+index 9bfb4ab9e3e..b59d125286d 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -117,6 +117,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -1255,7 +1245,7 @@ index bb2616a809..6b24cbb948 100644
      {
 -      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"), argv[0]);
 +      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"),
-+		  argv[0]);
++                  argv[0]);
        goto fail;
      }
  
@@ -1264,7 +1254,7 @@ index bb2616a809..6b24cbb948 100644
 +  if (rc < 0)
      {
        grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"),
- 		  argv[0]);
+                   argv[0]);
 @@ -203,6 +208,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
@@ -1279,7 +1269,7 @@ index bb2616a809..6b24cbb948 100644
      }
  
 +  grub_dprintf ("linux", "linux_cmdline = %lx\n",
-+		(unsigned long)linux_cmdline);
++                (unsigned long)linux_cmdline);
 +
    grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
    grub_create_loader_cmdline (argc, argv,
@@ -1289,7 +1279,7 @@ index bb2616a809..6b24cbb948 100644
  
    params->type_of_loader = 0x21;
 +  grub_dprintf("linux", "kernel_mem: %p handover_offset: %08x\n",
-+	       kernel_mem, handover_offset);
++               kernel_mem, handover_offset);
  
   fail:
 -
@@ -1297,7 +1287,7 @@ index bb2616a809..6b24cbb948 100644
      grub_file_close (file);
  
 diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
-index d9ede36773..0033d9305a 100644
+index d224daafa4f..b2cfd8c1f44 100644
 --- a/include/grub/efi/linux.h
 +++ b/include/grub/efi/linux.h
 @@ -22,7 +22,7 @@
@@ -1310,10 +1300,10 @@ index d9ede36773..0033d9305a 100644
  grub_err_t
  EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
 diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
-index 0ed8781f03..a43adf2746 100644
+index 9887e14b278..a39743396dc 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
-@@ -223,7 +223,11 @@ struct grub_pe64_optional_header
+@@ -238,7 +238,11 @@ struct grub_pe64_optional_header
  struct grub_pe32_section_table
  {
    char name[8];
@@ -1326,7 +1316,7 @@ index 0ed8781f03..a43adf2746 100644
    grub_uint32_t virtual_address;
    grub_uint32_t raw_data_size;
    grub_uint32_t raw_data_offset;
-@@ -234,12 +238,18 @@ struct grub_pe32_section_table
+@@ -249,12 +253,18 @@ struct grub_pe32_section_table
    grub_uint32_t characteristics;
  };
  
@@ -1349,7 +1339,7 @@ index 0ed8781f03..a43adf2746 100644
  
  #define GRUB_PE32_SCN_ALIGN_1BYTES		0x00100000
  #define GRUB_PE32_SCN_ALIGN_2BYTES		0x00200000
-@@ -248,10 +258,28 @@ struct grub_pe32_section_table
+@@ -263,10 +273,26 @@ struct grub_pe32_section_table
  #define GRUB_PE32_SCN_ALIGN_16BYTES		0x00500000
  #define GRUB_PE32_SCN_ALIGN_32BYTES		0x00600000
  #define GRUB_PE32_SCN_ALIGN_64BYTES		0x00700000
@@ -1372,13 +1362,11 @@ index 0ed8781f03..a43adf2746 100644
 +#define GRUB_PE32_SCN_MEM_EXECUTE		0x20000000
 +#define GRUB_PE32_SCN_MEM_READ			0x40000000
 +#define GRUB_PE32_SCN_MEM_WRITE			0x80000000
-+
-+
 +
  #define GRUB_PE32_SIGNATURE_SIZE 4
  
- struct grub_pe32_header
-@@ -274,6 +302,20 @@ struct grub_pe32_header
+ #if GRUB_TARGET_SIZEOF_VOID_P == 8
+@@ -292,6 +318,21 @@ struct grub_pe_image_header
  #endif
  };
  
@@ -1395,6 +1383,7 @@ index 0ed8781f03..a43adf2746 100644
 +  struct grub_pe32_coff_header coff_header;
 +  struct grub_pe64_optional_header optional_header;
 +};
++
 +
  struct grub_pe32_fixup_block
  {
diff --git a/0215-powerpc-do-CAS-in-a-more-compatible-way.patch b/0215-powerpc-do-CAS-in-a-more-compatible-way.patch
deleted file mode 100644
index 20b95f75..00000000
--- a/0215-powerpc-do-CAS-in-a-more-compatible-way.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Fri, 8 Apr 2022 12:35:28 +1000
-Subject: [PATCH] powerpc: do CAS in a more compatible way
-
-I wrongly assumed that the most compatible way to perform CAS
-negotiation was to only set the minimum number of vectors required
-to ask for more memory. It turns out that this messes up booting
-if the minimum VP capacity would be less than the default 10% in
-vector 4.
-
-Linux configures the minimum capacity to be 1%, so copy it for that
-and for vector 3 which we now need to specify as well.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
----
- grub-core/kern/ieee1275/init.c | 54 ++++++++++++++++++++++++------------------
- 1 file changed, 31 insertions(+), 23 deletions(-)
-
-diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 9704715c83..ef55107467 100644
---- a/grub-core/kern/ieee1275/init.c
-+++ b/grub-core/kern/ieee1275/init.c
-@@ -298,33 +298,37 @@ grub_ieee1275_total_mem (grub_uint64_t *total)
- 
- /* Based on linux - arch/powerpc/kernel/prom_init.c */
- struct option_vector2 {
--	grub_uint8_t byte1;
--	grub_uint16_t reserved;
--	grub_uint32_t real_base;
--	grub_uint32_t real_size;
--	grub_uint32_t virt_base;
--	grub_uint32_t virt_size;
--	grub_uint32_t load_base;
--	grub_uint32_t min_rma;
--	grub_uint32_t min_load;
--	grub_uint8_t min_rma_percent;
--	grub_uint8_t max_pft_size;
-+  grub_uint8_t byte1;
-+  grub_uint16_t reserved;
-+  grub_uint32_t real_base;
-+  grub_uint32_t real_size;
-+  grub_uint32_t virt_base;
-+  grub_uint32_t virt_size;
-+  grub_uint32_t load_base;
-+  grub_uint32_t min_rma;
-+  grub_uint32_t min_load;
-+  grub_uint8_t min_rma_percent;
-+  grub_uint8_t max_pft_size;
- } __attribute__((packed));
- 
- struct pvr_entry {
--	  grub_uint32_t mask;
--	  grub_uint32_t entry;
-+  grub_uint32_t mask;
-+  grub_uint32_t entry;
- };
- 
- struct cas_vector {
--    struct {
--      struct pvr_entry terminal;
--    } pvr_list;
--    grub_uint8_t num_vecs;
--    grub_uint8_t vec1_size;
--    grub_uint8_t vec1;
--    grub_uint8_t vec2_size;
--    struct option_vector2 vec2;
-+  struct {
-+    struct pvr_entry terminal;
-+  } pvr_list;
-+  grub_uint8_t num_vecs;
-+  grub_uint8_t vec1_size;
-+  grub_uint8_t vec1;
-+  grub_uint8_t vec2_size;
-+  struct option_vector2 vec2;
-+  grub_uint8_t vec3_size;
-+  grub_uint16_t vec3;
-+  grub_uint8_t vec4_size;
-+  grub_uint16_t vec4;
- } __attribute__((packed));
- 
- /* Call ibm,client-architecture-support to try to get more RMA.
-@@ -345,13 +349,17 @@ grub_ieee1275_ibm_cas (void)
-   } args;
-   struct cas_vector vector = {
-     .pvr_list = { { 0x00000000, 0xffffffff } }, /* any processor */
--    .num_vecs = 2 - 1,
-+    .num_vecs = 4 - 1,
-     .vec1_size = 0,
-     .vec1 = 0x80, /* ignore */
-     .vec2_size = 1 + sizeof(struct option_vector2) - 2,
-     .vec2 = {
-       0, 0, -1, -1, -1, -1, -1, 512, -1, 0, 48
-     },
-+    .vec3_size = 2 - 1,
-+    .vec3 = 0x00e0, // ask for FP + VMX + DFP but don't halt if unsatisfied
-+    .vec4_size = 2 - 1,
-+    .vec4 = 0x0001, // set required minimum capacity % to the lowest value
-   };
- 
-   INIT_IEEE1275_COMMON (&args.common, "call-method", 3, 2);
-@@ -364,7 +372,7 @@ grub_ieee1275_ibm_cas (void)
-   args.ihandle = root;
-   args.cas_addr = (grub_ieee1275_cell_t)&vector;
- 
--  grub_printf("Calling ibm,client-architecture-support...");
-+  grub_printf("Calling ibm,client-architecture-support from grub...");
-   IEEE1275_CALL_ENTRY_FN (&args);
-   grub_printf("done\n");
- 
diff --git a/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0216-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
similarity index 66%
rename from 0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
rename to 0216-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
index 487d5c0b..8313e06c 100644
--- a/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+++ b/0216-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Tue, 6 Oct 2015 16:09:25 -0400
+Date: Tue, 13 Feb 2024 16:30:24 -0600
 Subject: [PATCH] Make any of the loaders that link in efi mode honor secure
  boot.
 
@@ -9,30 +9,27 @@ won't register commands if SB is enabled."
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/commands/iorw.c          |  7 +++++++
- grub-core/commands/memrw.c         |  7 +++++++
- grub-core/kern/dl.c                |  3 ++-
- grub-core/kern/efi/efi.c           | 34 ----------------------------------
- grub-core/loader/efi/appleloader.c |  7 +++++++
- grub-core/loader/efi/chainloader.c |  1 +
- grub-core/loader/i386/bsd.c        |  7 +++++++
- grub-core/loader/i386/linux.c      |  7 +++++++
- grub-core/loader/i386/pc/linux.c   |  7 +++++++
- grub-core/loader/multiboot.c       |  7 +++++++
- grub-core/loader/xnu.c             |  7 +++++++
- include/grub/efi/efi.h             |  1 -
- include/grub/ia64/linux.h          |  0
- include/grub/mips/linux.h          |  0
- include/grub/powerpc/linux.h       |  0
- include/grub/sparc64/linux.h       |  0
- 16 files changed, 59 insertions(+), 36 deletions(-)
+ grub-core/commands/iorw.c          | 7 +++++++
+ grub-core/commands/memrw.c         | 7 +++++++
+ grub-core/kern/dl.c                | 4 ++--
+ grub-core/loader/efi/appleloader.c | 7 +++++++
+ grub-core/loader/i386/bsd.c        | 7 +++++++
+ grub-core/loader/i386/linux.c      | 7 +++++++
+ grub-core/loader/i386/pc/linux.c   | 7 +++++++
+ grub-core/loader/multiboot.c       | 7 +++++++
+ grub-core/loader/xnu.c             | 7 +++++++
+ include/grub/ia64/linux.h          | 0
+ include/grub/mips/linux.h          | 0
+ include/grub/powerpc/linux.h       | 0
+ include/grub/sparc64/linux.h       | 0
+ 13 files changed, 58 insertions(+), 2 deletions(-)
  create mode 100644 include/grub/ia64/linux.h
  create mode 100644 include/grub/mips/linux.h
  create mode 100644 include/grub/powerpc/linux.h
  create mode 100644 include/grub/sparc64/linux.h
 
 diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
-index 584baec8f9..7b2999b14b 100644
+index 584baec8f91..7b2999b14b5 100644
 --- a/grub-core/commands/iorw.c
 +++ b/grub-core/commands/iorw.c
 @@ -24,6 +24,7 @@
@@ -64,7 +61,7 @@ index 584baec8f9..7b2999b14b 100644
    grub_unregister_extcmd (cmd_read_word);
    grub_unregister_extcmd (cmd_read_dword);
 diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
-index d401a6db0e..39cf3a06db 100644
+index d401a6db0ef..39cf3a06dbd 100644
 --- a/grub-core/commands/memrw.c
 +++ b/grub-core/commands/memrw.c
 @@ -23,6 +23,7 @@
@@ -96,73 +93,27 @@ index d401a6db0e..39cf3a06db 100644
    grub_unregister_extcmd (cmd_read_word);
    grub_unregister_extcmd (cmd_read_dword);
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index b714937095..7afb9e6f72 100644
+index d48d4131ba7..2a9ae9fc894 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
-@@ -32,6 +32,7 @@
- #include <grub/env.h>
- #include <grub/cache.h>
- #include <grub/i18n.h>
-+#include <grub/efi/sb.h>
- 
- /* Platforms where modules are in a readonly area of memory.  */
- #if defined(GRUB_MACHINE_QEMU)
-@@ -704,7 +705,7 @@ grub_dl_load_file (const char *filename)
+@@ -871,13 +871,13 @@ grub_dl_load_file (const char *filename)
    grub_dl_t mod = 0;
  
  #ifdef GRUB_MACHINE_EFI
--  if (grub_efi_secure_boot ())
+-  if (grub_efi_get_secureboot ())
 +  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
      {
  #if 0
        /* This is an error, but grub2-mkconfig still generates a pile of
-diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 4a2259aa1c..8cff7be028 100644
---- a/grub-core/kern/efi/efi.c
-+++ b/grub-core/kern/efi/efi.c
-@@ -286,40 +286,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
-   return grub_efi_get_variable_with_attributes (var, guid, datasize_out, data_out, NULL);
- }
- 
--grub_efi_boolean_t
--grub_efi_secure_boot (void)
--{
--  grub_efi_guid_t efi_var_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID;
--  grub_size_t datasize;
--  char *secure_boot = NULL;
--  char *setup_mode = NULL;
--  grub_efi_boolean_t ret = 0;
--
--  secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
--  if (datasize != 1 || !secure_boot)
--    {
--      grub_dprintf ("secureboot", "No SecureBoot variable\n");
--      goto out;
--    }
--  grub_dprintf ("secureboot", "SecureBoot: %d\n", *secure_boot);
--
--  setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
--  if (datasize != 1 || !setup_mode)
--    {
--      grub_dprintf ("secureboot", "No SetupMode variable\n");
--      goto out;
--    }
--  grub_dprintf ("secureboot", "SetupMode: %d\n", *setup_mode);
--
--  if (*secure_boot && !*setup_mode)
--    ret = 1;
--
-- out:
--  grub_free (secure_boot);
--  grub_free (setup_mode);
--  return ret;
--}
--
- #pragma GCC diagnostic ignored "-Wcast-align"
- 
- /* Search the mods section from the PE32/PE32+ image. This code uses
+        * insmod commands, so emitting it would be mostly just obnoxious. */
+       grub_error (GRUB_ERR_ACCESS_DENIED,
+-		  "Secure Boot forbids loading module from %s", filename);
++  		  "Secure Boot forbids loading module from %s", filename);
+ #endif
+       return 0;
+     }
 diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
-index 74888c463b..585f2b5738 100644
+index a0b61a240b7..35d53c5f85d 100644
 --- a/grub-core/loader/efi/appleloader.c
 +++ b/grub-core/loader/efi/appleloader.c
 @@ -24,6 +24,7 @@
@@ -192,20 +143,8 @@ index 74888c463b..585f2b5738 100644
 +
    grub_unregister_command (cmd);
  }
-diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index e6a8d4ad0e..07c4937898 100644
---- a/grub-core/loader/efi/chainloader.c
-+++ b/grub-core/loader/efi/chainloader.c
-@@ -34,6 +34,7 @@
- #include <grub/efi/disk.h>
- #include <grub/efi/pe32.h>
- #include <grub/efi/linux.h>
-+#include <grub/efi/sb.h>
- #include <grub/command.h>
- #include <grub/i18n.h>
- #include <grub/net.h>
 diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 5f3290ce17..54befc2662 100644
+index 1f9128f6f20..8075ac9b06a 100644
 --- a/grub-core/loader/i386/bsd.c
 +++ b/grub-core/loader/i386/bsd.c
 @@ -40,6 +40,7 @@
@@ -237,7 +176,7 @@ index 5f3290ce17..54befc2662 100644
    grub_unregister_extcmd (cmd_openbsd);
    grub_unregister_extcmd (cmd_netbsd);
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index dccf3bb300..4aeb0e4b9a 100644
+index 10f967f2563..5a257552234 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -37,6 +37,7 @@
@@ -248,7 +187,7 @@ index dccf3bb300..4aeb0e4b9a 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -1138,6 +1139,9 @@ static grub_command_t cmd_linux, cmd_initrd;
+@@ -1164,6 +1165,9 @@ static grub_command_t cmd_linux, cmd_initrd;
  
  GRUB_MOD_INIT(linux)
  {
@@ -258,7 +197,7 @@ index dccf3bb300..4aeb0e4b9a 100644
    cmd_linux = grub_register_command ("linux", grub_cmd_linux,
  				     0, N_("Load Linux."));
    cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-@@ -1147,6 +1151,9 @@ GRUB_MOD_INIT(linux)
+@@ -1173,6 +1177,9 @@ GRUB_MOD_INIT(linux)
  
  GRUB_MOD_FINI(linux)
  {
@@ -269,7 +208,7 @@ index dccf3bb300..4aeb0e4b9a 100644
    grub_unregister_command (cmd_initrd);
  }
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 4b1750e360..e3fa1221e8 100644
+index 8593d74737f..54a76504a79 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -36,6 +36,7 @@
@@ -301,7 +240,7 @@ index 4b1750e360..e3fa1221e8 100644
    grub_unregister_command (cmd_linux16);
    grub_unregister_command (cmd_initrd);
 diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index facb13f3d3..47e481f457 100644
+index 94be512c4d0..94c112a29d4 100644
 --- a/grub-core/loader/multiboot.c
 +++ b/grub-core/loader/multiboot.c
 @@ -50,6 +50,7 @@
@@ -333,7 +272,7 @@ index facb13f3d3..47e481f457 100644
    grub_unregister_command (cmd_module);
  }
 diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index 1c0cf6a430..baa54e652a 100644
+index 4cca55df92d..f76f511ac2d 100644
 --- a/grub-core/loader/xnu.c
 +++ b/grub-core/loader/xnu.c
 @@ -35,6 +35,7 @@
@@ -364,27 +303,15 @@ index 1c0cf6a430..baa54e652a 100644
  #ifndef GRUB_MACHINE_EMU
    grub_unregister_command (cmd_resume);
  #endif
-diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 6295df85f3..585fa6662b 100644
---- a/include/grub/efi/efi.h
-+++ b/include/grub/efi/efi.h
-@@ -91,7 +91,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
- 				     const grub_efi_guid_t *guid,
- 				     void *data,
- 				     grub_size_t datasize);
--grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);
- int
- EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
- 					     const grub_efi_device_path_t *dp2);
 diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h
 new file mode 100644
-index 0000000000..e69de29bb2
+index 00000000000..e69de29bb2d
 diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h
 new file mode 100644
-index 0000000000..e69de29bb2
+index 00000000000..e69de29bb2d
 diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h
 new file mode 100644
-index 0000000000..e69de29bb2
+index 00000000000..e69de29bb2d
 diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
 new file mode 100644
-index 0000000000..e69de29bb2
+index 00000000000..e69de29bb2d
diff --git a/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0217-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
similarity index 93%
rename from 0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
rename to 0217-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
index f4d83da1..428737cd 100644
--- a/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+++ b/0217-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
@@ -10,10 +10,10 @@ 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 301d1ac229..0f6505bf3b 100644
+index c2e107b41ab..4eadcba4b85 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
-@@ -253,6 +253,14 @@ version_test_gt ()
+@@ -299,6 +299,14 @@ version_test_gt ()
      *.old:*.old) ;;
      *.old:*) version_test_gt_a="`echo "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;;
      *:*.old) version_test_gt_b="`echo "$version_test_gt_b" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=ge ;;
diff --git a/0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch b/0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch
deleted file mode 100644
index 3c73469d..00000000
--- a/0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch
+++ /dev/null
@@ -1,236 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.ibm.com>
-Date: Sun, 15 Mar 2020 12:37:10 -0400
-Subject: [PATCH] ibmvtpm: Add support for trusted boot using a vTPM 2.0
-
-Add support for trusted boot using a vTPM 2.0 on the IBM IEEE1275
-PowerPC platform. With this patch grub now measures text and binary data
-into the TPM's PCRs 8 and 9 in the same way as the x86_64 platform
-does.
-
-This patch requires Daniel Axtens's patches for claiming more memory.
-
-For vTPM support to work on PowerVM, system driver levels 1010.30
-or 1020.00 are required.
-
-Note: Previous versions of firmware levels with the 2hash-ext-log
-API call have a bug that, once this API call is invoked, has the
-effect of disabling the vTPM driver under Linux causing an error
-message to be displayed in the Linux kernel log. Those users will
-have to update their machines to the firmware levels mentioned
-above.
-
-Cc: Eric Snowberg <eric.snowberg@oracle.com>
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- grub-core/Makefile.core.def           |   7 ++
- grub-core/commands/ieee1275/ibmvtpm.c | 152 ++++++++++++++++++++++++++++++++++
- include/grub/ieee1275/ieee1275.h      |   3 +
- docs/grub.texi                        |   3 +-
- 4 files changed, 164 insertions(+), 1 deletion(-)
- create mode 100644 grub-core/commands/ieee1275/ibmvtpm.c
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 3c0ac3b7bd..2c1608bca4 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -1175,6 +1175,13 @@ module = {
-   enable = powerpc_ieee1275;
- };
- 
-+module = {
-+  name = tpm;
-+  common = commands/tpm.c;
-+  ieee1275 = commands/ieee1275/ibmvtpm.c;
-+  enable = powerpc_ieee1275;
-+};
-+
- module = {
-   name = terminal;
-   common = commands/terminal.c;
-diff --git a/grub-core/commands/ieee1275/ibmvtpm.c b/grub-core/commands/ieee1275/ibmvtpm.c
-new file mode 100644
-index 0000000000..e68b8448bc
---- /dev/null
-+++ b/grub-core/commands/ieee1275/ibmvtpm.c
-@@ -0,0 +1,152 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2021  Free Software Foundation, Inc.
-+ *  Copyright (C) 2021  IBM Corporation
-+ *
-+ *  GRUB is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  GRUB is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ *  IBM vTPM support code.
-+ */
-+
-+#include <grub/err.h>
-+#include <grub/types.h>
-+#include <grub/tpm.h>
-+#include <grub/ieee1275/ieee1275.h>
-+#include <grub/mm.h>
-+#include <grub/misc.h>
-+
-+static grub_ieee1275_ihandle_t tpm_ihandle;
-+static grub_uint8_t tpm_version;
-+
-+#define IEEE1275_IHANDLE_INVALID ((grub_ieee1275_ihandle_t)0)
-+
-+static void
-+tpm_get_tpm_version (void)
-+{
-+  grub_ieee1275_phandle_t vtpm;
-+  char buffer[20];
-+
-+  if (!grub_ieee1275_finddevice ("/vdevice/vtpm", &vtpm) &&
-+      !grub_ieee1275_get_property (vtpm, "compatible", buffer,
-+				   sizeof (buffer), NULL) &&
-+      !grub_strcmp (buffer, "IBM,vtpm20"))
-+    tpm_version = 2;
-+}
-+
-+static grub_err_t
-+tpm_init (void)
-+{
-+  static int init_success = 0;
-+
-+  if (!init_success)
-+    {
-+      if (grub_ieee1275_open ("/vdevice/vtpm", &tpm_ihandle) < 0) {
-+        tpm_ihandle = IEEE1275_IHANDLE_INVALID;
-+        return GRUB_ERR_UNKNOWN_DEVICE;
-+      }
-+
-+      init_success = 1;
-+
-+      tpm_get_tpm_version ();
-+    }
-+
-+  return GRUB_ERR_NONE;
-+}
-+
-+static int
-+ibmvtpm_2hash_ext_log (grub_uint8_t pcrindex,
-+		       grub_uint32_t eventtype,
-+		       const char *description,
-+		       grub_size_t description_size,
-+		       void *buf, grub_size_t size)
-+{
-+  struct tpm_2hash_ext_log
-+  {
-+    struct grub_ieee1275_common_hdr common;
-+    grub_ieee1275_cell_t method;
-+    grub_ieee1275_cell_t ihandle;
-+    grub_ieee1275_cell_t size;
-+    grub_ieee1275_cell_t buf;
-+    grub_ieee1275_cell_t description_size;
-+    grub_ieee1275_cell_t description;
-+    grub_ieee1275_cell_t eventtype;
-+    grub_ieee1275_cell_t pcrindex;
-+    grub_ieee1275_cell_t catch_result;
-+    grub_ieee1275_cell_t rc;
-+  }
-+  args;
-+
-+  INIT_IEEE1275_COMMON (&args.common, "call-method", 8, 2);
-+  args.method = (grub_ieee1275_cell_t) "2hash-ext-log";
-+  args.ihandle = tpm_ihandle;
-+  args.pcrindex = pcrindex;
-+  args.eventtype = eventtype;
-+  args.description = (grub_ieee1275_cell_t) description;
-+  args.description_size = description_size;
-+  args.buf = (grub_ieee1275_cell_t) buf;
-+  args.size = (grub_ieee1275_cell_t) size;
-+
-+  if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
-+    return -1;
-+
-+  /*
-+   * catch_result is set if firmware does not support 2hash-ext-log
-+   * rc is GRUB_IEEE1275_CELL_FALSE (0) on failure
-+   */
-+  if ((args.catch_result) || args.rc == GRUB_IEEE1275_CELL_FALSE)
-+    return -1;
-+
-+  return 0;
-+}
-+
-+static grub_err_t
-+tpm2_log_event (unsigned char *buf,
-+		grub_size_t size, grub_uint8_t pcr,
-+		const char *description)
-+{
-+  static int error_displayed = 0;
-+  int err;
-+
-+  err = ibmvtpm_2hash_ext_log (pcr, EV_IPL,
-+			       description,
-+			       grub_strlen(description) + 1,
-+			       buf, size);
-+  if (err && !error_displayed)
-+    {
-+      error_displayed++;
-+      return grub_error (GRUB_ERR_BAD_DEVICE,
-+	      "2HASH-EXT-LOG failed: Firmware is likely too old.\n");
-+    }
-+
-+  return GRUB_ERR_NONE;
-+}
-+
-+grub_err_t
-+grub_tpm_measure (unsigned char *buf, grub_size_t size, grub_uint8_t pcr,
-+		  const char *description)
-+{
-+  grub_err_t err = tpm_init();
-+
-+  /* Absence of a TPM isn't a failure. */
-+  if (err != GRUB_ERR_NONE)
-+    return GRUB_ERR_NONE;
-+
-+  grub_dprintf ("tpm", "log_event, pcr = %d, size = 0x%" PRIxGRUB_SIZE ", %s\n",
-+		pcr, size, description);
-+
-+  if (tpm_version == 2)
-+    return tpm2_log_event (buf, size, pcr, description);
-+
-+  return GRUB_ERR_NONE;
-+}
-diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index e0a6c2ce1e..f4c85265fe 100644
---- a/include/grub/ieee1275/ieee1275.h
-+++ b/include/grub/ieee1275/ieee1275.h
-@@ -24,6 +24,9 @@
- #include <grub/types.h>
- #include <grub/machine/ieee1275.h>
- 
-+#define GRUB_IEEE1275_CELL_FALSE       ((grub_ieee1275_cell_t) 0)
-+#define GRUB_IEEE1275_CELL_TRUE        ((grub_ieee1275_cell_t) -1)
-+
- struct grub_ieee1275_mem_region
- {
-   unsigned int start;
-diff --git a/docs/grub.texi b/docs/grub.texi
-index a4da9c2a1b..c433240f34 100644
---- a/docs/grub.texi
-+++ b/docs/grub.texi
-@@ -6221,7 +6221,8 @@ tpm module is loaded. As such it is recommended that the tpm module be built
- into @file{core.img} in order to avoid a potential gap in measurement between
- @file{core.img} being loaded and the tpm module being loaded.
- 
--Measured boot is currently only supported on EFI platforms.
-+Measured boot is currently only supported on EFI and IBM IEEE1275 PowerPC
-+platforms.
- 
- @node Lockdown
- @section Lockdown when booting on a secure setup
diff --git a/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0218-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
similarity index 79%
rename from 0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
rename to 0218-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
index 7658e9b8..c0f17078 100644
--- a/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
+++ b/0218-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
@@ -13,10 +13,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 20 insertions(+)
 
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index a432a6be54..9a2fae6398 100644
+index 96ab7c96b52..98700423d79 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -191,6 +191,24 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
+@@ -280,6 +280,24 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
      }
  }
  
@@ -42,13 +42,13 @@ index a432a6be54..9a2fae6398 100644
  
  int
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index fd18e6320b..3adc4036e3 100644
+index 3e9a00f0a9c..db517acd592 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
-@@ -345,6 +345,8 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file,
-                                      const int line,
-                                      const char *condition,
+@@ -386,6 +386,8 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file,
                                       const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 4, 5)));
+ int EXPORT_FUNC(grub_printf) (const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 1, 2)));
+ int EXPORT_FUNC(grub_printf_) (const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 1, 2)));
 +void EXPORT_FUNC(grub_qdprintf) (const char *condition,
 +				 const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 2, 3)));
  int EXPORT_FUNC(grub_vprintf) (const char *fmt, va_list args);
diff --git a/0218-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch b/0218-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
deleted file mode 100644
index d2458d00..00000000
--- a/0218-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Thu, 5 May 2022 18:01:05 -0400
-Subject: [PATCH] rpm-sort: add prereqs for declaration of strchrnul()
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- util/grub-rpm-sort.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
-index 8345944105..71d038bb69 100644
---- a/util/grub-rpm-sort.c
-+++ b/util/grub-rpm-sort.c
-@@ -1,13 +1,17 @@
-+#define _GNU_SOURCE 1
-+
- #include <config.h>
-+
-+#include <argp.h>
-+#include <assert.h>
-+#include <errno.h>
- #include <grub/types.h>
- #include <grub/util/misc.h>
-+#include <rpm/rpmlib.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
--#include <errno.h>
--#include <assert.h>
--#include <argp.h>
--#include <rpm/rpmlib.h>
- 
- static size_t
- read_file (const char *input, char **ret)
diff --git a/0219-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0219-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
new file mode 100644
index 00000000..c7d42e4d
--- /dev/null
+++ b/0219-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
@@ -0,0 +1,83 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 4 Apr 2024 11:57:54 -0600
+Subject: [PATCH] Make a "gdb" dprintf that tells us load addresses.
+
+This makes a grub_dprintf() call during platform init and during module
+loading that tells us the virtual addresses of the .text and .data
+sections of grub-core/kernel.exec and any modules it loads.
+
+Specifically, it displays them in the gdb "add-symbol-file" syntax, with
+the presumption that there's a variable $grubdir that reflects the path
+to any such binaries.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/kern/dl.c       | 34 ++++++++++++++++++++++++++++++++++
+ grub-core/kern/efi/init.c |  1 +
+ 2 files changed, 35 insertions(+)
+
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index 2a9ae9fc894..2eaef7150ed 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -690,6 +690,38 @@ grub_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
+   return GRUB_ERR_NONE;
+ }
+ 
++static void
++grub_dl_print_gdb_info (grub_dl_t mod, Elf_Ehdr *e)
++{
++  void *text, *data = NULL;
++  long idx;
++
++  idx = grub_dl_find_section_index (e, ".text");
++  if (idx < 0)
++    return;
++
++  text = grub_dl_get_section_addr (mod, idx);
++  if (!text)
++    return;
++
++  idx = grub_dl_find_section_index (e, ".data");
++  if (idx >= 0)
++    data = grub_dl_get_section_addr (mod, idx);
++
++  if (data)
++    grub_qdprintf ("gdb", "add-symbol-file \\\n"
++		          "/usr/lib/debug/usr/lib/grub/%s-%s/%s.debug "
++			  "\\\n %p -s .data %p\n",
++		  GRUB_TARGET_CPU, GRUB_PLATFORM,
++		  mod->name, text, data);
++  else
++    grub_qdprintf ("gdb", "add-symbol-file \\\n"
++			   "/usr/lib/debug/usr/lib/grub/%s-%s/%s.debug "
++			   "\\\n%p\n",
++		  GRUB_TARGET_CPU, GRUB_PLATFORM,
++		  mod->name, text);
++}
++
+ static grub_err_t
+ grub_dl_set_mem_attrs (grub_dl_t mod, void *ehdr)
+ {
+@@ -833,6 +865,8 @@ grub_dl_load_core_noinit (void *addr, grub_size_t size)
+   grub_dprintf ("modules", "module name: %s\n", mod->name);
+   grub_dprintf ("modules", "init function: %p\n", mod->init);
+ 
++  grub_dl_print_gdb_info (mod, e);
++
+   if (grub_dl_add (mod))
+     {
+       grub_dl_unload (mod);
+diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
+index dee3918fd35..d35d6974734 100644
+--- a/grub-core/kern/efi/init.c
++++ b/grub-core/kern/efi/init.c
+@@ -157,6 +157,7 @@ grub_efi_init (void)
+   grub_efi_system_table->boot_services->set_watchdog_timer (0, 0, 0, NULL);
+ 
+   grub_efi_env_init ();
++  grub_efi_print_gdb_info ();
+   grub_efidisk_init ();
+ 
+   grub_efi_register_debug_commands ();
diff --git a/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0220-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
similarity index 84%
rename from 0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
rename to 0220-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
index 452f43c9..0284cc64 100644
--- a/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
+++ b/0220-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
@@ -7,40 +7,40 @@ Allow booting 64-bit kernels on 32-bit EFI on x86.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/loader/efi/linux.c      |   9 +++-
- grub-core/loader/i386/efi/linux.c | 110 ++++++++++++++++++++++++++------------
- include/grub/i386/linux.h         |   7 ++-
- 3 files changed, 89 insertions(+), 37 deletions(-)
+ grub-core/loader/efi/linux.c      |   9 ++-
+ grub-core/loader/i386/efi/linux.c | 116 ++++++++++++++++++++++++++------------
+ include/grub/i386/linux.h         |   5 ++
+ 3 files changed, 91 insertions(+), 39 deletions(-)
 
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index c8ecce6dfd..0622dfa48d 100644
+index 0a7f8208022..742e8e9af35 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
-@@ -69,12 +69,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
+@@ -136,12 +136,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
  typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
  
  grub_err_t
--grub_efi_linux_boot (void *kernel_addr, grub_off_t offset,
-+grub_efi_linux_boot (void *kernel_addr, grub_off_t handover_offset,
+-grub_efi_linux_boot (void *kernel_address, grub_off_t offset,
++grub_efi_linux_boot (void *kernel_address, grub_off_t handover_offset,
  		     void *kernel_params)
  {
    handover_func hf;
 +  int offset = 0;
  
--  hf = (handover_func)((char *)kernel_addr + offset);
+-  hf = (handover_func)((char *)kernel_address + offset);
 +#ifdef __x86_64__
 +  offset = 512;
 +#endif
 +
-+  hf = (handover_func)((char *)kernel_addr + handover_offset + offset);
++  hf = (handover_func)((char *)kernel_address + handover_offset + offset);
    hf (grub_efi_image_handle, grub_efi_system_table, kernel_params);
  
    return GRUB_ERR_BUG;
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 6b24cbb948..3017d0f3e5 100644
+index b59d125286d..3c2e30f8751 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
-@@ -44,14 +44,10 @@ static char *linux_cmdline;
+@@ -44,15 +44,11 @@ static char *linux_cmdline;
  static grub_err_t
  grub_linuxefi_boot (void)
  {
@@ -52,11 +52,13 @@ index 6b24cbb948..3017d0f3e5 100644
    asm volatile ("cli");
  
 -  return grub_efi_linux_boot ((char *)kernel_mem, handover_offset + offset,
+-                              params);
 +  return grub_efi_linux_boot ((char *)kernel_mem,
 +			      handover_offset,
- 			      params);
++			      params);
  }
  
+ static grub_err_t
 @@ -153,14 +149,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_errno;
  }
@@ -68,7 +70,7 @@ index 6b24cbb948..3017d0f3e5 100644
 +
  static grub_err_t
  grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
- 		int argc, char *argv[])
+                 int argc, char *argv[])
  {
    grub_file_t file = 0;
 -  struct linux_i386_kernel_header lh;
@@ -166,7 +168,7 @@ index 6b24cbb948..3017d0f3e5 100644
 +
    grub_dprintf ("linux", "setting up cmdline\n");
    linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
--					 BYTES_TO_PAGES(lh.cmdline_size + 1));
+-                                         BYTES_TO_PAGES(lh.cmdline_size + 1));
 -
 +					 BYTES_TO_PAGES(lh->cmdline_size + 1));
    if (!linux_cmdline)
@@ -176,9 +178,10 @@ index 6b24cbb948..3017d0f3e5 100644
    grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
    grub_create_loader_cmdline (argc, argv,
                                linux_cmdline + sizeof (LINUX_IMAGE) - 1,
--			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
+-                              lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
+-                              GRUB_VERIFY_KERNEL_CMDLINE);
 +			      lh->cmdline_size - (sizeof (LINUX_IMAGE) - 1),
- 			      GRUB_VERIFY_KERNEL_CMDLINE);
++			      GRUB_VERIFY_KERNEL_CMDLINE);
  
 -  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
 +  grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
@@ -194,13 +197,13 @@ index 6b24cbb948..3017d0f3e5 100644
 +  start = (lh->setup_sects + 1) * 512;
  
 -  kernel_mem = grub_efi_allocate_pages_max(lh.pref_address,
--					   BYTES_TO_PAGES(lh.init_size));
+-                                           BYTES_TO_PAGES(lh.init_size));
 +  kernel_mem = grub_efi_allocate_pages_max(lh->pref_address,
 +					   BYTES_TO_PAGES(lh->init_size));
  
    if (!kernel_mem)
      kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,
--					     BYTES_TO_PAGES(lh.init_size));
+-                                             BYTES_TO_PAGES(lh.init_size));
 +					     BYTES_TO_PAGES(lh->init_size));
  
    if (!kernel_mem)
@@ -229,7 +232,7 @@ index 6b24cbb948..3017d0f3e5 100644
 +  params->ext_loader_type = 0;
 +  params->ext_loader_ver = 2;
    grub_dprintf("linux", "kernel_mem: %p handover_offset: %08x\n",
- 	       kernel_mem, handover_offset);
+                kernel_mem, handover_offset);
  
 @@ -301,10 +343,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        loaded = 0;
@@ -238,27 +241,26 @@ index 6b24cbb948..3017d0f3e5 100644
 -  if (linux_cmdline && !loaded)
 +  if (linux_cmdline && lh && !loaded)
      grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
- 			 linux_cmdline,
--			 BYTES_TO_PAGES(lh.cmdline_size + 1));
+-                         linux_cmdline,
+-                         BYTES_TO_PAGES(lh.cmdline_size + 1));
++			 linux_cmdline,
 +			 BYTES_TO_PAGES(lh->cmdline_size + 1));
  
    if (kernel_mem && !loaded)
      grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
 diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index eddf9251d9..25ef52c04e 100644
+index d4b55086953..4ccd9d7d9f2 100644
 --- a/include/grub/i386/linux.h
 +++ b/include/grub/i386/linux.h
-@@ -138,7 +138,12 @@ struct linux_i386_kernel_header
+@@ -148,6 +148,11 @@ struct linux_i386_kernel_header
    grub_uint32_t kernel_alignment;
    grub_uint8_t relocatable;
    grub_uint8_t min_alignment;
--  grub_uint8_t pad[2];
 +#define LINUX_XLF_KERNEL_64                   (1<<0)
 +#define LINUX_XLF_CAN_BE_LOADED_ABOVE_4G      (1<<1)
 +#define LINUX_XLF_EFI_HANDOVER_32             (1<<2)
 +#define LINUX_XLF_EFI_HANDOVER_64             (1<<3)
 +#define LINUX_XLF_EFI_KEXEC                   (1<<4)
-+  grub_uint16_t xloadflags;
+   grub_uint16_t xloadflags;
    grub_uint32_t cmdline_size;
    grub_uint32_t hardware_subarch;
-   grub_uint64_t hardware_subarch_data;
diff --git a/0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/0221-Try-to-pick-better-locations-for-kernel-and-initrd.patch
similarity index 94%
rename from 0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch
rename to 0221-Try-to-pick-better-locations-for-kernel-and-initrd.patch
index 4f42ea54..2927f4b4 100644
--- a/0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch
+++ b/0221-Try-to-pick-better-locations-for-kernel-and-initrd.patch
@@ -38,10 +38,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  8 files changed, 29 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 85ad4b4494..e84961d078 100644
+index fb9dbf52528..8f75205a732 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
-@@ -122,7 +122,7 @@ grub_efi_allocate_pages_max (grub_efi_physical_address_t max,
+@@ -121,7 +121,7 @@ grub_efi_allocate_pages_max (grub_efi_physical_address_t max,
    grub_efi_boot_services_t *b;
    grub_efi_physical_address_t address = max;
  
@@ -50,7 +50,7 @@ index 85ad4b4494..e84961d078 100644
      return 0;
  
    b = grub_efi_system_table->boot_services;
-@@ -480,7 +480,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,
+@@ -477,7 +477,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,
      {
        if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY
  #if 1
@@ -59,7 +59,7 @@ index 85ad4b4494..e84961d078 100644
  #endif
  	  && desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > 0x100000
  	  && desc->num_pages != 0)
-@@ -498,9 +498,9 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,
+@@ -495,9 +495,9 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,
  #if 1
  	  if (BYTES_TO_PAGES (filtered_desc->physical_start)
  	      + filtered_desc->num_pages
@@ -72,7 +72,7 @@ index 85ad4b4494..e84961d078 100644
  #endif
  
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 3017d0f3e5..33e981e76e 100644
+index 3c2e30f8751..9e5dca9458a 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -27,6 +27,7 @@
@@ -138,7 +138,7 @@ index 3017d0f3e5..33e981e76e 100644
      {
        grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate kernel"));
 diff --git a/include/grub/arm/efi/memory.h b/include/grub/arm/efi/memory.h
-index 2c64918e3f..a4c2ec8350 100644
+index 2c64918e3f7..a4c2ec83502 100644
 --- a/include/grub/arm/efi/memory.h
 +++ b/include/grub/arm/efi/memory.h
 @@ -2,5 +2,6 @@
@@ -149,7 +149,7 @@ index 2c64918e3f..a4c2ec8350 100644
  
  #endif /* ! GRUB_MEMORY_CPU_HEADER */
 diff --git a/include/grub/arm64/efi/memory.h b/include/grub/arm64/efi/memory.h
-index c6cb324171..acb61dca44 100644
+index c6cb3241714..acb61dca44b 100644
 --- a/include/grub/arm64/efi/memory.h
 +++ b/include/grub/arm64/efi/memory.h
 @@ -2,5 +2,6 @@
@@ -160,7 +160,7 @@ index c6cb324171..acb61dca44 100644
  
  #endif /* ! GRUB_MEMORY_CPU_HEADER */
 diff --git a/include/grub/i386/efi/memory.h b/include/grub/i386/efi/memory.h
-index 2c64918e3f..a4c2ec8350 100644
+index 2c64918e3f7..a4c2ec83502 100644
 --- a/include/grub/i386/efi/memory.h
 +++ b/include/grub/i386/efi/memory.h
 @@ -2,5 +2,6 @@
@@ -171,7 +171,7 @@ index 2c64918e3f..a4c2ec8350 100644
  
  #endif /* ! GRUB_MEMORY_CPU_HEADER */
 diff --git a/include/grub/ia64/efi/memory.h b/include/grub/ia64/efi/memory.h
-index 2c64918e3f..a4c2ec8350 100644
+index 2c64918e3f7..a4c2ec83502 100644
 --- a/include/grub/ia64/efi/memory.h
 +++ b/include/grub/ia64/efi/memory.h
 @@ -2,5 +2,6 @@
@@ -182,7 +182,7 @@ index 2c64918e3f..a4c2ec8350 100644
  
  #endif /* ! GRUB_MEMORY_CPU_HEADER */
 diff --git a/include/grub/riscv64/efi/memory.h b/include/grub/riscv64/efi/memory.h
-index c6cb324171..acb61dca44 100644
+index c6cb3241714..acb61dca44b 100644
 --- a/include/grub/riscv64/efi/memory.h
 +++ b/include/grub/riscv64/efi/memory.h
 @@ -2,5 +2,6 @@
@@ -193,7 +193,7 @@ index c6cb324171..acb61dca44 100644
  
  #endif /* ! GRUB_MEMORY_CPU_HEADER */
 diff --git a/include/grub/x86_64/efi/memory.h b/include/grub/x86_64/efi/memory.h
-index 46e9145a30..e81cfb3221 100644
+index 46e9145a308..e81cfb32213 100644
 --- a/include/grub/x86_64/efi/memory.h
 +++ b/include/grub/x86_64/efi/memory.h
 @@ -2,9 +2,11 @@
diff --git a/0222-commands-boot-Add-API-to-pass-context-to-loader.patch b/0222-commands-boot-Add-API-to-pass-context-to-loader.patch
deleted file mode 100644
index 63a2d76e..00000000
--- a/0222-commands-boot-Add-API-to-pass-context-to-loader.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Chris Coulson <chris.coulson@canonical.com>
-Date: Fri, 29 Apr 2022 21:16:02 +0100
-Subject: [PATCH] commands/boot: Add API to pass context to loader
-
-Loaders rely on global variables for saving context which is consumed
-in the boot hook and freed in the unload hook. In the case where a loader
-command is executed twice, calling grub_loader_set a second time executes
-the unload hook, but in some cases this runs when the loader's global
-context has already been updated, resulting in the updated context being
-freed and potential use-after-free bugs when the boot hook is subsequently
-called.
-
-This adds a new API (grub_loader_set_ex) which allows a loader to specify
-context that is passed to its boot and unload hooks. This is an alternative
-to requiring that loaders call grub_loader_unset before mutating their
-global context.
-
-Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
-(cherry picked from commit 4322a64dde7e8fedb58e50b79408667129d45dd3)
----
- grub-core/commands/boot.c | 66 +++++++++++++++++++++++++++++++++++++++++------
- include/grub/loader.h     |  5 ++++
- 2 files changed, 63 insertions(+), 8 deletions(-)
-
-diff --git a/grub-core/commands/boot.c b/grub-core/commands/boot.c
-index bbca81e947..53691a62d9 100644
---- a/grub-core/commands/boot.c
-+++ b/grub-core/commands/boot.c
-@@ -27,10 +27,20 @@
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
--static grub_err_t (*grub_loader_boot_func) (void);
--static grub_err_t (*grub_loader_unload_func) (void);
-+static grub_err_t (*grub_loader_boot_func) (void *);
-+static grub_err_t (*grub_loader_unload_func) (void *);
-+static void *grub_loader_context;
- static int grub_loader_flags;
- 
-+struct grub_simple_loader_hooks
-+{
-+  grub_err_t (*boot) (void);
-+  grub_err_t (*unload) (void);
-+};
-+
-+/* Don't heap allocate this to avoid making grub_loader_set fallible. */
-+static struct grub_simple_loader_hooks simple_loader_hooks;
-+
- struct grub_preboot
- {
-   grub_err_t (*preboot_func) (int);
-@@ -44,6 +54,29 @@ static int grub_loader_loaded;
- static struct grub_preboot *preboots_head = 0,
-   *preboots_tail = 0;
- 
-+static grub_err_t
-+grub_simple_boot_hook (void *context)
-+{
-+  struct grub_simple_loader_hooks *hooks;
-+
-+  hooks = (struct grub_simple_loader_hooks *) context;
-+  return hooks->boot ();
-+}
-+
-+static grub_err_t
-+grub_simple_unload_hook (void *context)
-+{
-+  struct grub_simple_loader_hooks *hooks;
-+  grub_err_t ret;
-+
-+  hooks = (struct grub_simple_loader_hooks *) context;
-+
-+  ret = hooks->unload ();
-+  grub_memset (hooks, 0, sizeof (*hooks));
-+
-+  return ret;
-+}
-+
- int
- grub_loader_is_loaded (void)
- {
-@@ -110,28 +143,45 @@ grub_loader_unregister_preboot_hook (struct grub_preboot *hnd)
- }
- 
- void
--grub_loader_set (grub_err_t (*boot) (void),
--		 grub_err_t (*unload) (void),
--		 int flags)
-+grub_loader_set_ex (grub_err_t (*boot) (void *),
-+		    grub_err_t (*unload) (void *),
-+		    void *context,
-+		    int flags)
- {
-   if (grub_loader_loaded && grub_loader_unload_func)
--    grub_loader_unload_func ();
-+    grub_loader_unload_func (grub_loader_context);
- 
-   grub_loader_boot_func = boot;
-   grub_loader_unload_func = unload;
-+  grub_loader_context = context;
-   grub_loader_flags = flags;
- 
-   grub_loader_loaded = 1;
- }
- 
-+void
-+grub_loader_set (grub_err_t (*boot) (void),
-+		 grub_err_t (*unload) (void),
-+		 int flags)
-+{
-+  grub_loader_set_ex (grub_simple_boot_hook,
-+		      grub_simple_unload_hook,
-+		      &simple_loader_hooks,
-+		      flags);
-+
-+  simple_loader_hooks.boot = boot;
-+  simple_loader_hooks.unload = unload;
-+}
-+
- void
- grub_loader_unset(void)
- {
-   if (grub_loader_loaded && grub_loader_unload_func)
--    grub_loader_unload_func ();
-+    grub_loader_unload_func (grub_loader_context);
- 
-   grub_loader_boot_func = 0;
-   grub_loader_unload_func = 0;
-+  grub_loader_context = 0;
- 
-   grub_loader_loaded = 0;
- }
-@@ -158,7 +208,7 @@ grub_loader_boot (void)
- 	  return err;
- 	}
-     }
--  err = (grub_loader_boot_func) ();
-+  err = (grub_loader_boot_func) (grub_loader_context);
- 
-   for (cur = preboots_tail; cur; cur = cur->prev)
-     if (! err)
-diff --git a/include/grub/loader.h b/include/grub/loader.h
-index b208642821..1846fa6c5f 100644
---- a/include/grub/loader.h
-+++ b/include/grub/loader.h
-@@ -40,6 +40,11 @@ void EXPORT_FUNC (grub_loader_set) (grub_err_t (*boot) (void),
- 				    grub_err_t (*unload) (void),
- 				    int flags);
- 
-+void EXPORT_FUNC (grub_loader_set_ex) (grub_err_t (*boot) (void *),
-+				       grub_err_t (*unload) (void *),
-+				       void *context,
-+				       int flags);
-+
- /* Unset current loader, if any.  */
- void EXPORT_FUNC (grub_loader_unset) (void);
- 
diff --git a/0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch b/0222-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
similarity index 97%
rename from 0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
rename to 0222-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
index 5a9c6f24..83c02c90 100644
--- a/0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
+++ b/0222-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 45 insertions(+), 7 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 33e981e76e..2f0336809e 100644
+index 9e5dca9458a..3a940bec7f6 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -35,11 +35,16 @@ static grub_dl_t my_mod;
@@ -98,4 +98,4 @@ index 33e981e76e..2f0336809e 100644
 -
  static grub_err_t
  grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
- 		int argc, char *argv[])
+                 int argc, char *argv[])
diff --git a/0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch b/0223-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
similarity index 98%
rename from 0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
rename to 0223-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
index 9b10d688..e4c80fe3 100644
--- a/0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
+++ b/0223-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
@@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 41 insertions(+), 34 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 2f0336809e..5f48fa5561 100644
+index 3a940bec7f6..8d0b9436011 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -243,32 +243,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -121,7 +121,7 @@ index 2f0336809e..5f48fa5561 100644
    params->ext_loader_type = 0;
    params->ext_loader_ver = 2;
 -  grub_dprintf("linux", "kernel_mem: %p handover_offset: %08x\n",
--	       kernel_mem, handover_offset);
+-               kernel_mem, handover_offset);
 +  grub_dprintf ("linux",
 +		"setting lh->ext_loader_{type,ver} = {0x%02x,0x%02x}\n",
 +		params->ext_loader_type, params->ext_loader_ver);
diff --git a/0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch b/0224-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
similarity index 90%
rename from 0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
rename to 0224-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
index 700c98b3..afd82c38 100644
--- a/0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
+++ b/0224-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
@@ -7,11 +7,11 @@ This helps enable allocations above 4GB.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/loader/i386/efi/linux.c | 167 +++++++++++++++++++++-----------------
- 1 file changed, 94 insertions(+), 73 deletions(-)
+ grub-core/loader/i386/efi/linux.c | 166 +++++++++++++++++++++-----------------
+ 1 file changed, 93 insertions(+), 73 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 5f48fa5561..3e4f7ef39f 100644
+index 8d0b9436011..039b40e321d 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -47,6 +47,65 @@ static char *linux_cmdline;
@@ -86,17 +86,17 @@ index 5f48fa5561..3e4f7ef39f 100644
    loaded = 0;
 -  if (initrd_mem)
 -    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem,
--			 BYTES_TO_PAGES(params->ramdisk_size));
+-                         BYTES_TO_PAGES(params->ramdisk_size));
 -  if (linux_cmdline)
 -    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
--			 linux_cmdline,
--			 BYTES_TO_PAGES(params->cmdline_size + 1));
+-                         linux_cmdline,
+-                         BYTES_TO_PAGES(params->cmdline_size + 1));
 -  if (kernel_mem)
 -    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
--			 BYTES_TO_PAGES(kernel_size));
+-                         BYTES_TO_PAGES(kernel_size));
 -  if (params)
 -    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params,
--			 BYTES_TO_PAGES(16384));
+-                         BYTES_TO_PAGES(16384));
 +
 +  kernel_free(initrd_mem, params->ramdisk_size);
 +  kernel_free(linux_cmdline, params->cmdline_size + 1);
@@ -127,7 +127,7 @@ index 5f48fa5561..3e4f7ef39f 100644
  
    params->ramdisk_size = size;
 -  params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem;
-+  params->ramdisk_image = initrd_mem;
++  params->ramdisk_image = (grub_uint64_t) initrd_mem;
  
    ptr = initrd_mem;
  
@@ -185,21 +185,20 @@ index 5f48fa5561..3e4f7ef39f 100644
 -    }
 -
 -  grub_dprintf ("linux", "linux_cmdline = %lx\n",
--		(unsigned long)linux_cmdline);
+-                (unsigned long)linux_cmdline);
 +    goto fail;
 +  grub_dprintf ("linux", "linux_cmdline = %p\n", linux_cmdline);
  
    grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
    grub_create_loader_cmdline (argc, argv,
-@@ -343,27 +371,24 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -343,27 +371,23 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  			      GRUB_VERIFY_KERNEL_CMDLINE);
  
    grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
 -  grub_dprintf ("linux", "setting lh->cmd_line_ptr\n");
 -  lh->cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
-+  grub_dprintf ("linux", "setting lh->cmd_line_ptr to 0x%08x\n",
-+		linux_cmdline);
-+  lh->cmd_line_ptr = linux_cmdline;
++
++  lh->cmd_line_ptr = (grub_uint64_t) linux_cmdline;
  
    handover_offset = lh->handover_offset;
 -  grub_dprintf("linux", "handover_offset: %08x\n", handover_offset);
@@ -230,7 +229,7 @@ index 5f48fa5561..3e4f7ef39f 100644
    grub_dprintf("linux", "kernel_mem = %p\n", kernel_mem);
  
    grub_loader_set (grub_linuxefi_boot, grub_linuxefi_unload, 0);
-@@ -398,18 +423,14 @@ fail:
+@@ -398,18 +422,14 @@ fail:
        loaded = 0;
      }
  
@@ -245,11 +244,11 @@ index 5f48fa5561..3e4f7ef39f 100644
  
 -  if (kernel_mem && !loaded)
 -    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
--			 BYTES_TO_PAGES(kernel_size));
+-                         BYTES_TO_PAGES(kernel_size));
 -
 -  if (params && !loaded)
 -    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params,
--			 BYTES_TO_PAGES(16384));
+-                         BYTES_TO_PAGES(16384));
 +      kernel_free (kernel_mem, kernel_size);
 +      kernel_free (params, sizeof(*params));
 +    }
diff --git a/0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch b/0225-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
similarity index 92%
rename from 0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
rename to 0225-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
index 6ac11a1c..a3b68e66 100644
--- a/0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
+++ b/0225-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
@@ -11,10 +11,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  grub-core/loader/i386/efi/linux.c | 67 +++++++++++++++++++++++++++++++++++----
  include/grub/i386/linux.h         |  6 +++-
- 2 files changed, 65 insertions(+), 8 deletions(-)
+ 2 files changed, 66 insertions(+), 7 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 3e4f7ef39f..6bc18d5aef 100644
+index 039b40e321d..015bb01d4c4 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -52,13 +52,22 @@ struct allocation_choice {
@@ -68,7 +68,7 @@ index 3e4f7ef39f..6bc18d5aef 100644
    grub_dprintf ("linux", "initrd_mem = %p\n", initrd_mem);
  
 -  params->ramdisk_size = size;
--  params->ramdisk_image = initrd_mem;
+-  params->ramdisk_image = (grub_uint64_t) initrd_mem;
 +  params->ramdisk_size = LOW_U32(size);
 +  params->ramdisk_image = LOW_U32(initrd_mem);
 +#if defined(__x86_64__)
@@ -97,12 +97,12 @@ index 3e4f7ef39f..6bc18d5aef 100644
    params = kernel_alloc (sizeof(*params), "cannot allocate kernel parameters");
    if (!params)
      goto fail;
-@@ -372,21 +405,40 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -372,20 +405,41 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
-   grub_dprintf ("linux", "setting lh->cmd_line_ptr to 0x%08x\n",
--		linux_cmdline);
--  lh->cmd_line_ptr = linux_cmdline;
+ 
+-  lh->cmd_line_ptr = (grub_uint64_t) linux_cmdline;
++  grub_dprintf ("linux", "setting lh->cmd_line_ptr to 0x%08x\n",
 +		LOW_U32(linux_cmdline));
 +  lh->cmd_line_ptr = LOW_U32(linux_cmdline);
 +#if defined(__x86_64__)
@@ -140,7 +140,7 @@ index 3e4f7ef39f..6bc18d5aef 100644
    if (!kernel_mem)
      goto fail;
    grub_dprintf("linux", "kernel_mem = %p\n", kernel_mem);
-@@ -395,8 +447,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -394,8 +448,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    loaded = 1;
  
@@ -153,10 +153,10 @@ index 3e4f7ef39f..6bc18d5aef 100644
    grub_memcpy (kernel_mem, (char *)kernel + start, filelen - start);
  
 diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index 25ef52c04e..fac22476cc 100644
+index 4ccd9d7d9f2..461097781fd 100644
 --- a/include/grub/i386/linux.h
 +++ b/include/grub/i386/linux.h
-@@ -236,7 +236,11 @@ struct linux_kernel_params
+@@ -246,7 +246,11 @@ struct linux_kernel_params
    grub_uint32_t ofw_cif_handler;	/* b8 */
    grub_uint32_t ofw_idt;		/* bc */
  
diff --git a/0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch b/0226-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
similarity index 78%
rename from 0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
rename to 0226-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
index 6aa50136..f6176ba0 100644
--- a/0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
+++ b/0226-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
@@ -29,18 +29,18 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 14 insertions(+)
 
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index 0622dfa48d..e8b9ecb17f 100644
+index 742e8e9af35..32766bf7b19 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
-@@ -72,6 +72,7 @@ grub_err_t
- grub_efi_linux_boot (void *kernel_addr, grub_off_t handover_offset,
+@@ -139,6 +139,7 @@ grub_err_t
+ grub_efi_linux_boot (void *kernel_address, grub_off_t handover_offset,
  		     void *kernel_params)
  {
 +  grub_efi_loaded_image_t *loaded_image = NULL;
    handover_func hf;
    int offset = 0;
  
-@@ -79,6 +80,19 @@ grub_efi_linux_boot (void *kernel_addr, grub_off_t handover_offset,
+@@ -146,6 +147,19 @@ grub_efi_linux_boot (void *kernel_address, grub_off_t handover_offset,
    offset = 512;
  #endif
  
@@ -51,12 +51,12 @@ index 0622dfa48d..e8b9ecb17f 100644
 +   */
 +  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
 +  if (loaded_image)
-+    loaded_image->image_base = kernel_addr;
++    loaded_image->image_base = kernel_address;
 +  else
 +    grub_dprintf ("linux", "Loaded Image base address could not be set\n");
 +
-+  grub_dprintf ("linux", "kernel_addr: %p handover_offset: %p params: %p\n",
-+		kernel_addr, (void *)(grub_efi_uintn_t)handover_offset, kernel_params);
-   hf = (handover_func)((char *)kernel_addr + handover_offset + offset);
++  grub_dprintf ("linux", "kernel_address: %p handover_offset: %p params: %p\n",
++		kernel_address, (void *)(grub_efi_uintn_t)handover_offset, kernel_params);
+   hf = (handover_func)((char *)kernel_address + handover_offset + offset);
    hf (grub_efi_image_handle, grub_efi_system_table, kernel_params);
  
diff --git a/0227-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch b/0227-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch
deleted file mode 100644
index 715e6e1d..00000000
--- a/0227-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Julian Andres Klode <julian.klode@canonical.com>
-Date: Thu, 2 Dec 2021 15:03:53 +0100
-Subject: [PATCH] kern/efi/sb: Reject non-kernel files in the shim_lock
- verifier
-
-We must not allow other verifiers to pass things like the GRUB modules.
-Instead of maintaining a blocklist, maintain an allowlist of things
-that we do not care about.
-
-This allowlist really should be made reusable, and shared by the
-lockdown verifier, but this is the minimal patch addressing
-security concerns where the TPM verifier was able to mark modules
-as verified (or the OpenPGP verifier for that matter), when it
-should not do so on shim-powered secure boot systems.
-
-Fixes: CVE-2022-28735
-
-Signed-off-by: Julian Andres Klode <julian.klode@canonical.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit fa61ad69861c1cb3f68bf853d78fae7fd93986a0)
----
- grub-core/kern/efi/sb.c | 39 ++++++++++++++++++++++++++++++++++++---
- include/grub/verify.h   |  1 +
- 2 files changed, 37 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
-index c52ec6226a..89c4bb3fd1 100644
---- a/grub-core/kern/efi/sb.c
-+++ b/grub-core/kern/efi/sb.c
-@@ -119,10 +119,11 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)),
- 			 void **context __attribute__ ((unused)),
- 			 enum grub_verify_flags *flags)
- {
--  *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION;
-+  *flags = GRUB_VERIFY_FLAGS_NONE;
- 
-   switch (type & GRUB_FILE_TYPE_MASK)
-     {
-+    /* Files we check. */
-     case GRUB_FILE_TYPE_LINUX_KERNEL:
-     case GRUB_FILE_TYPE_MULTIBOOT_KERNEL:
-     case GRUB_FILE_TYPE_BSD_KERNEL:
-@@ -130,11 +131,43 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)),
-     case GRUB_FILE_TYPE_PLAN9_KERNEL:
-     case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE:
-       *flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK;
-+      return GRUB_ERR_NONE;
- 
--      /* Fall through. */
-+    /* Files that do not affect secureboot state. */
-+    case GRUB_FILE_TYPE_NONE:
-+    case GRUB_FILE_TYPE_LOOPBACK:
-+    case GRUB_FILE_TYPE_LINUX_INITRD:
-+    case GRUB_FILE_TYPE_OPENBSD_RAMDISK:
-+    case GRUB_FILE_TYPE_XNU_RAMDISK:
-+    case GRUB_FILE_TYPE_SIGNATURE:
-+    case GRUB_FILE_TYPE_PUBLIC_KEY:
-+    case GRUB_FILE_TYPE_PUBLIC_KEY_TRUST:
-+    case GRUB_FILE_TYPE_PRINT_BLOCKLIST:
-+    case GRUB_FILE_TYPE_TESTLOAD:
-+    case GRUB_FILE_TYPE_GET_SIZE:
-+    case GRUB_FILE_TYPE_FONT:
-+    case GRUB_FILE_TYPE_ZFS_ENCRYPTION_KEY:
-+    case GRUB_FILE_TYPE_CAT:
-+    case GRUB_FILE_TYPE_HEXCAT:
-+    case GRUB_FILE_TYPE_CMP:
-+    case GRUB_FILE_TYPE_HASHLIST:
-+    case GRUB_FILE_TYPE_TO_HASH:
-+    case GRUB_FILE_TYPE_KEYBOARD_LAYOUT:
-+    case GRUB_FILE_TYPE_PIXMAP:
-+    case GRUB_FILE_TYPE_GRUB_MODULE_LIST:
-+    case GRUB_FILE_TYPE_CONFIG:
-+    case GRUB_FILE_TYPE_THEME:
-+    case GRUB_FILE_TYPE_GETTEXT_CATALOG:
-+    case GRUB_FILE_TYPE_FS_SEARCH:
-+    case GRUB_FILE_TYPE_LOADENV:
-+    case GRUB_FILE_TYPE_SAVEENV:
-+    case GRUB_FILE_TYPE_VERIFY_SIGNATURE:
-+      *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION;
-+      return GRUB_ERR_NONE;
- 
-+    /* Other files. */
-     default:
--      return GRUB_ERR_NONE;
-+      return grub_error (GRUB_ERR_ACCESS_DENIED, N_("prohibited by secure boot policy"));
-     }
- }
- 
-diff --git a/include/grub/verify.h b/include/grub/verify.h
-index cd129c398f..672ae16924 100644
---- a/include/grub/verify.h
-+++ b/include/grub/verify.h
-@@ -24,6 +24,7 @@
- 
- enum grub_verify_flags
-   {
-+    GRUB_VERIFY_FLAGS_NONE		= 0,
-     GRUB_VERIFY_FLAGS_SKIP_VERIFICATION	= 1,
-     GRUB_VERIFY_FLAGS_SINGLE_CHUNK	= 2,
-     /* Defer verification to another authority. */
diff --git a/0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch b/0227-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
similarity index 97%
rename from 0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
rename to 0227-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
index 7c41e87e..35c0f323 100644
--- a/0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
+++ b/0227-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
@@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 6bc18d5aef..15d40d6e35 100644
+index 015bb01d4c4..adfb2739ae4 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -144,7 +144,7 @@ grub_linuxefi_unload (void)
diff --git a/0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/0228-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
similarity index 97%
rename from 0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
rename to 0228-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
index 8e63d1d9..7b507d9c 100644
--- a/0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+++ b/0228-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
@@ -13,7 +13,7 @@ Signed-off-by: Colin Watson <cjwatson@debian.org>
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 15d40d6e35..f992ceeef2 100644
+index adfb2739ae4..325aa594db1 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -28,6 +28,8 @@
diff --git a/0228-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch b/0228-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch
deleted file mode 100644
index bcc5503d..00000000
--- a/0228-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Fri, 25 Jun 2021 02:19:05 +1000
-Subject: [PATCH] kern/file: Do not leak device_name on error in
- grub_file_open()
-
-If we have an error in grub_file_open() before we free device_name, we
-will leak it.
-
-Free device_name in the error path and null out the pointer in the good
-path once we free it there.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 1499a5068839fa37cb77ecef4b5bdacbd1ed12ea)
----
- grub-core/kern/file.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
-index e19aea3e51..ed69fc0f0f 100644
---- a/grub-core/kern/file.c
-+++ b/grub-core/kern/file.c
-@@ -81,6 +81,7 @@ grub_file_open (const char *name, enum grub_file_type type)
- 
-   device = grub_device_open (device_name);
-   grub_free (device_name);
-+  device_name = NULL;
-   if (! device)
-     goto fail;
- 
-@@ -135,6 +136,7 @@ grub_file_open (const char *name, enum grub_file_type type)
-   return file;
- 
-  fail:
-+  grub_free (device_name);
-   if (device)
-     grub_device_close (device);
- 
diff --git a/0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/0229-linuxefi-fail-kernel-validation-without-shim-protoco.patch
similarity index 69%
rename from 0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch
rename to 0229-linuxefi-fail-kernel-validation-without-shim-protoco.patch
index 828fe16a..0bf7b19e 100644
--- a/0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+++ b/0229-linuxefi-fail-kernel-validation-without-shim-protoco.patch
@@ -16,61 +16,28 @@ CVE-2020-15705
 Reported-by: Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>
 Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
 ---
- grub-core/loader/arm64/linux.c     | 13 +++++++++----
  grub-core/loader/efi/chainloader.c |  1 +
  grub-core/loader/efi/linux.c       |  1 +
  grub-core/loader/i386/efi/linux.c  | 17 +++++++++++------
- 4 files changed, 22 insertions(+), 10 deletions(-)
+ 3 files changed, 13 insertions(+), 6 deletions(-)
 
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 70a0075ec5..47f8cf0d84 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -34,6 +34,7 @@
- #include <grub/i18n.h>
- #include <grub/lib/cmdline.h>
- #include <grub/verify.h>
-+#include <grub/efi/sb.h>
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
-@@ -363,11 +364,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
- 
-   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
- 
--  rc = grub_linuxefi_secure_validate (kernel_addr, kernel_size);
--  if (rc < 0)
-+  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
-     {
--      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
--      goto fail;
-+      rc = grub_linuxefi_secure_validate (kernel_addr, kernel_size);
-+      if (rc <= 0)
-+	{
-+	  grub_error (GRUB_ERR_INVALID_COMMAND,
-+		      N_("%s has invalid signature"), argv[0]);
-+	  goto fail;
-+	}
-     }
- 
-   pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset);
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index ac8dfd40c6..d41e8ea14a 100644
+index e4ac39c87b4..0ec682e2988 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -1084,6 +1084,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -1088,6 +1088,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  
        return 0;
      }
 +  // -1 fall-through to fail
  
  fail:
-   if (dev)
+ 
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index e8b9ecb17f..9260731c10 100644
+index 32766bf7b19..ecb6d593cef 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
-@@ -33,6 +33,7 @@ struct grub_efi_shim_lock
+@@ -98,6 +98,7 @@ struct grub_efi_shim_lock
  };
  typedef struct grub_efi_shim_lock grub_efi_shim_lock_t;
  
@@ -79,7 +46,7 @@ index e8b9ecb17f..9260731c10 100644
  grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
  {
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index f992ceeef2..3cf0f9b330 100644
+index 325aa594db1..97484bbe24d 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -30,6 +30,7 @@
@@ -108,7 +75,7 @@ index f992ceeef2..3cf0f9b330 100644
 +  if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
      {
 -      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"),
--		  argv[0]);
+-                  argv[0]);
 -      goto fail;
 +      rc = grub_linuxefi_secure_validate (kernel, filelen);
 +      if (rc <= 0)
diff --git a/0229-video-readers-png-Abort-sooner-if-a-read-operation-f.patch b/0229-video-readers-png-Abort-sooner-if-a-read-operation-f.patch
deleted file mode 100644
index 385d3ed0..00000000
--- a/0229-video-readers-png-Abort-sooner-if-a-read-operation-f.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 6 Jul 2021 14:02:55 +1000
-Subject: [PATCH] video/readers/png: Abort sooner if a read operation fails
-
-Fuzzing revealed some inputs that were taking a long time, potentially
-forever, because they did not bail quickly upon encountering an I/O error.
-
-Try to catch I/O errors sooner and bail out.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 882be97d1df6449b9fd4d593f0cb70005fde3494)
----
- grub-core/video/readers/png.c | 55 ++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 47 insertions(+), 8 deletions(-)
-
-diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index 0157ff7420..e2a6b1cf3c 100644
---- a/grub-core/video/readers/png.c
-+++ b/grub-core/video/readers/png.c
-@@ -142,6 +142,7 @@ static grub_uint8_t
- grub_png_get_byte (struct grub_png_data *data)
- {
-   grub_uint8_t r;
-+  grub_ssize_t bytes_read = 0;
- 
-   if ((data->inside_idat) && (data->idat_remain == 0))
-     {
-@@ -175,7 +176,14 @@ grub_png_get_byte (struct grub_png_data *data)
-     }
- 
-   r = 0;
--  grub_file_read (data->file, &r, 1);
-+  bytes_read = grub_file_read (data->file, &r, 1);
-+
-+  if (bytes_read != 1)
-+    {
-+      grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+		  "png: unexpected end of data");
-+      return 0;
-+    }
- 
-   if (data->inside_idat)
-     data->idat_remain--;
-@@ -231,15 +239,16 @@ grub_png_decode_image_palette (struct grub_png_data *data,
-   if (len == 0)
-     return GRUB_ERR_NONE;
- 
--  for (i = 0; 3 * i < len && i < 256; i++)
-+  grub_errno = GRUB_ERR_NONE;
-+  for (i = 0; 3 * i < len && i < 256 && grub_errno == GRUB_ERR_NONE; i++)
-     for (j = 0; j < 3; j++)
-       data->palette[i][j] = grub_png_get_byte (data);
--  for (i *= 3; i < len; i++)
-+  for (i *= 3; i < len && grub_errno == GRUB_ERR_NONE; i++)
-     grub_png_get_byte (data);
- 
-   grub_png_get_dword (data);
- 
--  return GRUB_ERR_NONE;
-+  return grub_errno;
- }
- 
- static grub_err_t
-@@ -256,9 +265,13 @@ grub_png_decode_image_header (struct grub_png_data *data)
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE, "png: invalid image size");
- 
-   color_bits = grub_png_get_byte (data);
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
-   data->is_16bit = (color_bits == 16);
- 
-   color_type = grub_png_get_byte (data);
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
- 
-   /* According to PNG spec, no other types are valid.  */
-   if ((color_type & ~(PNG_COLOR_MASK_ALPHA | PNG_COLOR_MASK_COLOR))
-@@ -340,14 +353,20 @@ grub_png_decode_image_header (struct grub_png_data *data)
-   if (grub_png_get_byte (data) != PNG_COMPRESSION_BASE)
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
- 		       "png: compression method not supported");
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
- 
-   if (grub_png_get_byte (data) != PNG_FILTER_TYPE_BASE)
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
- 		       "png: filter method not supported");
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
- 
-   if (grub_png_get_byte (data) != PNG_INTERLACE_NONE)
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
- 		       "png: interlace method not supported");
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
- 
-   /* Skip crc checksum.  */
-   grub_png_get_dword (data);
-@@ -449,7 +468,7 @@ grub_png_get_huff_code (struct grub_png_data *data, struct huff_table *ht)
-   int code, i;
- 
-   code = 0;
--  for (i = 0; i < ht->max_length; i++)
-+  for (i = 0; i < ht->max_length && grub_errno == GRUB_ERR_NONE; i++)
-     {
-       code = (code << 1) + grub_png_get_bits (data, 1);
-       if (code < ht->maxval[i])
-@@ -504,8 +523,14 @@ grub_png_init_dynamic_block (struct grub_png_data *data)
-   grub_uint8_t lens[DEFLATE_HCLEN_MAX];
- 
-   nl = DEFLATE_HLIT_BASE + grub_png_get_bits (data, 5);
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
-   nd = DEFLATE_HDIST_BASE + grub_png_get_bits (data, 5);
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
-   nb = DEFLATE_HCLEN_BASE + grub_png_get_bits (data, 4);
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
- 
-   if ((nl > DEFLATE_HLIT_MAX) || (nd > DEFLATE_HDIST_MAX) ||
-       (nb > DEFLATE_HCLEN_MAX))
-@@ -533,7 +558,7 @@ grub_png_init_dynamic_block (struct grub_png_data *data)
- 			    data->dist_offset);
- 
-   prev = 0;
--  for (i = 0; i < nl + nd; i++)
-+  for (i = 0; i < nl + nd && grub_errno == GRUB_ERR_NONE; i++)
-     {
-       int n, code;
-       struct huff_table *ht;
-@@ -721,17 +746,21 @@ grub_png_read_dynamic_block (struct grub_png_data *data)
- 	  len = cplens[n];
- 	  if (cplext[n])
- 	    len += grub_png_get_bits (data, cplext[n]);
-+	  if (grub_errno != GRUB_ERR_NONE)
-+	    return grub_errno;
- 
- 	  n = grub_png_get_huff_code (data, &data->dist_table);
- 	  dist = cpdist[n];
- 	  if (cpdext[n])
- 	    dist += grub_png_get_bits (data, cpdext[n]);
-+	  if (grub_errno != GRUB_ERR_NONE)
-+	    return grub_errno;
- 
- 	  pos = data->wp - dist;
- 	  if (pos < 0)
- 	    pos += WSIZE;
- 
--	  while (len > 0)
-+	  while (len > 0 && grub_errno == GRUB_ERR_NONE)
- 	    {
- 	      data->slide[data->wp] = data->slide[pos];
- 	      grub_png_output_byte (data, data->slide[data->wp]);
-@@ -759,7 +788,11 @@ grub_png_decode_image_data (struct grub_png_data *data)
-   int final;
- 
-   cmf = grub_png_get_byte (data);
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
-   flg = grub_png_get_byte (data);
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
- 
-   if ((cmf & 0xF) != Z_DEFLATED)
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-@@ -774,7 +807,11 @@ grub_png_decode_image_data (struct grub_png_data *data)
-       int block_type;
- 
-       final = grub_png_get_bits (data, 1);
-+      if (grub_errno != GRUB_ERR_NONE)
-+	return grub_errno;
-       block_type = grub_png_get_bits (data, 2);
-+      if (grub_errno != GRUB_ERR_NONE)
-+	return grub_errno;
- 
-       switch (block_type)
- 	{
-@@ -790,7 +827,7 @@ grub_png_decode_image_data (struct grub_png_data *data)
- 	    grub_png_get_byte (data);
- 	    grub_png_get_byte (data);
- 
--	    for (i = 0; i < len; i++)
-+	    for (i = 0; i < len && grub_errno == GRUB_ERR_NONE; i++)
- 	      grub_png_output_byte (data, grub_png_get_byte (data));
- 
- 	    break;
-@@ -1045,6 +1082,8 @@ grub_png_decode_png (struct grub_png_data *data)
- 
-       len = grub_png_get_dword (data);
-       type = grub_png_get_dword (data);
-+      if (grub_errno != GRUB_ERR_NONE)
-+	break;
-       data->next_offset = data->file->offset + len + 4;
- 
-       switch (type)
diff --git a/0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch b/0230-Allow-chainloading-EFI-apps-from-loop-mounts.patch
similarity index 81%
rename from 0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch
rename to 0230-Allow-chainloading-EFI-apps-from-loop-mounts.patch
index c3101e10..c5e44570 100644
--- a/0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch
+++ b/0230-Allow-chainloading-EFI-apps-from-loop-mounts.patch
@@ -7,13 +7,13 @@ Signed-off-by: Dimitri John Ledkov <Dimitri.ledkov@canonical.com>
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/disk/loopback.c          |  9 +--------
- grub-core/loader/efi/chainloader.c | 23 +++++++++++++++++++++++
+ grub-core/loader/efi/chainloader.c | 24 ++++++++++++++++++++++++
  include/grub/loopback.h            | 30 ++++++++++++++++++++++++++++++
- 3 files changed, 54 insertions(+), 8 deletions(-)
+ 3 files changed, 55 insertions(+), 8 deletions(-)
  create mode 100644 include/grub/loopback.h
 
 diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
-index 41bebd14fe..99f47924ec 100644
+index 4635dcfdeec..11a5e0cbd02 100644
 --- a/grub-core/disk/loopback.c
 +++ b/grub-core/disk/loopback.c
 @@ -21,20 +21,13 @@
@@ -39,7 +39,7 @@ index 41bebd14fe..99f47924ec 100644
  static unsigned long last_id = 0;
  
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index d41e8ea14a..3af6b12292 100644
+index 0ec682e2988..efbe2bd38aa 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -24,6 +24,7 @@
@@ -50,20 +50,21 @@ index d41e8ea14a..3af6b12292 100644
  #include <grub/misc.h>
  #include <grub/charset.h>
  #include <grub/mm.h>
-@@ -901,6 +902,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -907,6 +908,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    grub_efi_status_t status;
    grub_efi_boot_services_t *b;
    grub_device_t dev = 0;
 +  grub_device_t orig_dev = 0;
-   grub_efi_device_path_t *dp = 0;
+   grub_efi_device_path_t *dp = NULL;
    char *filename;
    void *boot_image = 0;
-@@ -958,6 +960,15 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
-   if (! dev)
-     goto fail;
- 
+@@ -963,6 +965,16 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+   dev = grub_device_open (devname);
+   if (devname)
+     grub_free (devname);
++
 +  /* if device is loopback, use underlying dev */
-+  if (dev->disk->dev->id == GRUB_DISK_DEVICE_LOOPBACK_ID)
++  if (dev && dev->disk->dev->id == GRUB_DISK_DEVICE_LOOPBACK_ID)
 +    {
 +      struct grub_loopback *d;
 +      orig_dev = dev;
@@ -71,10 +72,10 @@ index d41e8ea14a..3af6b12292 100644
 +      dev = d->file->device;
 +    }
 +
-   if (dev->disk)
-     dev_handle = grub_efidisk_get_device_handle (dev->disk);
-   else if (dev->net && dev->net->server)
-@@ -1065,6 +1076,12 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+   if (dev == NULL)
+     ;
+   else if (dev->disk)
+@@ -1069,6 +1081,12 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  #endif
  
@@ -87,10 +88,10 @@ index d41e8ea14a..3af6b12292 100644
    rc = grub_linuxefi_secure_validate((void *)(unsigned long)address, fsize);
    grub_dprintf ("chain", "linuxefi_secure_validate: %d\n", rc);
    if (rc > 0)
-@@ -1087,6 +1104,12 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
-   // -1 fall-through to fail
+@@ -1092,6 +1110,12 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  
  fail:
+ 
 +  if (orig_dev)
 +    {
 +      dev = orig_dev;
@@ -102,7 +103,7 @@ index d41e8ea14a..3af6b12292 100644
  
 diff --git a/include/grub/loopback.h b/include/grub/loopback.h
 new file mode 100644
-index 0000000000..3b9a9e32e8
+index 00000000000..3b9a9e32e80
 --- /dev/null
 +++ b/include/grub/loopback.h
 @@ -0,0 +1,30 @@
diff --git a/0230-video-readers-png-Refuse-to-handle-multiple-image-he.patch b/0230-video-readers-png-Refuse-to-handle-multiple-image-he.patch
deleted file mode 100644
index 9168fe58..00000000
--- a/0230-video-readers-png-Refuse-to-handle-multiple-image-he.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 6 Jul 2021 14:13:40 +1000
-Subject: [PATCH] video/readers/png: Refuse to handle multiple image headers
-
-This causes the bitmap to be leaked. Do not permit multiple image headers.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 8ce433557adeadbc46429aabb9f850b02ad2bdfb)
----
- grub-core/video/readers/png.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index e2a6b1cf3c..8955b8ecfd 100644
---- a/grub-core/video/readers/png.c
-+++ b/grub-core/video/readers/png.c
-@@ -258,6 +258,9 @@ grub_png_decode_image_header (struct grub_png_data *data)
-   int color_bits;
-   enum grub_video_blit_format blt;
- 
-+  if (data->image_width || data->image_height)
-+    return grub_error (GRUB_ERR_BAD_FILE_TYPE, "png: two image headers found");
-+
-   data->image_width = grub_png_get_dword (data);
-   data->image_height = grub_png_get_dword (data);
- 
diff --git a/0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch b/0231-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
similarity index 98%
rename from 0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
rename to 0231-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
index 4fe8adf7..084be2f8 100644
--- a/0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
+++ b/0231-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
@@ -34,7 +34,7 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
  1 file changed, 13 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 3cf0f9b330..941df6400b 100644
+index 97484bbe24d..1dd787081f2 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -30,7 +30,6 @@
diff --git a/0231-video-readers-png-Drop-greyscale-support-to-fix-heap.patch b/0231-video-readers-png-Drop-greyscale-support-to-fix-heap.patch
deleted file mode 100644
index 4529cb8e..00000000
--- a/0231-video-readers-png-Drop-greyscale-support-to-fix-heap.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 6 Jul 2021 18:51:35 +1000
-Subject: [PATCH] video/readers/png: Drop greyscale support to fix heap
- out-of-bounds write
-
-A 16-bit greyscale PNG without alpha is processed in the following loop:
-
-      for (i = 0; i < (data->image_width * data->image_height);
-	   i++, d1 += 4, d2 += 2)
-	{
-	  d1[R3] = d2[1];
-	  d1[G3] = d2[1];
-	  d1[B3] = d2[1];
-	}
-
-The increment of d1 is wrong. d1 is incremented by 4 bytes per iteration,
-but there are only 3 bytes allocated for storage. This means that image
-data will overwrite somewhat-attacker-controlled parts of memory - 3 bytes
-out of every 4 following the end of the image.
-
-This has existed since greyscale support was added in 2013 in commit
-3ccf16dff98f (grub-core/video/readers/png.c: Support grayscale).
-
-Saving starfield.png as a 16-bit greyscale image without alpha in the gimp
-and attempting to load it causes grub-emu to crash - I don't think this code
-has ever worked.
-
-Delete all PNG greyscale support.
-
-Fixes: CVE-2021-3695
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 0e1d163382669bd734439d8864ee969616d971d9)
-[rharwood: context conflict]
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- grub-core/video/readers/png.c | 85 +++----------------------------------------
- 1 file changed, 6 insertions(+), 79 deletions(-)
-
-diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index 8955b8ecfd..a3161e25b6 100644
---- a/grub-core/video/readers/png.c
-+++ b/grub-core/video/readers/png.c
-@@ -100,7 +100,7 @@ struct grub_png_data
- 
-   unsigned image_width, image_height;
-   int bpp, is_16bit;
--  int raw_bytes, is_gray, is_alpha, is_palette;
-+  int raw_bytes, is_alpha, is_palette;
-   int row_bytes, color_bits;
-   grub_uint8_t *image_data;
- 
-@@ -296,13 +296,13 @@ grub_png_decode_image_header (struct grub_png_data *data)
-     data->bpp = 3;
-   else
-     {
--      data->is_gray = 1;
--      data->bpp = 1;
-+      return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+			 "png: color type not supported");
-     }
- 
-   if ((color_bits != 8) && (color_bits != 16)
-       && (color_bits != 4
--	  || !(data->is_gray || data->is_palette)))
-+	  || !data->is_palette))
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-                        "png: bit depth must be 8 or 16");
- 
-@@ -331,7 +331,7 @@ grub_png_decode_image_header (struct grub_png_data *data)
-     }
- 
- #ifndef GRUB_CPU_WORDS_BIGENDIAN
--  if (data->is_16bit || data->is_gray || data->is_palette)
-+  if (data->is_16bit || data->is_palette)
- #endif
-     {
-       data->image_data = grub_calloc (data->image_height, data->row_bytes);
-@@ -899,27 +899,8 @@ grub_png_convert_image (struct grub_png_data *data)
-       int shift;
-       int mask = (1 << data->color_bits) - 1;
-       unsigned j;
--      if (data->is_gray)
--	{
--	  /* Generic formula is
--	     (0xff * i) / ((1U << data->color_bits) - 1)
--	     but for allowed bit depth of 1, 2 and for it's
--	     equivalent to
--	     (0xff / ((1U << data->color_bits) - 1)) * i
--	     Precompute the multipliers to avoid division.
--	  */
- 
--	  const grub_uint8_t multipliers[5] = { 0xff, 0xff, 0x55, 0x24, 0x11 };
--	  for (i = 0; i < (1U << data->color_bits); i++)
--	    {
--	      grub_uint8_t col = multipliers[data->color_bits] * i;
--	      palette[i][0] = col;
--	      palette[i][1] = col;
--	      palette[i][2] = col;
--	    }
--	}
--      else
--	grub_memcpy (palette, data->palette, 3 << data->color_bits);
-+      grub_memcpy (palette, data->palette, 3 << data->color_bits);
-       d1c = d1;
-       d2c = d2;
-       for (j = 0; j < data->image_height; j++, d1c += data->image_width * 3,
-@@ -956,60 +937,6 @@ grub_png_convert_image (struct grub_png_data *data)
- 	}
-       return;
-     }
--  
--  if (data->is_gray)
--    {
--      switch (data->bpp)
--	{
--	case 4:
--	  /* 16-bit gray with alpha.  */
--	  for (i = 0; i < (data->image_width * data->image_height);
--	       i++, d1 += 4, d2 += 4)
--	    {
--	      d1[R4] = d2[3];
--	      d1[G4] = d2[3];
--	      d1[B4] = d2[3];
--	      d1[A4] = d2[1];
--	    }
--	  break;
--	case 2:
--	  if (data->is_16bit)
--	    /* 16-bit gray without alpha.  */
--	    {
--	      for (i = 0; i < (data->image_width * data->image_height);
--		   i++, d1 += 4, d2 += 2)
--		{
--		  d1[R3] = d2[1];
--		  d1[G3] = d2[1];
--		  d1[B3] = d2[1];
--		}
--	    }
--	  else
--	    /* 8-bit gray with alpha.  */
--	    {
--	      for (i = 0; i < (data->image_width * data->image_height);
--		   i++, d1 += 4, d2 += 2)
--		{
--		  d1[R4] = d2[1];
--		  d1[G4] = d2[1];
--		  d1[B4] = d2[1];
--		  d1[A4] = d2[0];
--		}
--	    }
--	  break;
--	  /* 8-bit gray without alpha.  */
--	case 1:
--	  for (i = 0; i < (data->image_width * data->image_height);
--	       i++, d1 += 3, d2++)
--	    {
--	      d1[R3] = d2[0];
--	      d1[G3] = d2[0];
--	      d1[B3] = d2[0];
--	    }
--	  break;
--	}
--      return;
--    }
- 
-     {
-   /* Only copy the upper 8 bit.  */
diff --git a/0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch b/0232-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
similarity index 86%
rename from 0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
rename to 0232-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
index 4c56d60d..1ec47877 100644
--- a/0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
+++ b/0232-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
@@ -39,18 +39,18 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 3af6b12292..644cd2e56f 100644
+index efbe2bd38aa..3a3b55c1d61 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -906,7 +906,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
-   grub_efi_device_path_t *dp = 0;
+@@ -912,7 +912,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+   grub_efi_device_path_t *dp = NULL;
    char *filename;
    void *boot_image = 0;
 -  int rc;
  
-   if (argc == 0)
-     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-@@ -1082,9 +1081,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+   file_path = NULL;
+   address = 0;
+@@ -1087,9 +1086,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
        orig_dev = 0;
      }
  
@@ -61,7 +61,7 @@ index 3af6b12292..644cd2e56f 100644
      {
        grub_file_close (file);
        grub_device_close (dev);
-@@ -1092,7 +1089,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -1097,7 +1094,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  		       grub_secureboot_chainloader_unload, 0);
        return 0;
      }
@@ -70,11 +70,11 @@ index 3af6b12292..644cd2e56f 100644
      {
        grub_load_and_start_image(boot_image);
        grub_file_close (file);
-@@ -1101,7 +1098,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -1106,7 +1103,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  
        return 0;
      }
 -  // -1 fall-through to fail
  
  fail:
-   if (orig_dev)
+ 
diff --git a/0232-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch b/0232-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch
deleted file mode 100644
index 51dddfe5..00000000
--- a/0232-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 6 Jul 2021 23:25:07 +1000
-Subject: [PATCH] video/readers/png: Avoid heap OOB R/W inserting huff table
- items
-
-In fuzzing we observed crashes where a code would attempt to be inserted
-into a huffman table before the start, leading to a set of heap OOB reads
-and writes as table entries with negative indices were shifted around and
-the new code written in.
-
-Catch the case where we would underflow the array and bail.
-
-Fixes: CVE-2021-3696
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 1ae9a91d42cb40da8a6f11fac65541858e340afa)
----
- grub-core/video/readers/png.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index a3161e25b6..d7ed5aa6cf 100644
---- a/grub-core/video/readers/png.c
-+++ b/grub-core/video/readers/png.c
-@@ -438,6 +438,13 @@ grub_png_insert_huff_item (struct huff_table *ht, int code, int len)
-   for (i = len; i < ht->max_length; i++)
-     n += ht->maxval[i];
- 
-+  if (n > ht->num_values)
-+    {
-+      grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+		  "png: out of range inserting huffman table item");
-+      return;
-+    }
-+
-   for (i = 0; i < n; i++)
-     ht->values[ht->num_values - i] = ht->values[ht->num_values - i - 1];
- 
diff --git a/0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch b/0233-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
similarity index 83%
rename from 0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
rename to 0233-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
index c683fcb7..a9f78884 100644
--- a/0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
+++ b/0233-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
-Date: Fri, 4 Mar 2022 11:36:09 +0100
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Mon, 8 Apr 2024 10:59:25 -0600
 Subject: [PATCH] grub-core/loader/efi/linux.c: drop now unused
  grub_linuxefi_secure_validate
 
@@ -13,17 +13,17 @@ shim-lock-verifier is an optional module.
 
 Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
 ---
- grub-core/loader/efi/linux.c | 40 ----------------------------------------
+ grub-core/loader/efi/linux.c | 42 ------------------------------------------
  include/grub/efi/linux.h     |  2 --
- 2 files changed, 42 deletions(-)
+ 2 files changed, 44 deletions(-)
 
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index 9260731c10..9265cf4200 100644
+index ecb6d593cef..f5ab0128991 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
-@@ -24,46 +24,6 @@
- #include <grub/efi/pe32.h>
- #include <grub/efi/linux.h>
+@@ -89,48 +89,6 @@ static grub_efi_load_file2_t initrd_lf2 = {
+   grub_efi_initrd_load_file2
+ };
  
 -#define SHIM_LOCK_GUID \
 - { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
@@ -38,11 +38,12 @@ index 9260731c10..9265cf4200 100644
 -int
 -grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
 -{
--  grub_efi_guid_t guid = SHIM_LOCK_GUID;
+-  grub_guid_t guid = SHIM_LOCK_GUID;
 -  grub_efi_shim_lock_t *shim_lock;
 -  grub_efi_status_t status;
 -
 -  shim_lock = grub_efi_locate_protocol(&guid, NULL);
+-
 -  grub_dprintf ("secureboot", "shim_lock: %p\n", shim_lock);
 -  if (!shim_lock)
 -    {
@@ -63,13 +64,14 @@ index 9260731c10..9265cf4200 100644
 -		(unsigned long) status);
 -
 -  return -1;
+-
 -}
 -
  #pragma GCC diagnostic push
  #pragma GCC diagnostic ignored "-Wcast-align"
  
 diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
-index 0033d9305a..887b02fd9f 100644
+index b2cfd8c1f44..c806a7757f3 100644
 --- a/include/grub/efi/linux.h
 +++ b/include/grub/efi/linux.h
 @@ -22,8 +22,6 @@
@@ -80,4 +82,4 @@ index 0033d9305a..887b02fd9f 100644
 -EXPORT_FUNC(grub_linuxefi_secure_validate) (void *data, grub_uint32_t size);
  grub_err_t
  EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
- 				  void *kernel_param);
+                                   void *kernel_param);
diff --git a/0233-video-readers-png-Sanity-check-some-huffman-codes.patch b/0233-video-readers-png-Sanity-check-some-huffman-codes.patch
deleted file mode 100644
index c9cef259..00000000
--- a/0233-video-readers-png-Sanity-check-some-huffman-codes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 6 Jul 2021 19:19:11 +1000
-Subject: [PATCH] video/readers/png: Sanity check some huffman codes
-
-ASAN picked up two OOB global reads: we weren't checking if some code
-values fit within the cplens or cpdext arrays. Check and throw an error
-if not.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit c3a8ab0cbd24153ec7b1f84a96ddfdd72ef8d117)
----
- grub-core/video/readers/png.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index d7ed5aa6cf..7f2ba7849b 100644
---- a/grub-core/video/readers/png.c
-+++ b/grub-core/video/readers/png.c
-@@ -753,6 +753,9 @@ grub_png_read_dynamic_block (struct grub_png_data *data)
- 	  int len, dist, pos;
- 
- 	  n -= 257;
-+	  if (((unsigned int) n) >= ARRAY_SIZE (cplens))
-+	    return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+			       "png: invalid huff code");
- 	  len = cplens[n];
- 	  if (cplext[n])
- 	    len += grub_png_get_bits (data, cplext[n]);
-@@ -760,6 +763,9 @@ grub_png_read_dynamic_block (struct grub_png_data *data)
- 	    return grub_errno;
- 
- 	  n = grub_png_get_huff_code (data, &data->dist_table);
-+	  if (((unsigned int) n) >= ARRAY_SIZE (cpdist))
-+	    return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+			       "png: invalid huff code");
- 	  dist = cpdist[n];
- 	  if (cpdext[n])
- 	    dist += grub_png_get_bits (data, cpdext[n]);
diff --git a/0220-loader-efi-chainloader-grub_load_and_start_image-doe.patch b/0234-loader-efi-chainloader-grub_load_and_start_image-doe.patch
similarity index 87%
rename from 0220-loader-efi-chainloader-grub_load_and_start_image-doe.patch
rename to 0234-loader-efi-chainloader-grub_load_and_start_image-doe.patch
index f61ed282..75cb622c 100644
--- a/0220-loader-efi-chainloader-grub_load_and_start_image-doe.patch
+++ b/0234-loader-efi-chainloader-grub_load_and_start_image-doe.patch
@@ -21,10 +21,10 @@ Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
  1 file changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 644cd2e56f..d3bf02ed8a 100644
+index 3a3b55c1d61..9c6a5f92600 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -841,7 +841,7 @@ grub_secureboot_chainloader_unload (void)
+@@ -847,7 +847,7 @@ grub_secureboot_chainloader_unload (void)
  }
  
  static grub_err_t
@@ -33,7 +33,7 @@ index 644cd2e56f..d3bf02ed8a 100644
  {
    grub_efi_boot_services_t *b;
    grub_efi_status_t status;
-@@ -883,13 +883,23 @@ grub_load_and_start_image(void *boot_image)
+@@ -889,13 +889,23 @@ grub_load_and_start_image(void *boot_image)
  static grub_err_t
  grub_secureboot_chainloader_boot (void)
  {
@@ -58,7 +58,7 @@ index 644cd2e56f..d3bf02ed8a 100644
    grub_loader_unset ();
    return grub_errno;
  }
-@@ -1091,7 +1101,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -1096,7 +1106,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
    else
      {
@@ -66,4 +66,4 @@ index 644cd2e56f..d3bf02ed8a 100644
 +      grub_load_image(boot_image);
        grub_file_close (file);
        grub_device_close (dev);
-       grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
+       grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0);
diff --git a/0234-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch b/0234-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch
deleted file mode 100644
index 54918163..00000000
--- a/0234-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Mon, 28 Jun 2021 14:16:14 +1000
-Subject: [PATCH] video/readers/jpeg: Abort sooner if a read operation fails
-
-Fuzzing revealed some inputs that were taking a long time, potentially
-forever, because they did not bail quickly upon encountering an I/O error.
-
-Try to catch I/O errors sooner and bail out.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit ab2e5d2e4bff488bbb557ed435a61ae102ef9f0c)
----
- grub-core/video/readers/jpeg.c | 86 ++++++++++++++++++++++++++++++++++--------
- 1 file changed, 70 insertions(+), 16 deletions(-)
-
-diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
-index e31602f766..10225abd53 100644
---- a/grub-core/video/readers/jpeg.c
-+++ b/grub-core/video/readers/jpeg.c
-@@ -109,9 +109,17 @@ static grub_uint8_t
- grub_jpeg_get_byte (struct grub_jpeg_data *data)
- {
-   grub_uint8_t r;
-+  grub_ssize_t bytes_read;
- 
-   r = 0;
--  grub_file_read (data->file, &r, 1);
-+  bytes_read = grub_file_read (data->file, &r, 1);
-+
-+  if (bytes_read != 1)
-+    {
-+      grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+		  "jpeg: unexpected end of data");
-+      return 0;
-+    }
- 
-   return r;
- }
-@@ -120,9 +128,17 @@ static grub_uint16_t
- grub_jpeg_get_word (struct grub_jpeg_data *data)
- {
-   grub_uint16_t r;
-+  grub_ssize_t bytes_read;
- 
-   r = 0;
--  grub_file_read (data->file, &r, sizeof (grub_uint16_t));
-+  bytes_read = grub_file_read (data->file, &r, sizeof (grub_uint16_t));
-+
-+  if (bytes_read != sizeof (grub_uint16_t))
-+    {
-+      grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+		  "jpeg: unexpected end of data");
-+      return 0;
-+    }
- 
-   return grub_be_to_cpu16 (r);
- }
-@@ -135,6 +151,11 @@ grub_jpeg_get_bit (struct grub_jpeg_data *data)
-   if (data->bit_mask == 0)
-     {
-       data->bit_save = grub_jpeg_get_byte (data);
-+      if (grub_errno != GRUB_ERR_NONE) {
-+	grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+		    "jpeg: file read error");
-+	return 0;
-+      }
-       if (data->bit_save == JPEG_ESC_CHAR)
- 	{
- 	  if (grub_jpeg_get_byte (data) != 0)
-@@ -143,6 +164,11 @@ grub_jpeg_get_bit (struct grub_jpeg_data *data)
- 			  "jpeg: invalid 0xFF in data stream");
- 	      return 0;
- 	    }
-+	  if (grub_errno != GRUB_ERR_NONE)
-+	    {
-+	      grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: file read error");
-+	      return 0;
-+	    }
- 	}
-       data->bit_mask = 0x80;
-     }
-@@ -161,7 +187,7 @@ grub_jpeg_get_number (struct grub_jpeg_data *data, int num)
-     return 0;
- 
-   msb = value = grub_jpeg_get_bit (data);
--  for (i = 1; i < num; i++)
-+  for (i = 1; i < num && grub_errno == GRUB_ERR_NONE; i++)
-     value = (value << 1) + (grub_jpeg_get_bit (data) != 0);
-   if (!msb)
-     value += 1 - (1 << num);
-@@ -202,6 +228,8 @@ grub_jpeg_decode_huff_table (struct grub_jpeg_data *data)
-   while (data->file->offset + sizeof (count) + 1 <= next_marker)
-     {
-       id = grub_jpeg_get_byte (data);
-+      if (grub_errno != GRUB_ERR_NONE)
-+	return grub_errno;
-       ac = (id >> 4) & 1;
-       id &= 0xF;
-       if (id > 1)
-@@ -252,6 +280,8 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data)
- 
-   next_marker = data->file->offset;
-   next_marker += grub_jpeg_get_word (data);
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
- 
-   if (next_marker > data->file->size)
-     {
-@@ -263,6 +293,8 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data)
- 	 <= next_marker)
-     {
-       id = grub_jpeg_get_byte (data);
-+      if (grub_errno != GRUB_ERR_NONE)
-+        return grub_errno;
-       if (id >= 0x10)		/* Upper 4-bit is precision.  */
- 	return grub_error (GRUB_ERR_BAD_FILE_TYPE,
- 			   "jpeg: only 8-bit precision is supported");
-@@ -294,6 +326,9 @@ grub_jpeg_decode_sof (struct grub_jpeg_data *data)
-   next_marker = data->file->offset;
-   next_marker += grub_jpeg_get_word (data);
- 
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
-+
-   if (grub_jpeg_get_byte (data) != 8)
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
- 		       "jpeg: only 8-bit precision is supported");
-@@ -319,6 +354,8 @@ grub_jpeg_decode_sof (struct grub_jpeg_data *data)
- 	return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: invalid index");
- 
-       ss = grub_jpeg_get_byte (data);	/* Sampling factor.  */
-+      if (grub_errno != GRUB_ERR_NONE)
-+	return grub_errno;
-       if (!id)
- 	{
- 	  grub_uint8_t vs, hs;
-@@ -498,7 +535,7 @@ grub_jpeg_idct_transform (jpeg_data_unit_t du)
-     }
- }
- 
--static void
-+static grub_err_t
- grub_jpeg_decode_du (struct grub_jpeg_data *data, int id, jpeg_data_unit_t du)
- {
-   int h1, h2, qt;
-@@ -513,6 +550,9 @@ grub_jpeg_decode_du (struct grub_jpeg_data *data, int id, jpeg_data_unit_t du)
-   data->dc_value[id] +=
-     grub_jpeg_get_number (data, grub_jpeg_get_huff_code (data, h1));
- 
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
-+
-   du[0] = data->dc_value[id] * (int) data->quan_table[qt][0];
-   pos = 1;
-   while (pos < ARRAY_SIZE (data->quan_table[qt]))
-@@ -527,11 +567,13 @@ grub_jpeg_decode_du (struct grub_jpeg_data *data, int id, jpeg_data_unit_t du)
-       num >>= 4;
-       pos += num;
- 
-+      if (grub_errno != GRUB_ERR_NONE)
-+        return grub_errno;
-+
-       if (pos >= ARRAY_SIZE (jpeg_zigzag_order))
- 	{
--	  grub_error (GRUB_ERR_BAD_FILE_TYPE,
--		      "jpeg: invalid position in zigzag order!?");
--	  return;
-+	  return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+			     "jpeg: invalid position in zigzag order!?");
- 	}
- 
-       du[jpeg_zigzag_order[pos]] = val * (int) data->quan_table[qt][pos];
-@@ -539,6 +581,7 @@ grub_jpeg_decode_du (struct grub_jpeg_data *data, int id, jpeg_data_unit_t du)
-     }
- 
-   grub_jpeg_idct_transform (du);
-+  return GRUB_ERR_NONE;
- }
- 
- static void
-@@ -597,7 +640,8 @@ grub_jpeg_decode_sos (struct grub_jpeg_data *data)
-   data_offset += grub_jpeg_get_word (data);
- 
-   cc = grub_jpeg_get_byte (data);
--
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
-   if (cc != 3 && cc != 1)
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
- 		       "jpeg: component count must be 1 or 3");
-@@ -610,7 +654,8 @@ grub_jpeg_decode_sos (struct grub_jpeg_data *data)
-       id = grub_jpeg_get_byte (data) - 1;
-       if ((id < 0) || (id >= 3))
- 	return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: invalid index");
--
-+      if (grub_errno != GRUB_ERR_NONE)
-+	return grub_errno;
-       ht = grub_jpeg_get_byte (data);
-       data->comp_index[id][1] = (ht >> 4);
-       data->comp_index[id][2] = (ht & 0xF) + 2;
-@@ -618,11 +663,14 @@ grub_jpeg_decode_sos (struct grub_jpeg_data *data)
-       if ((data->comp_index[id][1] < 0) || (data->comp_index[id][1] > 3) ||
- 	  (data->comp_index[id][2] < 0) || (data->comp_index[id][2] > 3))
- 	return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: invalid hufftable index");
-+      if (grub_errno != GRUB_ERR_NONE)
-+	return grub_errno;
-     }
- 
-   grub_jpeg_get_byte (data);	/* Skip 3 unused bytes.  */
-   grub_jpeg_get_word (data);
--
-+  if (grub_errno != GRUB_ERR_NONE)
-+    return grub_errno;
-   if (data->file->offset != data_offset)
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: extra byte in sos");
- 
-@@ -640,6 +688,7 @@ grub_jpeg_decode_data (struct grub_jpeg_data *data)
- {
-   unsigned c1, vb, hb, nr1, nc1;
-   int rst = data->dri;
-+  grub_err_t err = GRUB_ERR_NONE;
- 
-   vb = 8 << data->log_vs;
-   hb = 8 << data->log_hs;
-@@ -660,17 +709,22 @@ grub_jpeg_decode_data (struct grub_jpeg_data *data)
- 
- 	for (r2 = 0; r2 < (1U << data->log_vs); r2++)
- 	  for (c2 = 0; c2 < (1U << data->log_hs); c2++)
--	    grub_jpeg_decode_du (data, 0, data->ydu[r2 * 2 + c2]);
-+            {
-+              err = grub_jpeg_decode_du (data, 0, data->ydu[r2 * 2 + c2]);
-+              if (err != GRUB_ERR_NONE)
-+                return err;
-+            }
- 
- 	if (data->color_components >= 3)
- 	  {
--	    grub_jpeg_decode_du (data, 1, data->cbdu);
--	    grub_jpeg_decode_du (data, 2, data->crdu);
-+	    err = grub_jpeg_decode_du (data, 1, data->cbdu);
-+	    if (err != GRUB_ERR_NONE)
-+	      return err;
-+	    err = grub_jpeg_decode_du (data, 2, data->crdu);
-+	    if (err != GRUB_ERR_NONE)
-+	      return err;
- 	  }
- 
--	if (grub_errno)
--	  return grub_errno;
--
- 	nr2 = (data->r1 == nr1 - 1) ? (data->image_height - data->r1 * vb) : vb;
- 	nc2 = (c1 == nc1 - 1) ? (data->image_width - c1 * hb) : hb;
- 
diff --git a/0221-loader-efi-chainloader-simplify-the-loader-state.patch b/0235-loader-efi-chainloader-simplify-the-loader-state.patch
similarity index 76%
rename from 0221-loader-efi-chainloader-simplify-the-loader-state.patch
rename to 0235-loader-efi-chainloader-simplify-the-loader-state.patch
index 205124e4..d9962f07 100644
--- a/0221-loader-efi-chainloader-simplify-the-loader-state.patch
+++ b/0235-loader-efi-chainloader-simplify-the-loader-state.patch
@@ -18,14 +18,14 @@ Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
 [rharwood: fix unitialized handle and double-frees of file/dev]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/loader/efi/chainloader.c | 160 +++++++++++++++++++++++--------------
- 1 file changed, 102 insertions(+), 58 deletions(-)
+ grub-core/loader/efi/chainloader.c | 161 ++++++++++++++++++++++++-------------
+ 1 file changed, 103 insertions(+), 58 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index d3bf02ed8a..3342492ff1 100644
+index 9c6a5f92600..cbe028cd8af 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -48,38 +48,21 @@ GRUB_MOD_LICENSE ("GPLv3+");
+@@ -49,46 +49,30 @@ GRUB_MOD_LICENSE ("GPLv3+");
  
  static grub_dl_t my_mod;
  
@@ -38,7 +38,7 @@ index d3bf02ed8a..3342492ff1 100644
 -static grub_ssize_t cmdline_len;
 -static grub_efi_handle_t dev_handle;
  
--static grub_efi_status_t (*entry_point) (grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
+-static grub_efi_status_t (__grub_efi_api *entry_point) (grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
 +struct grub_secureboot_chainloader_context {
 +  grub_efi_physical_address_t address;
 +  grub_efi_uintn_t pages;
@@ -51,40 +51,41 @@ index d3bf02ed8a..3342492ff1 100644
 +static struct grub_secureboot_chainloader_context *sb_context;
  
  static grub_err_t
--grub_chainloader_unload (void)
+-grub_chainloader_unload (void *context)
 -{
+-  grub_efi_loaded_image_t *loaded_image;
 -  grub_efi_boot_services_t *b;
 -
--  b = grub_efi_system_table->boot_services;
--  efi_call_1 (b->unload_image, image_handle);
--  grub_efi_free_pages (address, pages);
+-  image_handle = (grub_efi_handle_t) context;
+-  loaded_image = grub_efi_get_loaded_image (image_handle);
+-  if (loaded_image != NULL)
+-    grub_free (loaded_image->load_options);
 -
--  grub_free (file_path);
--  grub_free (cmdline);
--  cmdline = 0;
--  file_path = 0;
--  dev_handle = 0;
+-  b = grub_efi_system_table->boot_services;
+-  b->unload_image (image_handle);
 -
 -  grub_dl_unref (my_mod);
 -  return GRUB_ERR_NONE;
 -}
 -
 -static grub_err_t
--grub_chainloader_boot (void)
+-grub_chainloader_boot (void *context)
 +grub_start_image (grub_efi_handle_t handle)
  {
    grub_efi_boot_services_t *b;
    grub_efi_status_t status;
-@@ -87,7 +70,7 @@ grub_chainloader_boot (void)
+   grub_efi_uintn_t exit_data_size;
    grub_efi_char16_t *exit_data = NULL;
  
+-  image_handle = (grub_efi_handle_t) context;
    b = grub_efi_system_table->boot_services;
--  status = efi_call_3 (b->start_image, image_handle, &exit_data_size, &exit_data);
-+  status = efi_call_3 (b->start_image, handle, &exit_data_size, &exit_data);
+-  status = b->start_image (image_handle, &exit_data_size, &exit_data);
++
++  status = b->start_image (handle, &exit_data_size, &exit_data);
    if (status != GRUB_EFI_SUCCESS)
      {
        if (exit_data)
-@@ -111,11 +94,37 @@ grub_chainloader_boot (void)
+@@ -112,11 +96,37 @@ grub_chainloader_boot (void *context)
    if (exit_data)
      grub_efi_free_pool (exit_data);
  
@@ -104,7 +105,7 @@ index d3bf02ed8a..3342492ff1 100644
 +    grub_free (loaded_image->load_options);
 +
 +  b = grub_efi_system_table->boot_services;
-+  efi_call_1 (b->unload_image, image_handle);
++  b->unload_image (image_handle);
 +
 +  grub_dl_unref (my_mod);
 +  return GRUB_ERR_NONE;
@@ -124,7 +125,7 @@ index d3bf02ed8a..3342492ff1 100644
  static grub_err_t
  copy_file_path (grub_efi_file_path_device_path_t *fp,
  		const char *str, grub_efi_uint16_t len)
-@@ -150,7 +159,7 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
+@@ -151,7 +161,7 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
    char *dir_start;
    char *dir_end;
    grub_size_t size;
@@ -133,29 +134,32 @@ index d3bf02ed8a..3342492ff1 100644
  
    dir_start = grub_strchr (filename, ')');
    if (! dir_start)
-@@ -526,10 +535,12 @@ grub_efi_get_media_file_path (grub_efi_device_path_t *dp)
+@@ -527,12 +537,14 @@ grub_efi_get_media_file_path (grub_efi_device_path_t *dp)
  }
  
  static grub_efi_boolean_t
 -handle_image (void *data, grub_efi_uint32_t datasize)
 +handle_image (struct grub_secureboot_chainloader_context *load_context)
  {
+   grub_efi_boot_services_t *b;
    grub_efi_loaded_image_t *li, li_bak;
    grub_efi_status_t efi_status;
+-  char *buffer = NULL;
 +  void *data = (void *)(unsigned long)load_context->address;
 +  grub_efi_uint32_t datasize = load_context->fsize;
-   void *buffer = NULL;
++  void *buffer = NULL;
    char *buffer_aligned = NULL;
    grub_efi_uint32_t i;
-@@ -540,6 +551,7 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+   struct grub_pe32_section_table *section;
+@@ -542,6 +554,7 @@ handle_image (void *data, grub_efi_uint32_t datasize)
    grub_uint32_t buffer_size;
    int found_entry_point = 0;
    int rc;
 +  grub_efi_status_t (*entry_point) (grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
  
-   rc = read_header (data, datasize, &context);
-   if (rc < 0)
-@@ -797,10 +809,10 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+   b = grub_efi_system_table->boot_services;
+ 
+@@ -801,10 +814,10 @@ handle_image (void *data, grub_efi_uint32_t datasize)
    grub_memcpy (&li_bak, li, sizeof (grub_efi_loaded_image_t));
    li->image_base = buffer_aligned;
    li->image_size = context.image_size;
@@ -170,21 +174,23 @@ index d3bf02ed8a..3342492ff1 100644
    if (!li->file_path)
      {
        grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching file path found");
-@@ -829,19 +841,22 @@ error_exit:
+@@ -832,22 +845,22 @@ error_exit:
  static grub_err_t
  grub_secureboot_chainloader_unload (void)
  {
--  grub_efi_free_pages (address, pages);
+-  grub_efi_boot_services_t *b;
++  grub_efi_free_pages (sb_context->address, sb_context->pages);
++  grub_free (sb_context->file_path);
++  grub_free (sb_context->cmdline);
++  grub_free (sb_context);
+ 
+-  b = grub_efi_system_table->boot_services;
+-  b->free_pages (address, pages);
 -  grub_free (file_path);
 -  grub_free (cmdline);
 -  cmdline = 0;
 -  file_path = 0;
 -  dev_handle = 0;
-+  grub_efi_free_pages (sb_context->address, sb_context->pages);
-+  grub_free (sb_context->file_path);
-+  grub_free (sb_context->cmdline);
-+  grub_free (sb_context);
-+
 +  sb_context = 0;
  
    grub_dl_unref (my_mod);
@@ -200,16 +206,16 @@ index d3bf02ed8a..3342492ff1 100644
  {
    grub_efi_boot_services_t *b;
    grub_efi_status_t status;
-@@ -850,7 +865,7 @@ grub_load_image(void *boot_image)
+@@ -856,7 +869,7 @@ grub_load_image(void *boot_image)
    b = grub_efi_system_table->boot_services;
  
-   status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, file_path,
--		       boot_image, fsize, &image_handle);
-+		       boot_image, image_size, image_handle_out);
+   status = b->load_image (0, grub_efi_image_handle, file_path,
+-                          boot_image, fsize, &image_handle);
++                          boot_image, image_size, image_handle_out);
    if (status != GRUB_EFI_SUCCESS)
      {
        if (status == GRUB_EFI_OUT_OF_RESOURCES)
-@@ -863,7 +878,7 @@ grub_load_image(void *boot_image)
+@@ -869,7 +882,7 @@ grub_load_image(void *boot_image)
    /* LoadImage does not set a device handler when the image is
       loaded from memory, so it is necessary to set it explicitly here.
       This is a mess.  */
@@ -218,7 +224,7 @@ index d3bf02ed8a..3342492ff1 100644
    if (! loaded_image)
      {
        grub_error (GRUB_ERR_BAD_OS, "no loaded image available");
-@@ -885,20 +900,25 @@ grub_secureboot_chainloader_boot (void)
+@@ -891,20 +904,25 @@ grub_secureboot_chainloader_boot (void)
  {
    grub_efi_boot_services_t *b;
    int rc;
@@ -244,15 +250,15 @@ index d3bf02ed8a..3342492ff1 100644
  
    b = grub_efi_system_table->boot_services;
 -  efi_call_1 (b->unload_image, image_handle);
-+  efi_call_1 (b->unload_image, handle);
++  b->unload_image (handle);
  
    grub_loader_unset ();
    return grub_errno;
-@@ -913,9 +933,15 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -919,9 +937,15 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    grub_efi_boot_services_t *b;
    grub_device_t dev = 0;
    grub_device_t orig_dev = 0;
--  grub_efi_device_path_t *dp = 0;
+-  grub_efi_device_path_t *dp = NULL;
 +  grub_efi_device_path_t *dp = 0, *file_path = 0;
    char *filename;
    void *boot_image = 0;
@@ -263,22 +269,9 @@ index d3bf02ed8a..3342492ff1 100644
 +  grub_ssize_t cmdline_len = 0;
 +  grub_efi_handle_t dev_handle = 0;
  
-   if (argc == 0)
-     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-@@ -923,12 +949,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
- 
-   grub_dl_ref (my_mod);
- 
--  /* Initialize some global variables.  */
--  address = 0;
--  image_handle = 0;
--  file_path = 0;
--  dev_handle = 0;
--
-   b = grub_efi_system_table->boot_services;
- 
-   if (argc > 1)
-@@ -1093,17 +1113,35 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+   file_path = NULL;
+   address = 0;
+@@ -1098,18 +1122,36 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  
    if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
      {
@@ -307,24 +300,27 @@ index d3bf02ed8a..3342492ff1 100644
 +		      cmdline_len, &image_handle);
        grub_file_close (file);
        grub_device_close (dev);
+-      grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0);
 +
 +      /* We're finished with the source image buffer and file path now */
-+      efi_call_2 (b->free_pages, address, pages);
++      b->free_pages (address, pages);
 +      grub_free (file_path);
 +
-       grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
++      grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
  
        return 0;
-@@ -1130,6 +1168,12 @@ fail:
+     }
+@@ -1137,8 +1179,11 @@ fail:
    if (cmdline)
      grub_free (cmdline);
  
+-  if (image_handle != NULL)
+-    b->unload_image (image_handle);
 +  if (image_handle != 0)
 +    {
-+      efi_call_1 (b->unload_image, image_handle);
++      b->unload_image (image_handle);
 +      image_handle = 0;
 +    }
-+
+ 
    grub_dl_unref (my_mod);
  
-   return grub_errno;
diff --git a/0235-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch b/0235-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch
deleted file mode 100644
index 199ec32c..00000000
--- a/0235-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Mon, 28 Jun 2021 14:16:58 +1000
-Subject: [PATCH] video/readers/jpeg: Do not reallocate a given huff table
-
-Fix a memory leak where an invalid file could cause us to reallocate
-memory for a huffman table we had already allocated memory for.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit bc06e12b4de55cc6f926af9f064170c82b1403e9)
----
- grub-core/video/readers/jpeg.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
-index 10225abd53..caa211f06d 100644
---- a/grub-core/video/readers/jpeg.c
-+++ b/grub-core/video/readers/jpeg.c
-@@ -245,6 +245,9 @@ grub_jpeg_decode_huff_table (struct grub_jpeg_data *data)
- 	n += count[i];
- 
-       id += ac * 2;
-+      if (data->huff_value[id] != NULL)
-+	return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+			   "jpeg: attempt to reallocate huffman table");
-       data->huff_value[id] = grub_malloc (n);
-       if (grub_errno)
- 	return grub_errno;
diff --git a/0223-loader-efi-chainloader-Use-grub_loader_set_ex.patch b/0236-loader-efi-chainloader-Use-grub_loader_set_ex.patch
similarity index 79%
rename from 0223-loader-efi-chainloader-Use-grub_loader_set_ex.patch
rename to 0236-loader-efi-chainloader-Use-grub_loader_set_ex.patch
index fc15b842..ce98152d 100644
--- a/0223-loader-efi-chainloader-Use-grub_loader_set_ex.patch
+++ b/0236-loader-efi-chainloader-Use-grub_loader_set_ex.patch
@@ -12,14 +12,14 @@ Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
 [rharwood: context sludge from other change]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/loader/efi/chainloader.c | 38 ++++++++++++++++++++++----------------
- 1 file changed, 22 insertions(+), 16 deletions(-)
+ grub-core/loader/efi/chainloader.c | 39 +++++++++++++++++++++-----------------
+ 1 file changed, 22 insertions(+), 17 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 3342492ff1..fb874f1855 100644
+index cbe028cd8af..b40acdeda80 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -48,8 +48,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
+@@ -49,8 +49,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
  
  static grub_dl_t my_mod;
  
@@ -28,7 +28,7 @@ index 3342492ff1..fb874f1855 100644
  struct grub_secureboot_chainloader_context {
    grub_efi_physical_address_t address;
    grub_efi_uintn_t pages;
-@@ -59,7 +57,6 @@ struct grub_secureboot_chainloader_context {
+@@ -60,7 +58,6 @@ struct grub_secureboot_chainloader_context {
    grub_ssize_t cmdline_len;
    grub_efi_handle_t dev_handle;
  };
@@ -36,7 +36,7 @@ index 3342492ff1..fb874f1855 100644
  
  static grub_err_t
  grub_start_image (grub_efi_handle_t handle)
-@@ -98,11 +95,14 @@ grub_start_image (grub_efi_handle_t handle)
+@@ -100,11 +97,14 @@ grub_start_image (grub_efi_handle_t handle)
  }
  
  static grub_err_t
@@ -52,7 +52,7 @@ index 3342492ff1..fb874f1855 100644
    loaded_image = grub_efi_get_loaded_image (image_handle);
    if (loaded_image != NULL)
      grub_free (loaded_image->load_options);
-@@ -115,10 +115,12 @@ grub_chainloader_unload (void)
+@@ -117,10 +117,12 @@ grub_chainloader_unload (void)
  }
  
  static grub_err_t
@@ -66,7 +66,7 @@ index 3342492ff1..fb874f1855 100644
    err = grub_start_image (image_handle);
  
    grub_loader_unset ();
-@@ -839,15 +841,17 @@ error_exit:
+@@ -843,15 +845,17 @@ error_exit:
  }
  
  static grub_err_t
@@ -87,7 +87,7 @@ index 3342492ff1..fb874f1855 100644
    grub_dl_unref (my_mod);
    return GRUB_ERR_NONE;
  }
-@@ -896,12 +900,15 @@ grub_load_image(grub_efi_device_path_t *file_path, void *boot_image,
+@@ -900,12 +904,15 @@ grub_load_image(grub_efi_device_path_t *file_path, void *boot_image,
  }
  
  static grub_err_t
@@ -104,16 +104,16 @@ index 3342492ff1..fb874f1855 100644
    rc = handle_image (sb_context);
    if (rc == 0)
      {
-@@ -942,6 +949,8 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -946,6 +953,8 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    grub_efi_char16_t *cmdline = 0;
    grub_ssize_t cmdline_len = 0;
    grub_efi_handle_t dev_handle = 0;
 +  grub_efi_handle_t image_handle = 0;
 +  struct grub_secureboot_chainloader_context *sb_context = 0;
  
-   if (argc == 0)
-     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-@@ -1127,8 +1136,8 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+   file_path = NULL;
+   address = 0;
+@@ -1136,8 +1145,8 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
        grub_file_close (file);
        grub_device_close (dev);
  
@@ -124,8 +124,8 @@ index 3342492ff1..fb874f1855 100644
        return 0;
      }
    else
-@@ -1142,7 +1151,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
-       efi_call_2 (b->free_pages, address, pages);
+@@ -1151,7 +1160,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+       b->free_pages (address, pages);
        grub_free (file_path);
  
 -      grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
@@ -133,15 +133,16 @@ index 3342492ff1..fb874f1855 100644
  
        return 0;
      }
-@@ -1169,10 +1178,7 @@ fail:
+@@ -1179,11 +1188,7 @@ fail:
+   if (cmdline)
      grub_free (cmdline);
  
-   if (image_handle != 0)
+-  if (image_handle != 0)
 -    {
--      efi_call_1 (b->unload_image, image_handle);
+-      b->unload_image (image_handle);
 -      image_handle = 0;
 -    }
-+    efi_call_1 (b->unload_image, image_handle);
++  b->unload_image (image_handle);
  
    grub_dl_unref (my_mod);
  
diff --git a/0236-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch b/0236-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch
deleted file mode 100644
index 179238be..00000000
--- a/0236-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Mon, 28 Jun 2021 14:25:17 +1000
-Subject: [PATCH] video/readers/jpeg: Refuse to handle multiple start of
- streams
-
-An invalid file could contain multiple start of stream blocks, which
-would cause us to reallocate and leak our bitmap. Refuse to handle
-multiple start of streams.
-
-Additionally, fix a grub_error() call formatting.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit f3a854def3e281b7ad4bbea730cd3046de1da52f)
----
- grub-core/video/readers/jpeg.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
-index caa211f06d..1df1171d78 100644
---- a/grub-core/video/readers/jpeg.c
-+++ b/grub-core/video/readers/jpeg.c
-@@ -677,6 +677,9 @@ grub_jpeg_decode_sos (struct grub_jpeg_data *data)
-   if (data->file->offset != data_offset)
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: extra byte in sos");
- 
-+  if (*data->bitmap)
-+    return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: too many start of scan blocks");
-+
-   if (grub_video_bitmap_create (data->bitmap, data->image_width,
- 				data->image_height,
- 				GRUB_VIDEO_BLIT_FORMAT_RGB_888))
-@@ -699,8 +702,8 @@ grub_jpeg_decode_data (struct grub_jpeg_data *data)
-   nc1 = (data->image_width + hb - 1)  >> (3 + data->log_hs);
- 
-   if (data->bitmap_ptr == NULL)
--    return grub_error(GRUB_ERR_BAD_FILE_TYPE,
--		      "jpeg: attempted to decode data before start of stream");
-+    return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+		       "jpeg: attempted to decode data before start of stream");
- 
-   for (; data->r1 < nr1 && (!data->dri || rst);
-        data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3)
diff --git a/0224-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch b/0237-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch
similarity index 93%
rename from 0224-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch
rename to 0237-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch
index b79c78c5..4d080a0b 100644
--- a/0224-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch
+++ b/0237-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch
@@ -17,10 +17,10 @@ Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 941df6400b..27bc2aa161 100644
+index 1dd787081f2..8f7eddaa962 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
-@@ -465,9 +465,6 @@ fail:
+@@ -466,9 +466,6 @@ fail:
    if (file)
      grub_file_close (file);
  
@@ -30,7 +30,7 @@ index 941df6400b..27bc2aa161 100644
    if (grub_errno != GRUB_ERR_NONE)
      {
        grub_dl_unref (my_mod);
-@@ -483,6 +480,8 @@ fail:
+@@ -484,6 +481,8 @@ fail:
        kernel_free (params, sizeof(*params));
      }
  
diff --git a/0237-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch b/0237-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch
deleted file mode 100644
index 99eeb621..00000000
--- a/0237-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Wed, 7 Jul 2021 15:38:19 +1000
-Subject: [PATCH] video/readers/jpeg: Block int underflow -> wild pointer write
-
-Certain 1 px wide images caused a wild pointer write in
-grub_jpeg_ycrcb_to_rgb(). This was caused because in grub_jpeg_decode_data(),
-we have the following loop:
-
-for (; data->r1 < nr1 && (!data->dri || rst);
-     data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3)
-
-We did not check if vb * width >= hb * nc1.
-
-On a 64-bit platform, if that turns out to be negative, it will underflow,
-be interpreted as unsigned 64-bit, then be added to the 64-bit pointer, so
-we see data->bitmap_ptr jump, e.g.:
-
-0x6180_0000_0480 to
-0x6181_0000_0498
-     ^
-     ~--- carry has occurred and this pointer is now far away from
-          any object.
-
-On a 32-bit platform, it will decrement the pointer, creating a pointer
-that won't crash but will overwrite random data.
-
-Catch the underflow and error out.
-
-Fixes: CVE-2021-3697
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 41aeb2004db9924fecd9f2dd64bc2a5a5594a4b5)
----
- grub-core/video/readers/jpeg.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
-index 1df1171d78..2da04094b3 100644
---- a/grub-core/video/readers/jpeg.c
-+++ b/grub-core/video/readers/jpeg.c
-@@ -705,6 +705,10 @@ grub_jpeg_decode_data (struct grub_jpeg_data *data)
-     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
- 		       "jpeg: attempted to decode data before start of stream");
- 
-+  if (vb * data->image_width <= hb * nc1)
-+    return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-+		       "jpeg: cannot decode image with these dimensions");
-+
-   for (; data->r1 < nr1 && (!data->dri || rst);
-        data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3)
-     for (c1 = 0;  c1 < nc1 && (!data->dri || rst);
diff --git a/0225-loader-i386-efi-linux-Use-grub_loader_set_ex.patch b/0238-loader-i386-efi-linux-Use-grub_loader_set_ex.patch
similarity index 94%
rename from 0225-loader-i386-efi-linux-Use-grub_loader_set_ex.patch
rename to 0238-loader-i386-efi-linux-Use-grub_loader_set_ex.patch
index 1a129dbe..428c4981 100644
--- a/0225-loader-i386-efi-linux-Use-grub_loader_set_ex.patch
+++ b/0238-loader-i386-efi-linux-Use-grub_loader_set_ex.patch
@@ -18,11 +18,11 @@ Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
 [rharwood/pjones: set kernel_size in context]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/loader/i386/efi/linux.c | 146 +++++++++++++++++++++++---------------
- 1 file changed, 87 insertions(+), 59 deletions(-)
+ grub-core/loader/i386/efi/linux.c | 149 ++++++++++++++++++++++----------------
+ 1 file changed, 88 insertions(+), 61 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 27bc2aa161..e3c2d6fe0b 100644
+index 8f7eddaa962..3aaa2e9f175 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -34,13 +34,19 @@
@@ -154,17 +154,19 @@ index 27bc2aa161..e3c2d6fe0b 100644
  
    for (i = 0; i < nfiles; i++)
      {
-@@ -261,8 +277,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+@@ -261,9 +277,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
      grub_file_close (files[i]);
    grub_free (files);
  
 -  if (initrd_mem && grub_errno)
 -    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem,
+-                         BYTES_TO_PAGES(size));
 +  if (context->initrd_mem && grub_errno)
 +    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)context->initrd_mem,
- 			 BYTES_TO_PAGES(size));
++			 BYTES_TO_PAGES(size));
  
    return grub_errno;
+ }
 @@ -277,6 +293,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_ssize_t start, filelen;
    void *kernel = NULL;
@@ -178,7 +180,7 @@ index 27bc2aa161..e3c2d6fe0b 100644
  
    grub_dl_ref (my_mod);
  
-@@ -390,27 +412,27 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -390,28 +412,27 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_dprintf ("linux", "new lh is at %p\n", lh);
  
    grub_dprintf ("linux", "setting up cmdline\n");
@@ -199,6 +201,7 @@ index 27bc2aa161..e3c2d6fe0b 100644
  			      GRUB_VERIFY_KERNEL_CMDLINE);
  
 -  grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
+-
 +  grub_dprintf ("linux", "cmdline:%s\n", cmdline);
    grub_dprintf ("linux", "setting lh->cmd_line_ptr to 0x%08x\n",
 -		LOW_U32(linux_cmdline));
@@ -217,7 +220,7 @@ index 27bc2aa161..e3c2d6fe0b 100644
      }
  #endif
  
-@@ -435,16 +457,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -436,16 +457,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
      }
    max_addresses[1].addr = GRUB_EFI_MAX_ALLOCATION_ADDRESS;
    max_addresses[2].addr = GRUB_EFI_MAX_ALLOCATION_ADDRESS;
@@ -236,7 +239,7 @@ index 27bc2aa161..e3c2d6fe0b 100644
    grub_dprintf ("linux", "setting lh->code32_start to 0x%08x\n",
  		LOW_U32(kernel_mem));
    lh->code32_start = LOW_U32(kernel_mem);
-@@ -461,33 +480,42 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -462,33 +480,42 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  		"setting lh->ext_loader_{type,ver} = {0x%02x,0x%02x}\n",
  		params->ext_loader_type, params->ext_loader_ver);
  
diff --git a/0238-normal-charset-Fix-array-out-of-bounds-formatting-un.patch b/0238-normal-charset-Fix-array-out-of-bounds-formatting-un.patch
deleted file mode 100644
index 6e64ed86..00000000
--- a/0238-normal-charset-Fix-array-out-of-bounds-formatting-un.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 13 Jul 2021 13:24:38 +1000
-Subject: [PATCH] normal/charset: Fix array out-of-bounds formatting unicode
- for display
-
-In some cases attempting to display arbitrary binary strings leads
-to ASAN splats reading the widthspec array out of bounds.
-
-Check the index. If it would be out of bounds, return a width of 1.
-I don't know if that's strictly correct, but we're not really expecting
-great display of arbitrary binary data, and it's certainly not worse than
-an OOB read.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit fdf32abc7a3928852422c0f291d8cd1dd6b34a8d)
----
- grub-core/normal/charset.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
-index 4dfcc31078..7a5a7c153c 100644
---- a/grub-core/normal/charset.c
-+++ b/grub-core/normal/charset.c
-@@ -395,6 +395,8 @@ grub_unicode_estimate_width (const struct grub_unicode_glyph *c)
- {
-   if (grub_unicode_get_comb_type (c->base))
-     return 0;
-+  if (((unsigned long) (c->base >> 3)) >= ARRAY_SIZE (widthspec))
-+    return 1;
-   if (widthspec[c->base >> 3] & (1 << (c->base & 7)))
-     return 2;
-   else
diff --git a/0226-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch b/0239-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch
similarity index 98%
rename from 0226-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch
rename to 0239-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch
index 51953fd3..e3b44f12 100644
--- a/0226-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch
+++ b/0239-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch
@@ -14,7 +14,7 @@ Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
  1 file changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index e3c2d6fe0b..9e5c11ac69 100644
+index 3aaa2e9f175..71c7ed6a76e 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -209,6 +209,7 @@ grub_cmd_initrd (grub_command_t cmd, int argc, char *argv[])
diff --git a/0239-net-netbuff-Block-overly-large-netbuff-allocs.patch b/0239-net-netbuff-Block-overly-large-netbuff-allocs.patch
deleted file mode 100644
index 2e10d49e..00000000
--- a/0239-net-netbuff-Block-overly-large-netbuff-allocs.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 8 Mar 2022 23:47:46 +1100
-Subject: [PATCH] net/netbuff: Block overly large netbuff allocs
-
-A netbuff shouldn't be too huge. It's bounded by MTU and TCP segment
-reassembly.
-
-This helps avoid some bugs (and provides a spot to instrument to catch
-them at their source).
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit ee9591103004cd13b4efadda671536090ca7fd57)
----
- grub-core/net/netbuff.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/grub-core/net/netbuff.c b/grub-core/net/netbuff.c
-index dbeeefe478..d5e9e9a0d7 100644
---- a/grub-core/net/netbuff.c
-+++ b/grub-core/net/netbuff.c
-@@ -79,10 +79,23 @@ grub_netbuff_alloc (grub_size_t len)
- 
-   COMPILE_TIME_ASSERT (NETBUFF_ALIGN % sizeof (grub_properly_aligned_t) == 0);
- 
-+  /*
-+   * The largest size of a TCP packet is 64 KiB, and everything else
-+   * should be a lot smaller - most MTUs are 1500 or less. Cap data
-+   * size at 64 KiB + a buffer.
-+   */
-+  if (len > 0xffffUL + 0x1000UL)
-+    {
-+      grub_error (GRUB_ERR_BUG,
-+                  "attempted to allocate a packet that is too big");
-+      return NULL;
-+    }
-+
-   if (len < NETBUFFMINLEN)
-     len = NETBUFFMINLEN;
- 
-   len = ALIGN_UP (len, NETBUFF_ALIGN);
-+
- #ifdef GRUB_MACHINE_EMU
-   data = grub_malloc (len + sizeof (*nb));
- #else
diff --git a/0261-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch b/0240-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch
similarity index 98%
rename from 0261-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch
rename to 0240-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch
index c6688cd1..ed359158 100644
--- a/0261-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch
+++ b/0240-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch
@@ -19,7 +19,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 13 insertions(+), 6 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 9e5c11ac69..92b2fb5091 100644
+index 71c7ed6a76e..3ec9bb09c52 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -86,7 +86,9 @@ kernel_free(void *addr, grub_efi_uintn_t size)
diff --git a/0240-net-ip-Do-IP-fragment-maths-safely.patch b/0240-net-ip-Do-IP-fragment-maths-safely.patch
deleted file mode 100644
index 118448d1..00000000
--- a/0240-net-ip-Do-IP-fragment-maths-safely.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Mon, 20 Dec 2021 19:41:21 +1100
-Subject: [PATCH] net/ip: Do IP fragment maths safely
-
-This avoids an underflow and subsequent unpleasantness.
-
-Fixes: CVE-2022-28733
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit eb74e5743ca7e18a5e75c392fe0b21d1549a1936)
----
- grub-core/net/ip.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index ce6bdc75c6..cf74f1f794 100644
---- a/grub-core/net/ip.c
-+++ b/grub-core/net/ip.c
-@@ -25,6 +25,7 @@
- #include <grub/net/netbuff.h>
- #include <grub/mm.h>
- #include <grub/priority_queue.h>
-+#include <grub/safemath.h>
- #include <grub/time.h>
- 
- struct iphdr {
-@@ -551,7 +552,14 @@ grub_net_recv_ip4_packets (struct grub_net_buff *nb,
-     {
-       rsm->total_len = (8 * (grub_be_to_cpu16 (iph->frags) & OFFSET_MASK)
- 			+ (nb->tail - nb->data));
--      rsm->total_len -= ((iph->verhdrlen & 0xf) * sizeof (grub_uint32_t));
-+
-+      if (grub_sub (rsm->total_len, (iph->verhdrlen & 0xf) * sizeof (grub_uint32_t),
-+		    &rsm->total_len))
-+	{
-+	  grub_dprintf ("net", "IP reassembly size underflow\n");
-+	  return GRUB_ERR_NONE;
-+	}
-+
-       rsm->asm_netbuff = grub_netbuff_alloc (rsm->total_len);
-       if (!rsm->asm_netbuff)
- 	{
diff --git a/0272-efi-use-enumerated-array-positions-for-our-allocatio.patch b/0241-efi-use-enumerated-array-positions-for-our-allocatio.patch
similarity index 95%
rename from 0272-efi-use-enumerated-array-positions-for-our-allocatio.patch
rename to 0241-efi-use-enumerated-array-positions-for-our-allocatio.patch
index 206e3a63..24f9131d 100644
--- a/0272-efi-use-enumerated-array-positions-for-our-allocatio.patch
+++ b/0241-efi-use-enumerated-array-positions-for-our-allocatio.patch
@@ -18,7 +18,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 20 insertions(+), 11 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 91ae274299..8daa070132 100644
+index 3ec9bb09c52..ef5875b7697 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -60,17 +60,26 @@ struct allocation_choice {
@@ -54,7 +54,7 @@ index 91ae274299..8daa070132 100644
    };
  static struct allocation_choice saved_addresses[4];
  
-@@ -405,7 +414,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -388,7 +397,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    if (lh->xloadflags & LINUX_XLF_CAN_BE_LOADED_ABOVE_4G)
      {
        grub_dprintf ("linux", "Loading kernel above 4GB is supported; enabling.\n");
@@ -63,7 +63,7 @@ index 91ae274299..8daa070132 100644
      }
    else
      {
-@@ -478,11 +487,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -461,11 +470,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_dprintf ("linux", "lh->pref_address: %p\n", (void *)(grub_addr_t)lh->pref_address);
    if (lh->pref_address < (grub_uint64_t)GRUB_EFI_MAX_ALLOCATION_ADDRESS)
      {
diff --git a/0241-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch b/0241-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch
deleted file mode 100644
index 19701b6a..00000000
--- a/0241-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Thu, 16 Sep 2021 01:29:54 +1000
-Subject: [PATCH] net/dns: Fix double-free addresses on corrupt DNS response
-
-grub_net_dns_lookup() takes as inputs a pointer to an array of addresses
-("addresses") for the given name, and pointer to a number of addresses
-("naddresses"). grub_net_dns_lookup() is responsible for allocating
-"addresses", and the caller is responsible for freeing it if
-"naddresses" > 0.
-
-The DNS recv_hook will sometimes set and free the addresses array,
-for example if the packet is too short:
-
-      if (ptr + 10 >= nb->tail)
-	{
-	  if (!*data->naddresses)
-	    grub_free (*data->addresses);
-	  grub_netbuff_free (nb);
-	  return GRUB_ERR_NONE;
-	}
-
-Later on the nslookup command code unconditionally frees the "addresses"
-array. Normally this is fine: the array is either populated with valid
-data or is NULL. But in these sorts of error cases it is neither NULL
-nor valid and we get a double-free.
-
-Only free "addresses" if "naddresses" > 0.
-
-It looks like the other use of grub_net_dns_lookup() is not affected.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit eb2e69fcf51307757e43f55ee8c9354d1ee42dd1)
----
- grub-core/net/dns.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
-index 906ec7d678..135faac035 100644
---- a/grub-core/net/dns.c
-+++ b/grub-core/net/dns.c
-@@ -667,9 +667,11 @@ grub_cmd_nslookup (struct grub_command *cmd __attribute__ ((unused)),
-       grub_net_addr_to_str (&addresses[i], buf);
-       grub_printf ("%s\n", buf);
-     }
--  grub_free (addresses);
-   if (naddresses)
--    return GRUB_ERR_NONE;
-+    {
-+      grub_free (addresses);
-+      return GRUB_ERR_NONE;
-+    }
-   return grub_error (GRUB_ERR_NET_NO_DOMAIN, N_("no DNS record found"));
- }
- 
diff --git a/0273-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch b/0242-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
similarity index 94%
rename from 0273-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
rename to 0242-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
index d25cf306..20f3c660 100644
--- a/0273-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
+++ b/0242-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
@@ -18,7 +18,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 27 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 8daa070132..e6b8998e5e 100644
+index ef5875b7697..1d7ced3d1f8 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -55,7 +55,14 @@ struct grub_linuxefi_context {
@@ -85,7 +85,7 @@ index 8daa070132..e6b8998e5e 100644
        /*
         * When we're *not* loading the kernel, or >4GB allocations aren't
         * supported, these entries are basically all the same, so don't re-try
-@@ -261,7 +276,8 @@ grub_cmd_initrd (grub_command_t cmd, int argc, char *argv[])
+@@ -253,7 +268,8 @@ grub_cmd_initrd (grub_command_t cmd, int argc, char *argv[])
  	}
      }
  
@@ -95,7 +95,7 @@ index 8daa070132..e6b8998e5e 100644
  			    N_("can't allocate initrd"));
    if (initrd_mem == NULL)
      goto fail;
-@@ -422,7 +438,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -405,7 +421,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
      }
  #endif
  
@@ -105,7 +105,7 @@ index 8daa070132..e6b8998e5e 100644
  			 "cannot allocate kernel parameters");
    if (!params)
      goto fail;
-@@ -445,7 +462,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -428,7 +445,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_dprintf ("linux", "new lh is at %p\n", lh);
  
    grub_dprintf ("linux", "setting up cmdline\n");
@@ -114,7 +114,7 @@ index 8daa070132..e6b8998e5e 100644
  			  GRUB_EFI_RUNTIME_SERVICES_DATA,
  			  N_("can't allocate cmdline"));
    if (!cmdline)
-@@ -493,7 +510,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -476,7 +493,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    max_addresses[KERNEL_4G_LIMIT].addr = GRUB_EFI_MAX_ALLOCATION_ADDRESS;
    max_addresses[KERNEL_NO_LIMIT].addr = GRUB_EFI_MAX_ALLOCATION_ADDRESS;
    kernel_size = lh->init_size;
diff --git a/0242-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch b/0242-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch
deleted file mode 100644
index ab0d4712..00000000
--- a/0242-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Mon, 20 Dec 2021 21:55:43 +1100
-Subject: [PATCH] net/dns: Don't read past the end of the string we're checking
- against
-
-I don't really understand what's going on here but fuzzing found
-a bug where we read past the end of check_with. That's a C string,
-so use grub_strlen() to make sure we don't overread it.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 6a97b3f4b1d5173aa516edc6dedbc63de7306d21)
----
- grub-core/net/dns.c | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
-index 135faac035..17961a9f18 100644
---- a/grub-core/net/dns.c
-+++ b/grub-core/net/dns.c
-@@ -146,11 +146,18 @@ check_name_real (const grub_uint8_t *name_at, const grub_uint8_t *head,
- 		 int *length, char *set)
- {
-   const char *readable_ptr = check_with;
-+  int readable_len;
-   const grub_uint8_t *ptr;
-   char *optr = set;
-   int bytes_processed = 0;
-   if (length)
-     *length = 0;
-+
-+  if (readable_ptr != NULL)
-+    readable_len = grub_strlen (readable_ptr);
-+  else
-+    readable_len = 0;
-+
-   for (ptr = name_at; ptr < tail && bytes_processed < tail - head + 2; )
-     {
-       /* End marker.  */
-@@ -172,13 +179,16 @@ check_name_real (const grub_uint8_t *name_at, const grub_uint8_t *head,
- 	  ptr = head + (((ptr[0] & 0x3f) << 8) | ptr[1]);
- 	  continue;
- 	}
--      if (readable_ptr && grub_memcmp (ptr + 1, readable_ptr, *ptr) != 0)
-+      if (readable_ptr != NULL && (*ptr > readable_len || grub_memcmp (ptr + 1, readable_ptr, *ptr) != 0))
- 	return 0;
-       if (grub_memchr (ptr + 1, 0, *ptr) 
- 	  || grub_memchr (ptr + 1, '.', *ptr))
- 	return 0;
-       if (readable_ptr)
--	readable_ptr += *ptr;
-+	{
-+	  readable_ptr += *ptr;
-+	  readable_len -= *ptr;
-+	}
-       if (readable_ptr && *readable_ptr != '.' && *readable_ptr != 0)
- 	return 0;
-       bytes_processed += *ptr + 1;
-@@ -192,7 +202,10 @@ check_name_real (const grub_uint8_t *name_at, const grub_uint8_t *head,
-       if (optr)
- 	*optr++ = '.';
-       if (readable_ptr && *readable_ptr)
--	readable_ptr++;
-+	{
-+	  readable_ptr++;
-+	  readable_len--;
-+	}
-       ptr += *ptr + 1;
-     }
-   return 0;
diff --git a/0274-efi-allocate-the-initrd-within-the-bounds-expressed-.patch b/0243-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
similarity index 90%
rename from 0274-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
rename to 0243-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
index 47e31e2f..922088b3 100644
--- a/0274-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
+++ b/0243-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
@@ -20,10 +20,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index e6b8998e5e..d003b474ee 100644
+index 1d7ced3d1f8..a798da334ab 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
-@@ -190,6 +190,8 @@ grub_linuxefi_unload (void *data)
+@@ -182,6 +182,8 @@ grub_linuxefi_unload (void *data)
    cmd_initrdefi->data = 0;
    grub_free (context);
  
@@ -32,7 +32,7 @@ index e6b8998e5e..d003b474ee 100644
    return GRUB_ERR_NONE;
  }
  
-@@ -426,11 +428,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -409,11 +411,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
      }
  #endif
  
@@ -46,7 +46,7 @@ index e6b8998e5e..d003b474ee 100644
      }
    else
      {
-@@ -560,6 +564,8 @@ fail:
+@@ -542,6 +546,8 @@ fail:
  
    grub_dl_unref (my_mod);
  
diff --git a/0243-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch b/0243-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch
deleted file mode 100644
index 3ff7b6bb..00000000
--- a/0243-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Mon, 20 Sep 2021 01:12:24 +1000
-Subject: [PATCH] net/tftp: Prevent a UAF and double-free from a failed seek
-
-A malicious tftp server can cause UAFs and a double free.
-
-An attempt to read from a network file is handled by grub_net_fs_read(). If
-the read is at an offset other than the current offset, grub_net_seek_real()
-is invoked.
-
-In grub_net_seek_real(), if a backwards seek cannot be satisfied from the
-currently received packets, and the underlying transport does not provide
-a seek method, then grub_net_seek_real() will close and reopen the network
-protocol layer.
-
-For tftp, the ->close() call goes to tftp_close() and frees the tftp_data_t
-file->data. The file->data pointer is not nulled out after the free.
-
-If the ->open() call fails, the file->data will not be reallocated and will
-continue point to a freed memory block. This could happen from a server
-refusing to send the requisite ack to the new tftp request, for example.
-
-The seek and the read will then fail, but the grub_file continues to exist:
-the failed seek does not necessarily cause the entire file to be thrown
-away (e.g. where the file is checked to see if it is gzipped/lzio/xz/etc.,
-a read failure is interpreted as a decompressor passing on the file, not as
-an invalidation of the entire grub_file_t structure).
-
-This means subsequent attempts to read or seek the file will use the old
-file->data after free. Eventually, the file will be close()d again and
-file->data will be freed again.
-
-Mark a net_fs file that doesn't reopen as broken. Do not permit read() or
-close() on a broken file (seek is not exposed directly to the file API -
-it is only called as part of read, so this blocks seeks as well).
-
-As an additional defence, null out the ->data pointer if tftp_open() fails.
-That would have lead to a simple null pointer dereference rather than
-a mess of UAFs.
-
-This may affect other protocols, I haven't checked.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit dada1dda695439bb55b2848dddc2d89843552f81)
----
- grub-core/net/net.c  | 11 +++++++++--
- grub-core/net/tftp.c |  1 +
- include/grub/net.h   |  1 +
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 55aed92722..1001c611d1 100644
---- a/grub-core/net/net.c
-+++ b/grub-core/net/net.c
-@@ -1625,7 +1625,8 @@ grub_net_fs_close (grub_file_t file)
-       grub_netbuff_free (file->device->net->packs.first->nb);
-       grub_net_remove_packet (file->device->net->packs.first);
-     }
--  file->device->net->protocol->close (file);
-+  if (!file->device->net->broken)
-+    file->device->net->protocol->close (file);
-   grub_free (file->device->net->name);
-   return GRUB_ERR_NONE;
- }
-@@ -1847,7 +1848,10 @@ grub_net_seek_real (struct grub_file *file, grub_off_t offset)
-     file->device->net->stall = 0;
-     err = file->device->net->protocol->open (file, file->device->net->name);
-     if (err)
--      return err;
-+      {
-+	file->device->net->broken = 1;
-+	return err;
-+      }
-     grub_net_fs_read_real (file, NULL, offset);
-     return grub_errno;
-   }
-@@ -1856,6 +1860,9 @@ grub_net_seek_real (struct grub_file *file, grub_off_t offset)
- static grub_ssize_t
- grub_net_fs_read (grub_file_t file, char *buf, grub_size_t len)
- {
-+  if (file->device->net->broken)
-+    return -1;
-+
-   if (file->offset != file->device->net->offset)
-     {
-       grub_err_t err;
-diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index d54b13f09f..788ad1dc44 100644
---- a/grub-core/net/tftp.c
-+++ b/grub-core/net/tftp.c
-@@ -408,6 +408,7 @@ tftp_open (struct grub_file *file, const char *filename)
-     {
-       grub_net_udp_close (data->sock);
-       grub_free (data);
-+      file->data = NULL;
-       return grub_errno;
-     }
- 
-diff --git a/include/grub/net.h b/include/grub/net.h
-index 42af7de250..9e4898cc6b 100644
---- a/include/grub/net.h
-+++ b/include/grub/net.h
-@@ -280,6 +280,7 @@ typedef struct grub_net
-   grub_fs_t fs;
-   int eof;
-   int stall;
-+  int broken;
- } *grub_net_t;
- 
- extern grub_net_t (*EXPORT_VAR (grub_net_open)) (const char *name);
diff --git a/0275-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch b/0244-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
similarity index 87%
rename from 0275-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
rename to 0244-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
index 8451dbfc..914ad43f 100644
--- a/0275-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
+++ b/0244-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
@@ -20,10 +20,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index d003b474ee..ac5ef50bdb 100644
+index a798da334ab..03d27c81fd3 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
-@@ -279,7 +279,7 @@ grub_cmd_initrd (grub_command_t cmd, int argc, char *argv[])
+@@ -271,7 +271,7 @@ grub_cmd_initrd (grub_command_t cmd, int argc, char *argv[])
      }
  
    grub_dprintf ("linux", "Trying to allocate initrd mem\n");
@@ -32,7 +32,7 @@ index d003b474ee..ac5ef50bdb 100644
  			    N_("can't allocate initrd"));
    if (initrd_mem == NULL)
      goto fail;
-@@ -443,7 +443,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -426,7 +426,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  #endif
  
    params = kernel_alloc (KERNEL_MEM, sizeof(*params),
@@ -41,7 +41,7 @@ index d003b474ee..ac5ef50bdb 100644
  			 "cannot allocate kernel parameters");
    if (!params)
      goto fail;
-@@ -467,7 +467,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -450,7 +450,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    grub_dprintf ("linux", "setting up cmdline\n");
    cmdline = kernel_alloc (KERNEL_MEM, lh->cmdline_size + 1,
@@ -50,7 +50,7 @@ index d003b474ee..ac5ef50bdb 100644
  			  N_("can't allocate cmdline"));
    if (!cmdline)
      goto fail;
-@@ -516,7 +516,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -499,7 +499,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    kernel_size = lh->init_size;
    grub_dprintf ("linux", "Trying to allocate kernel mem\n");
    kernel_mem = kernel_alloc (KERNEL_MEM, kernel_size,
diff --git a/0244-net-tftp-Avoid-a-trivial-UAF.patch b/0244-net-tftp-Avoid-a-trivial-UAF.patch
deleted file mode 100644
index 4ec3b562..00000000
--- a/0244-net-tftp-Avoid-a-trivial-UAF.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 18 Jan 2022 14:29:20 +1100
-Subject: [PATCH] net/tftp: Avoid a trivial UAF
-
-Under tftp errors, we print a tftp error message from the tftp header.
-However, the tftph pointer is a pointer inside nb, the netbuff. Previously,
-we were freeing the nb and then dereferencing it. Don't do that, use it
-and then free it later.
-
-This isn't really _bad_ per se, especially as we're single-threaded, but
-it trips up fuzzers.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 956f4329cec23e4375182030ca9b2be631a61ba5)
----
- grub-core/net/tftp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 788ad1dc44..a95766dcbd 100644
---- a/grub-core/net/tftp.c
-+++ b/grub-core/net/tftp.c
-@@ -251,9 +251,9 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
-       return GRUB_ERR_NONE;
-     case TFTP_ERROR:
-       data->have_oack = 1;
--      grub_netbuff_free (nb);
-       grub_error (GRUB_ERR_IO, "%s", tftph->u.err.errmsg);
-       grub_error_save (&data->save_err);
-+      grub_netbuff_free (nb);
-       return GRUB_ERR_NONE;
-     default:
-       grub_netbuff_free (nb);
diff --git a/0245-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch b/0245-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch
deleted file mode 100644
index 186f0c3d..00000000
--- a/0245-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 1 Mar 2022 23:14:15 +1100
-Subject: [PATCH] net/http: Do not tear down socket if it's already been torn
- down
-
-It's possible for data->sock to get torn down in tcp error handling.
-If we unconditionally tear it down again we will end up doing writes
-to an offset of the NULL pointer when we go to tear it down again.
-
-Detect if it has been torn down and don't do it again.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit ec233d3ecf995293304de443579aab5c46c49e85)
----
- grub-core/net/http.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index 7f878b5615..19cb8768e3 100644
---- a/grub-core/net/http.c
-+++ b/grub-core/net/http.c
-@@ -427,7 +427,7 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
-       return err;
-     }
- 
--  for (i = 0; !data->headers_recv && i < 100; i++)
-+  for (i = 0; data->sock && !data->headers_recv && i < 100; i++)
-     {
-       grub_net_tcp_retransmit ();
-       grub_net_poll_cards (300, &data->headers_recv);
-@@ -435,7 +435,8 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
- 
-   if (!data->headers_recv)
-     {
--      grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
-+      if (data->sock)
-+        grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
-       if (data->err)
- 	{
- 	  char *str = data->errmsg;
diff --git a/0245-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch b/0245-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch
new file mode 100644
index 00000000..e19f1543
--- /dev/null
+++ b/0245-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 11 Oct 2022 17:00:50 -0400
+Subject: [PATCH] x86-efi: Fix an incorrect array size in kernel allocation
+
+In 81a6ebf62bbe166ddc968463df2e8bd481bf697c ("efi: split allocation
+policy for kernel vs initrd memories."), I introduced a split in the
+kernel allocator to allow for different dynamic policies for the kernel
+and the initrd allocations.
+
+Unfortunately, that change increased the size of the policy data used to
+make decisions, but did not change the size of the temporary storage we
+use to back it up and restore.  This results in some of .data getting
+clobbered at runtime, and hilarity ensues.
+
+This patch makes the size of the backup storage be based on the size of
+the initial policy data.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/loader/i386/efi/linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
+index 03d27c81fd3..f97b123a51e 100644
+--- a/grub-core/loader/i386/efi/linux.c
++++ b/grub-core/loader/i386/efi/linux.c
+@@ -92,7 +92,7 @@ static struct allocation_choice max_addresses[] =
+       { INITRD_MEM, GRUB_EFI_MAX_ALLOCATION_ADDRESS, GRUB_EFI_ALLOCATE_MAX_ADDRESS },
+     { NO_MEM, 0, 0 }
+   };
+-static struct allocation_choice saved_addresses[4];
++static struct allocation_choice saved_addresses[sizeof(max_addresses) / sizeof(max_addresses[0])];
+ 
+ #define save_addresses() grub_memcpy(saved_addresses, max_addresses, sizeof(max_addresses))
+ #define restore_addresses() grub_memcpy(max_addresses, saved_addresses, sizeof(max_addresses))
diff --git a/0246-grub-install-on-EFI-if-forced.patch b/0246-grub-install-on-EFI-if-forced.patch
new file mode 100644
index 00000000..e569cf16
--- /dev/null
+++ b/0246-grub-install-on-EFI-if-forced.patch
@@ -0,0 +1,80 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Marta Lewandowska <mlewando@redhat.com>
+Date: Tue, 6 Feb 2024 17:42:47 -0600
+Subject: [PATCH] grub-install on EFI if forced
+
+UEFI Secure Boot requires signed grub binaries to work, so grub-
+install should not be used. However, users who have Secure Boot
+disabled and wish to use the command should not be prevented from
+doing so if they invoke --force.
+
+fixes bz#1917213 / bz#2240994
+
+Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
+---
+ util/grub-install.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/util/grub-install.c b/util/grub-install.c
+index 828e8722ba5..314b6143b8e 100644
+--- a/util/grub-install.c
++++ b/util/grub-install.c
+@@ -915,25 +915,6 @@ main (int argc, char *argv[])
+ 
+   platform = grub_install_get_target (grub_install_source_directory);
+ 
+-  switch (platform)
+-    {
+-    case GRUB_INSTALL_PLATFORM_ARM_EFI:
+-    case GRUB_INSTALL_PLATFORM_ARM64_EFI:
+-    case GRUB_INSTALL_PLATFORM_I386_EFI:
+-    case GRUB_INSTALL_PLATFORM_IA64_EFI:
+-    case GRUB_INSTALL_PLATFORM_LOONGARCH64_EFI:
+-    case GRUB_INSTALL_PLATFORM_RISCV32_EFI:
+-    case GRUB_INSTALL_PLATFORM_RISCV64_EFI:
+-    case GRUB_INSTALL_PLATFORM_X86_64_EFI:
+-      is_efi = 1;
+-      grub_util_error (_("this utility cannot be used for EFI platforms"
+-                         " because it does not support UEFI Secure Boot"));
+-      break;
+-    default:
+-      is_efi = 0;
+-      break;
+-    }
+-
+   {
+     char *platname = grub_install_get_platform_name (platform);
+     fprintf (stderr, _("Installing for %s platform.\n"), platname);
+@@ -1050,6 +1031,22 @@ main (int argc, char *argv[])
+ 
+   switch (platform)
+     {
++    case GRUB_INSTALL_PLATFORM_ARM_EFI:
++    case GRUB_INSTALL_PLATFORM_ARM64_EFI:
++    case GRUB_INSTALL_PLATFORM_I386_EFI:
++    case GRUB_INSTALL_PLATFORM_IA64_EFI:
++    case GRUB_INSTALL_PLATFORM_LOONGARCH64_EFI:
++    case GRUB_INSTALL_PLATFORM_RISCV32_EFI:
++    case GRUB_INSTALL_PLATFORM_RISCV64_EFI:
++    case GRUB_INSTALL_PLATFORM_X86_64_EFI:
++      is_efi = 1;
++      if (!force)
++        grub_util_error (_("This utility should not be used for EFI platforms"
++                          " because it does not support UEFI Secure Boot."
++                          " If you really wish to proceed, invoke the --force"
++                          " option.\nMake sure Secure Boot is disabled before"
++                          " proceeding"));
++      break;
+     case GRUB_INSTALL_PLATFORM_I386_IEEE1275:
+     case GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275:
+ #ifdef __linux__
+@@ -1058,6 +1055,9 @@ main (int argc, char *argv[])
+         try_open ("/dev/nvram");
+ #endif
+       break;
++      /* pacify warning.  */
++    case GRUB_INSTALL_PLATFORM_MAX:
++      break;
+     default:
+       break;
+     }
diff --git a/0246-net-http-Fix-OOB-write-for-split-http-headers.patch b/0246-net-http-Fix-OOB-write-for-split-http-headers.patch
deleted file mode 100644
index f22960b1..00000000
--- a/0246-net-http-Fix-OOB-write-for-split-http-headers.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 8 Mar 2022 18:17:03 +1100
-Subject: [PATCH] net/http: Fix OOB write for split http headers
-
-GRUB has special code for handling an http header that is split
-across two packets.
-
-The code tracks the end of line by looking for a "\n" byte. The
-code for split headers has always advanced the pointer just past the
-end of the line, whereas the code that handles unsplit headers does
-not advance the pointer. This extra advance causes the length to be
-one greater, which breaks an assumption in parse_line(), leading to
-it writing a NUL byte one byte past the end of the buffer where we
-reconstruct the line from the two packets.
-
-It's conceivable that an attacker controlled set of packets could
-cause this to zero out the first byte of the "next" pointer of the
-grub_mm_region structure following the current_line buffer.
-
-Do not advance the pointer in the split header case.
-
-Fixes: CVE-2022-28734
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit e9fb459638811c12b0989dbf64e3e124974ef617)
----
- grub-core/net/http.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index 19cb8768e3..58546739a2 100644
---- a/grub-core/net/http.c
-+++ b/grub-core/net/http.c
-@@ -193,9 +193,7 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)),
- 	  int have_line = 1;
- 	  char *t;
- 	  ptr = grub_memchr (nb->data, '\n', nb->tail - nb->data);
--	  if (ptr)
--	    ptr++;
--	  else
-+	  if (ptr == NULL)
- 	    {
- 	      have_line = 0;
- 	      ptr = (char *) nb->tail;
diff --git a/0247-Remove-Install-section-from-aux-systemd-units.patch b/0247-Remove-Install-section-from-aux-systemd-units.patch
new file mode 100644
index 00000000..500b9f59
--- /dev/null
+++ b/0247-Remove-Install-section-from-aux-systemd-units.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christian Glombek <cglombek@redhat.com>
+Date: Tue, 14 Nov 2023 07:54:59 +0100
+Subject: [PATCH] Remove [Install] section from aux systemd units
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=2247635#c7
+---
+ docs/grub-boot-indeterminate.service             | 3 ---
+ util/systemd/grub-systemd-integration.service.in | 3 ---
+ 2 files changed, 6 deletions(-)
+
+diff --git a/docs/grub-boot-indeterminate.service b/docs/grub-boot-indeterminate.service
+index 5bcb474a3d3..6c8dcb186b6 100644
+--- a/docs/grub-boot-indeterminate.service
++++ b/docs/grub-boot-indeterminate.service
+@@ -9,6 +9,3 @@ Before=system-update-pre.target
+ [Service]
+ Type=oneshot
+ ExecStart=/usr/bin/grub2-editenv - incr boot_indeterminate
+-
+-[Install]
+-WantedBy=system-update.target
+diff --git a/util/systemd/grub-systemd-integration.service.in b/util/systemd/grub-systemd-integration.service.in
+index 22ca1ca4885..c81fb594ce1 100644
+--- a/util/systemd/grub-systemd-integration.service.in
++++ b/util/systemd/grub-systemd-integration.service.in
+@@ -6,6 +6,3 @@ ConditionPathExists=/run/systemd/reboot-to-boot-loader-menu
+ 
+ [Service]
+ ExecStart=@libexecdir@/@grubdirname@/systemd-integration.sh
+-
+-[Install]
+-WantedBy=reboot.target
diff --git a/0247-net-http-Error-out-on-headers-with-LF-without-CR.patch b/0247-net-http-Error-out-on-headers-with-LF-without-CR.patch
deleted file mode 100644
index b73c1691..00000000
--- a/0247-net-http-Error-out-on-headers-with-LF-without-CR.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Tue, 8 Mar 2022 19:04:40 +1100
-Subject: [PATCH] net/http: Error out on headers with LF without CR
-
-In a similar vein to the previous patch, parse_line() would write
-a NUL byte past the end of the buffer if there was an HTTP header
-with a LF rather than a CRLF.
-
-RFC-2616 says:
-
-  Many HTTP/1.1 header field values consist of words separated by LWS
-  or special characters. These special characters MUST be in a quoted
-  string to be used within a parameter value (as defined in section 3.6).
-
-We don't support quoted sections or continuation lines, etc.
-
-If we see an LF that's not part of a CRLF, bail out.
-
-Fixes: CVE-2022-28734
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit d232ad41ac4979a9de4d746e5fdff9caf0e303de)
----
- grub-core/net/http.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index 58546739a2..57d2721719 100644
---- a/grub-core/net/http.c
-+++ b/grub-core/net/http.c
-@@ -69,7 +69,15 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len)
-   char *end = ptr + len;
-   while (end > ptr && *(end - 1) == '\r')
-     end--;
-+
-+  /* LF without CR. */
-+  if (end == ptr + len)
-+    {
-+      data->errmsg = grub_strdup (_("invalid HTTP header - LF without CR"));
-+      return GRUB_ERR_NONE;
-+    }
-   *end = 0;
-+
-   /* Trailing CRLF.  */
-   if (data->in_chunk_len == 1)
-     {
diff --git a/0248-chainloader-remove-device-path-debug-message.patch b/0248-chainloader-remove-device-path-debug-message.patch
new file mode 100644
index 00000000..306aad38
--- /dev/null
+++ b/0248-chainloader-remove-device-path-debug-message.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: raravind <raravind@redhat.com>
+Date: Tue, 9 May 2023 11:29:35 +0200
+Subject: [PATCH] chainloader: remove device path debug message
+
+Remove the debug message "/EndEntire" while using GRUB chainloader command.
+
+Signed-off-by: raravind  <raravind@redhat.com>
+(cherry picked from commit f75f5386b7a6a7cb2e10d30f817a3564c0a28dd7)
+---
+ grub-core/loader/efi/chainloader.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index b40acdeda80..badff5e50b5 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -212,7 +212,6 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
+   /* Fill the file path for the directory.  */
+   d = (grub_efi_device_path_t *) ((char *) file_path
+ 				  + ((char *) d - (char *) dp));
+-  grub_efi_print_device_path (d);
+   if (copy_file_path ((grub_efi_file_path_device_path_t *) d,
+ 		      dir_start, dir_end - dir_start) != GRUB_ERR_NONE)
+     {
diff --git a/0248-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch b/0248-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch
deleted file mode 100644
index 79df1c24..00000000
--- a/0248-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
-Date: Wed, 6 Apr 2022 18:03:37 +0530
-Subject: [PATCH] fs/f2fs: Do not read past the end of nat journal entries
-
-A corrupt f2fs file system could specify a nat journal entry count
-that is beyond the maximum NAT_JOURNAL_ENTRIES.
-
-Check if the specified nat journal entry count before accessing the
-array, and throw an error if it is too large.
-
-Signed-off-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit a3988cb3f0a108dd67ac127a79a4c8479d23334e)
----
- grub-core/fs/f2fs.c | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c
-index 8a9992ca9e..63702214b0 100644
---- a/grub-core/fs/f2fs.c
-+++ b/grub-core/fs/f2fs.c
-@@ -632,23 +632,27 @@ get_nat_journal (struct grub_f2fs_data *data)
-   return err;
- }
- 
--static grub_uint32_t
--get_blkaddr_from_nat_journal (struct grub_f2fs_data *data, grub_uint32_t nid)
-+static grub_err_t
-+get_blkaddr_from_nat_journal (struct grub_f2fs_data *data, grub_uint32_t nid,
-+                              grub_uint32_t *blkaddr)
- {
-   grub_uint16_t n = grub_le_to_cpu16 (data->nat_j.n_nats);
--  grub_uint32_t blkaddr = 0;
-   grub_uint16_t i;
- 
-+  if (n >= NAT_JOURNAL_ENTRIES)
-+    return grub_error (GRUB_ERR_BAD_FS,
-+                       "invalid number of nat journal entries");
-+
-   for (i = 0; i < n; i++)
-     {
-       if (grub_le_to_cpu32 (data->nat_j.entries[i].nid) == nid)
-         {
--          blkaddr = grub_le_to_cpu32 (data->nat_j.entries[i].ne.block_addr);
-+          *blkaddr = grub_le_to_cpu32 (data->nat_j.entries[i].ne.block_addr);
-           break;
-         }
-     }
- 
--  return blkaddr;
-+  return GRUB_ERR_NONE;
- }
- 
- static grub_uint32_t
-@@ -656,10 +660,13 @@ get_node_blkaddr (struct grub_f2fs_data *data, grub_uint32_t nid)
- {
-   struct grub_f2fs_nat_block *nat_block;
-   grub_uint32_t seg_off, block_off, entry_off, block_addr;
--  grub_uint32_t blkaddr;
-+  grub_uint32_t blkaddr = 0;
-   grub_err_t err;
- 
--  blkaddr = get_blkaddr_from_nat_journal (data, nid);
-+  err = get_blkaddr_from_nat_journal (data, nid, &blkaddr);
-+  if (err != GRUB_ERR_NONE)
-+    return 0;
-+
-   if (blkaddr)
-     return blkaddr;
- 
diff --git a/0249-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch b/0249-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch
deleted file mode 100644
index 855e8826..00000000
--- a/0249-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
-Date: Wed, 6 Apr 2022 18:49:09 +0530
-Subject: [PATCH] fs/f2fs: Do not read past the end of nat bitmap
-
-A corrupt f2fs filesystem could have a block offset or a bitmap
-offset that would cause us to read beyond the bounds of the nat
-bitmap.
-
-Introduce the nat_bitmap_size member in grub_f2fs_data which holds
-the size of nat bitmap.
-
-Set the size when loading the nat bitmap in nat_bitmap_ptr(), and
-catch when an invalid offset would create a pointer past the end of
-the allocated space.
-
-Check against the bitmap size in grub_f2fs_test_bit() test bit to avoid
-reading past the end of the nat bitmap.
-
-Signed-off-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 62d63d5e38c67a6e349148bf7cb87c560e935a7e)
----
- grub-core/fs/f2fs.c | 33 +++++++++++++++++++++++++++------
- 1 file changed, 27 insertions(+), 6 deletions(-)
-
-diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c
-index 63702214b0..8898b235e0 100644
---- a/grub-core/fs/f2fs.c
-+++ b/grub-core/fs/f2fs.c
-@@ -122,6 +122,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
- #define F2FS_INLINE_DOTS          0x10  /* File having implicit dot dentries. */
- 
- #define MAX_VOLUME_NAME           512
-+#define MAX_NAT_BITMAP_SIZE       3900
- 
- enum FILE_TYPE
- {
-@@ -183,7 +184,7 @@ struct grub_f2fs_checkpoint
-   grub_uint32_t                   checksum_offset;
-   grub_uint64_t                   elapsed_time;
-   grub_uint8_t                    alloc_type[MAX_ACTIVE_LOGS];
--  grub_uint8_t                    sit_nat_version_bitmap[3900];
-+  grub_uint8_t                    sit_nat_version_bitmap[MAX_NAT_BITMAP_SIZE];
-   grub_uint32_t                   checksum;
- } GRUB_PACKED;
- 
-@@ -302,6 +303,7 @@ struct grub_f2fs_data
- 
-   struct grub_f2fs_nat_journal    nat_j;
-   char                            *nat_bitmap;
-+  grub_uint32_t                   nat_bitmap_size;
- 
-   grub_disk_t                     disk;
-   struct grub_f2fs_node           *inode;
-@@ -377,15 +379,20 @@ sum_blk_addr (struct grub_f2fs_data *data, int base, int type)
- }
- 
- static void *
--nat_bitmap_ptr (struct grub_f2fs_data *data)
-+nat_bitmap_ptr (struct grub_f2fs_data *data, grub_uint32_t *nat_bitmap_size)
- {
-   struct grub_f2fs_checkpoint *ckpt = &data->ckpt;
-   grub_uint32_t offset;
-+  *nat_bitmap_size = MAX_NAT_BITMAP_SIZE;
- 
-   if (grub_le_to_cpu32 (data->sblock.cp_payload) > 0)
-     return ckpt->sit_nat_version_bitmap;
- 
-   offset = grub_le_to_cpu32 (ckpt->sit_ver_bitmap_bytesize);
-+  if (offset >= MAX_NAT_BITMAP_SIZE)
-+     return NULL;
-+
-+  *nat_bitmap_size = *nat_bitmap_size - offset;
- 
-   return ckpt->sit_nat_version_bitmap + offset;
- }
-@@ -438,11 +445,15 @@ grub_f2fs_crc_valid (grub_uint32_t blk_crc, void *buf, const grub_uint32_t len)
- }
- 
- static int
--grub_f2fs_test_bit (grub_uint32_t nr, const char *p)
-+grub_f2fs_test_bit (grub_uint32_t nr, const char *p, grub_uint32_t len)
- {
-   int mask;
-+  grub_uint32_t shifted_nr = (nr >> 3);
- 
--  p += (nr >> 3);
-+  if (shifted_nr >= len)
-+    return -1;
-+
-+  p += shifted_nr;
-   mask = 1 << (7 - (nr & 0x07));
- 
-   return mask & *p;
-@@ -662,6 +673,7 @@ get_node_blkaddr (struct grub_f2fs_data *data, grub_uint32_t nid)
-   grub_uint32_t seg_off, block_off, entry_off, block_addr;
-   grub_uint32_t blkaddr = 0;
-   grub_err_t err;
-+  int result_bit;
- 
-   err = get_blkaddr_from_nat_journal (data, nid, &blkaddr);
-   if (err != GRUB_ERR_NONE)
-@@ -682,8 +694,15 @@ get_node_blkaddr (struct grub_f2fs_data *data, grub_uint32_t nid)
-         ((seg_off * data->blocks_per_seg) << 1) +
-         (block_off & (data->blocks_per_seg - 1));
- 
--  if (grub_f2fs_test_bit (block_off, data->nat_bitmap))
-+  result_bit = grub_f2fs_test_bit (block_off, data->nat_bitmap,
-+                                   data->nat_bitmap_size);
-+  if (result_bit > 0)
-     block_addr += data->blocks_per_seg;
-+  else if (result_bit == -1)
-+    {
-+      grub_free (nat_block);
-+      return 0;
-+    }
- 
-   err = grub_f2fs_block_read (data, block_addr, nat_block);
-   if (err)
-@@ -833,7 +852,9 @@ grub_f2fs_mount (grub_disk_t disk)
-   if (err)
-     goto fail;
- 
--  data->nat_bitmap = nat_bitmap_ptr (data);
-+  data->nat_bitmap = nat_bitmap_ptr (data, &data->nat_bitmap_size);
-+  if (data->nat_bitmap == NULL)
-+    goto fail;
- 
-   err = get_nat_journal (data);
-   if (err)
diff --git a/0249-grub-set-bootflag-Conservative-partial-fix-for-CVE-2.patch b/0249-grub-set-bootflag-Conservative-partial-fix-for-CVE-2.patch
new file mode 100644
index 00000000..995181f2
--- /dev/null
+++ b/0249-grub-set-bootflag-Conservative-partial-fix-for-CVE-2.patch
@@ -0,0 +1,146 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Solar Designer <solar@openwall.com>
+Date: Tue, 6 Feb 2024 21:39:41 +0100
+Subject: [PATCH] grub-set-bootflag: Conservative partial fix for CVE-2024-1048
+
+Following up on CVE-2019-14865 and taking a fresh look at
+grub2-set-bootflag now (through my work at CIQ on Rocky Linux), I saw some
+other ways in which users could still abuse this little program:
+
+1. After CVE-2019-14865 fix, grub2-set-bootflag no longer rewrites the
+grubenv file in-place, but writes into a temporary file and renames it
+over the original, checking for error returns from each call first.
+This prevents the original file truncation vulnerability, but it can
+leave the temporary file around if the program is killed before it can
+rename or remove the file.  There are still many ways to get the program
+killed, such as through RLIMIT_FSIZE triggering SIGXFSZ (tested,
+reliable) or by careful timing (tricky) of signals sent by process group
+leader, pty, pre-scheduled timers, SIGXCPU (probably not an exhaustive
+list).  Invoking the program multiple times fills up /boot (or if /boot
+is not separate, then it can fill up the root filesystem).  Since the
+files are tiny, the filesystem is likely to run out of free inodes
+before it'd run out of blocks, but the effect is similar - can't create
+new files after this point (but still can add data to existing files,
+such as logs).
+
+2. After CVE-2019-14865 fix, grub2-set-bootflag naively tries to protect
+itself from signals by becoming full root.  (This does protect it from
+signals sent by the user directly to the PID, but e.g. "kill -9 -1" by
+the user still works.)  A side effect of such "protection" is that it's
+possible to invoke more concurrent instances of grub2-set-bootflag than
+the user's RLIMIT_NPROC would normally permit (as specified e.g. in
+/etc/security/limits.conf, or say in Apache httpd's RLimitNPROC if
+grub2-set-bootflag would be abused by a website script), thereby
+exhausting system resources (e.g., bypassing RAM usage limit if
+RLIMIT_AS was also set).
+
+3. umask is inherited.  Again, due to how the CVE-2019-14865 fix creates
+a new file, and due to how mkstemp() works, this affects grubenv's new
+file permissions.  Luckily, mkstemp() forces them to be no more relaxed
+than 0600, but the user ends up being able to set them e.g. to 0.
+Luckily, at least in my testing GRUB still works fine even when the file
+has such (lack of) permissions.
+
+This commit deals with the abuses above as follows:
+
+1. RLIMIT_FSIZE is pre-checked, so this specific way to get the process
+killed should no longer work.  However, this isn't a complete fix
+because there are other ways to get the process killed after it has
+created the temporary file.
+
+The commit also fixes bug 1975892 ("RFE: grub2-set-bootflag should not
+write the grubenv when the flag being written is already set") and
+similar for "menu_show_once", which further reduces the abuse potential.
+
+2. RLIMIT_NPROC bypass should be avoided by not becoming full root (aka
+dropping the partial "kill protection").
+
+3. A safe umask is set.
+
+This is a partial fix (temporary files can still accumulate, but this is
+harder to trigger).
+
+While at it, this commit also fixes potential 1- or 2-byte over-read of
+env[] if its content is malformed - this was not a security issue since the
+grubenv file is trusted input, and the fix is just for robustness.
+
+Signed-off-by: Solar Designer <solar@openwall.com>
+---
+ util/grub-set-bootflag.c | 29 ++++++++++++++++-------------
+ 1 file changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
+index 3b4c25ca2ac..5bbbef80439 100644
+--- a/util/grub-set-bootflag.c
++++ b/util/grub-set-bootflag.c
+@@ -33,6 +33,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <sys/stat.h>
++#include <sys/resource.h>
+ 
+ #include "progname.h"
+ 
+@@ -57,12 +59,17 @@ static void usage(FILE *out)
+ int main(int argc, char *argv[])
+ {
+   /* NOTE buf must be at least the longest bootflag length + 4 bytes */
+-  char env[GRUBENV_SIZE + 1], buf[64], *s;
++  char env[GRUBENV_SIZE + 1 + 2], buf[64], *s;
+   /* +1 for 0 termination, +6 for "XXXXXX" in tmp filename */
+   char env_filename[PATH_MAX + 1], tmp_filename[PATH_MAX + 6 + 1];
+   const char *bootflag;
+   int i, fd, len, ret;
+   FILE *f;
++  struct rlimit rlim;
++
++  if (getrlimit(RLIMIT_FSIZE, &rlim) || rlim.rlim_cur < GRUBENV_SIZE || rlim.rlim_max < GRUBENV_SIZE)
++    return 1;
++  umask(077);
+ 
+   if (argc != 2)
+     {
+@@ -94,20 +101,11 @@ int main(int argc, char *argv[])
+   len = strlen (bootflag);
+ 
+   /*
+-   * Really become root. setuid avoids an user killing us, possibly leaking
+-   * the tmpfile. setgid avoids the new grubenv's gid being that of the user.
++   * setegid avoids the new grubenv's gid being that of the user.
+    */
+-  ret = setuid(0);
+-  if (ret)
++  if (setegid(0))
+     {
+-      perror ("Error setuid(0) failed");
+-      return 1;
+-    }
+-
+-  ret = setgid(0);
+-  if (ret)
+-    {
+-      perror ("Error setgid(0) failed");
++      perror ("Error setegid(0) failed");
+       return 1;
+     }
+ 
+@@ -136,6 +134,9 @@ int main(int argc, char *argv[])
+ 
+   /* 0 terminate env */
+   env[GRUBENV_SIZE] = 0;
++  /* not a valid flag value */
++  env[GRUBENV_SIZE + 1] = 0;
++  env[GRUBENV_SIZE + 2] = 0;
+ 
+   if (strncmp (env, GRUB_ENVBLK_SIGNATURE, strlen (GRUB_ENVBLK_SIGNATURE)))
+     {
+@@ -171,6 +172,8 @@ int main(int argc, char *argv[])
+ 
+   /* The grubenv is not 0 terminated, so memcpy the name + '=' , '1', '\n' */
+   snprintf(buf, sizeof(buf), "%s=1\n", bootflag);
++  if (!memcmp(s, buf, len + 3))
++    return 0; /* nothing to do */
+   memcpy(s, buf, len + 3);
+ 
+ 
diff --git a/0250-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch b/0250-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch
deleted file mode 100644
index 0553d606..00000000
--- a/0250-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
-Date: Wed, 6 Apr 2022 18:17:43 +0530
-Subject: [PATCH] fs/f2fs: Do not copy file names that are too long
-
-A corrupt f2fs file system might specify a name length which is greater
-than the maximum name length supported by the GRUB f2fs driver.
-
-We will allocate enough memory to store the overly long name, but there
-are only F2FS_NAME_LEN bytes in the source, so we would read past the end
-of the source.
-
-While checking directory entries, do not copy a file name with an invalid
-length.
-
-Signed-off-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
-Signed-off-by: Daniel Axtens <dja@axtens.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 9a891f638509e031d322c94e3cbcf38d36f3993a)
----
- grub-core/fs/f2fs.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c
-index 8898b235e0..df6beb544c 100644
---- a/grub-core/fs/f2fs.c
-+++ b/grub-core/fs/f2fs.c
-@@ -1003,6 +1003,10 @@ grub_f2fs_check_dentries (struct grub_f2fs_dir_iter_ctx *ctx)
- 
-       ftype = ctx->dentry[i].file_type;
-       name_len = grub_le_to_cpu16 (ctx->dentry[i].name_len);
-+
-+      if (name_len >= F2FS_NAME_LEN)
-+        return 0;
-+
-       filename = grub_malloc (name_len + 1);
-       if (!filename)
-         return 0;
diff --git a/0250-grub-set-bootflag-More-complete-fix-for-CVE-2024-104.patch b/0250-grub-set-bootflag-More-complete-fix-for-CVE-2024-104.patch
new file mode 100644
index 00000000..615b04de
--- /dev/null
+++ b/0250-grub-set-bootflag-More-complete-fix-for-CVE-2024-104.patch
@@ -0,0 +1,187 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Solar Designer <solar@openwall.com>
+Date: Tue, 6 Feb 2024 21:56:21 +0100
+Subject: [PATCH] grub-set-bootflag: More complete fix for CVE-2024-1048
+
+Switch to per-user fixed temporary filenames along with a weird locking
+mechanism, which is explained in source code comments.  This is a more
+complete fix than the previous commit (temporary files can't accumulate).
+Unfortunately, it introduces new risks (by working on a temporary file
+shared between the user's invocations), which are _hopefully_ avoided by
+the patch's elaborate logic.  I actually got it wrong at first, which
+suggests that this logic is hard to reason about, and more errors or
+omissions are possible.  It also relies on the kernel's primitives' exact
+semantics to a greater extent (nothing out of the ordinary, though).
+
+Remaining issues that I think cannot reasonably be fixed without a
+redesign (e.g., having per-flag files with nothing else in them) and
+without introducing new issues:
+
+A. A user can still revert a concurrent user's attempt of setting the
+other flag - or of making other changes to grubenv by means other than
+this program.
+
+B. One leftover temporary file per user is still possible.
+
+Signed-off-by: Solar Designer <solar@openwall.com>
+---
+ util/grub-set-bootflag.c | 95 ++++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 79 insertions(+), 16 deletions(-)
+
+diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
+index 5bbbef80439..514c4f9091a 100644
+--- a/util/grub-set-bootflag.c
++++ b/util/grub-set-bootflag.c
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <sys/file.h>
+ #include <sys/stat.h>
+ #include <sys/resource.h>
+ 
+@@ -60,15 +61,12 @@ int main(int argc, char *argv[])
+ {
+   /* NOTE buf must be at least the longest bootflag length + 4 bytes */
+   char env[GRUBENV_SIZE + 1 + 2], buf[64], *s;
+-  /* +1 for 0 termination, +6 for "XXXXXX" in tmp filename */
+-  char env_filename[PATH_MAX + 1], tmp_filename[PATH_MAX + 6 + 1];
++  /* +1 for 0 termination, +11 for ".%u" in tmp filename */
++  char env_filename[PATH_MAX + 1], tmp_filename[PATH_MAX + 11 + 1];
+   const char *bootflag;
+   int i, fd, len, ret;
+   FILE *f;
+-  struct rlimit rlim;
+ 
+-  if (getrlimit(RLIMIT_FSIZE, &rlim) || rlim.rlim_cur < GRUBENV_SIZE || rlim.rlim_max < GRUBENV_SIZE)
+-    return 1;
+   umask(077);
+ 
+   if (argc != 2)
+@@ -105,7 +103,7 @@ int main(int argc, char *argv[])
+    */
+   if (setegid(0))
+     {
+-      perror ("Error setegid(0) failed");
++      perror ("setegid(0) failed");
+       return 1;
+     }
+ 
+@@ -176,19 +174,82 @@ int main(int argc, char *argv[])
+     return 0; /* nothing to do */
+   memcpy(s, buf, len + 3);
+ 
++  struct rlimit rlim;
++  if (getrlimit(RLIMIT_FSIZE, &rlim) || rlim.rlim_cur < GRUBENV_SIZE || rlim.rlim_max < GRUBENV_SIZE)
++    {
++      fprintf (stderr, "Resource limits undetermined or too low\n");
++      return 1;
++    }
++
++  /*
++   * Here we work under the premise that we shouldn't write into the target
++   * file directly because we might not be able to have all of our changes
++   * written completely and atomically.  That was CVE-2019-14865, known to
++   * have been triggerable via RLIMIT_FSIZE.  While we've dealt with that
++   * specific attack via the check above, there may be other possibilities.
++   */
+ 
+   /*
+    * Create a tempfile for writing the new env.  Use the canonicalized filename
+    * for the template so that the tmpfile is in the same dir / on same fs.
++   *
++   * We now use per-user fixed temporary filenames, so that a user cannot cause
++   * multiple files to accumulate.
++   *
++   * We don't use O_EXCL so that a stale temporary file doesn't prevent further
++   * usage of the program by the user.
+    */
+-  snprintf(tmp_filename, sizeof(tmp_filename), "%sXXXXXX", env_filename);
+-  fd = mkstemp(tmp_filename);
++  snprintf(tmp_filename, sizeof(tmp_filename), "%s.%u", env_filename, getuid());
++  fd = open(tmp_filename, O_CREAT | O_WRONLY, 0600);
+   if (fd == -1)
+     {
+       perror ("Creating tmpfile failed");
+       return 1;
+     }
+ 
++  /*
++   * The lock prevents the same user from reaching further steps ending in
++   * rename() concurrently, in which case the temporary file only partially
++   * written by one invocation could be renamed to the target file by another.
++   *
++   * The lock also guards the slow fsync() from concurrent calls.  After the
++   * first time that and the rename() complete, further invocations for the
++   * same flag become no-ops.
++   *
++   * We lock the temporary file rather than the target file because locking the
++   * latter would allow any user having SIGSTOP'ed their process to make all
++   * other users' invocations fail (or lock up if we'd use blocking mode).
++   *
++   * We use non-blocking mode (LOCK_NB) because the lock having been taken by
++   * another process implies that the other process would normally have already
++   * renamed the file to target by the time it releases the lock (and we could
++   * acquire it), so we'd be working directly on the target if we proceeded,
++   * which is undesirable, and we'd kind of fail on the already-done rename.
++   */
++  if (flock(fd, LOCK_EX | LOCK_NB))
++    {
++      perror ("Locking tmpfile failed");
++      return 1;
++    }
++
++  /*
++   * Deal with the potential that another invocation proceeded all the way to
++   * rename() and process exit while we were between open() and flock().
++   */
++  {
++    struct stat st1, st2;
++    if (fstat(fd, &st1) || stat(tmp_filename, &st2))
++      {
++        perror ("stat of tmpfile failed");
++        return 1;
++      }
++    if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)
++      {
++        fprintf (stderr, "Another invocation won race\n");
++        return 1;
++      }
++  }
++
+   f = fdopen (fd, "w");
+   if (!f)
+     {
+@@ -213,6 +274,14 @@ int main(int argc, char *argv[])
+       return 1;     
+     }
+ 
++  ret = ftruncate (fileno (f), GRUBENV_SIZE);
++  if (ret)
++    {
++      perror ("Error truncating tmpfile");
++      unlink(tmp_filename);
++      return 1;
++    }
++
+   ret = fsync (fileno (f));
+   if (ret)
+     {
+@@ -221,15 +290,9 @@ int main(int argc, char *argv[])
+       return 1;
+     }
+ 
+-  ret = fclose (f);
+-  if (ret)
+-    {
+-      perror ("Error closing tmpfile");
+-      unlink(tmp_filename);
+-      return 1;
+-    }
+-
+   /*
++   * We must not close the file before rename() as that would remove the lock.
++   *
+    * And finally rename the tmpfile with the new env over the old env, the
+    * linux kernel guarantees that this is atomic (from a syscall pov).
+    */
diff --git a/0251-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch b/0251-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch
deleted file mode 100644
index 7ff58218..00000000
--- a/0251-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Darren Kenny <darren.kenny@oracle.com>
-Date: Tue, 29 Mar 2022 10:49:56 +0000
-Subject: [PATCH] fs/btrfs: Fix several fuzz issues with invalid dir item
- sizing
-
-According to the btrfs code in Linux, the structure of a directory item
-leaf should be of the form:
-
-  |struct btrfs_dir_item|name|data|
-
-in GRUB the name len and data len are in the grub_btrfs_dir_item
-structure's n and m fields respectively.
-
-The combined size of the structure, name and data should be less than
-the allocated memory, a difference to the Linux kernel's struct
-btrfs_dir_item is that the grub_btrfs_dir_item has an extra field for
-where the name is stored, so we adjust for that too.
-
-Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 6d3f06c0b6a8992b9b1bb0e62af93ac5ff2781f0)
-[rharwood: we've an extra variable here]
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- grub-core/fs/btrfs.c | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 07c0ff874b..2fcfb738fe 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -2254,6 +2254,7 @@ grub_btrfs_dir (grub_device_t device, const char *path,
-   grub_uint64_t tree;
-   grub_uint8_t type;
-   char *new_path = NULL;
-+  grub_size_t est_size = 0;
- 
-   if (!data)
-     return grub_errno;
-@@ -2320,6 +2321,18 @@ grub_btrfs_dir (grub_device_t device, const char *path,
- 	  break;
- 	}
- 
-+      if (direl == NULL ||
-+	  grub_add (grub_le_to_cpu16 (direl->n),
-+		    grub_le_to_cpu16 (direl->m), &est_size) ||
-+	  grub_add (est_size, sizeof (*direl), &est_size) ||
-+	  grub_sub (est_size, sizeof (direl->name), &est_size) ||
-+	  est_size > allocated)
-+       {
-+         grub_errno = GRUB_ERR_OUT_OF_RANGE;
-+         r = -grub_errno;
-+         goto out;
-+       }
-+
-       for (cdirel = direl;
- 	   (grub_uint8_t *) cdirel - (grub_uint8_t *) direl
- 	   < (grub_ssize_t) elemsize;
-@@ -2330,6 +2343,19 @@ grub_btrfs_dir (grub_device_t device, const char *path,
- 	  char c;
- 	  struct grub_btrfs_inode inode;
- 	  struct grub_dirhook_info info;
-+
-+	  if (cdirel == NULL ||
-+	      grub_add (grub_le_to_cpu16 (cdirel->n),
-+			grub_le_to_cpu16 (cdirel->m), &est_size) ||
-+	      grub_add (est_size, sizeof (*cdirel), &est_size) ||
-+	      grub_sub (est_size, sizeof (cdirel->name), &est_size) ||
-+	      est_size > allocated)
-+	   {
-+	     grub_errno = GRUB_ERR_OUT_OF_RANGE;
-+	     r = -grub_errno;
-+	     goto out;
-+	   }
-+
- 	  err = grub_btrfs_read_inode (data, &inode, cdirel->key.object_id,
- 				       tree);
- 	  grub_memset (&info, 0, sizeof (info));
diff --git a/0251-grub-set-bootflag-Exit-calmly-when-not-running-as-ro.patch b/0251-grub-set-bootflag-Exit-calmly-when-not-running-as-ro.patch
new file mode 100644
index 00000000..5b41025b
--- /dev/null
+++ b/0251-grub-set-bootflag-Exit-calmly-when-not-running-as-ro.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Solar Designer <solar@openwall.com>
+Date: Tue, 6 Feb 2024 22:05:45 +0100
+Subject: [PATCH] grub-set-bootflag: Exit calmly when not running as root
+
+Exit calmly when not installed SUID root and invoked by non-root.  This
+allows installing user/grub-boot-success.service unconditionally while
+supporting non-SUID installation of the program for some limited usage.
+
+Signed-off-by: Solar Designer <solar@openwall.com>
+---
+ util/grub-set-bootflag.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
+index 514c4f9091a..31a868aeca8 100644
+--- a/util/grub-set-bootflag.c
++++ b/util/grub-set-bootflag.c
+@@ -98,6 +98,17 @@ int main(int argc, char *argv[])
+   bootflag = bootflags[i];
+   len = strlen (bootflag);
+ 
++  /*
++   * Exit calmly when not installed SUID root and invoked by non-root.  This
++   * allows installing user/grub-boot-success.service unconditionally while
++   * supporting non-SUID installation of the program for some limited usage.
++   */
++  if (geteuid())
++    {
++      printf ("grub-set-bootflag not running as root, no action taken\n");
++      return 0;
++    }
++
+   /*
+    * setegid avoids the new grubenv's gid being that of the user.
+    */
diff --git a/0252-Makefile.core.def-fix-linux-module.patch b/0252-Makefile.core.def-fix-linux-module.patch
new file mode 100644
index 00000000..83d8d8e8
--- /dev/null
+++ b/0252-Makefile.core.def-fix-linux-module.patch
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Mon, 15 Apr 2024 09:24:47 -0600
+Subject: [PATCH] Makefile.core.def: fix linux module
+
+Set EFI source file targets specifically for i386 and x86_64 archs,
+otherwise we observe build failures at aarch64
+
+../../grub-core/tests/videotest_checksum.c > videotest_checksum.marker.new || (rm -f videotest_checksum.marker; exit 1)
+../../grub-core/loader/efi/linux.c:28:10: fatal error: grub/cpu/linux.h: No such file or directory
+   28 | #include <grub/cpu/linux.h>
+      |          ^~~~~~~~~~~~~~~~~~
+compilation terminated.
+.
+.
+.
+../../grub-core/loader/i386/linux.c:30:10: fatal error: grub/cpu/linux.h: No such file or directory
+   30 | #include <grub/cpu/linux.h>
+      |          ^~~~~~~~~~~~~~~~~~
+compilation terminated.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/Makefile.core.def  | 7 ++++---
+ grub-core/loader/efi/linux.c | 1 -
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index b045aac7c91..6ff4835340d 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -1902,13 +1902,14 @@ module = {
+   riscv32 = loader/efi/linux.c;
+   riscv64 = loader/efi/linux.c;
+   i386_efi = loader/i386/efi/linux.c;
++  i386_efi = loader/efi/linux.c;
++  i386_efi = loader/i386/linux.c;
+   x86_64_efi = loader/i386/efi/linux.c;
++  x86_64_efi = loader/efi/linux.c;
++  x86_64_efi = loader/i386/linux.c;
+   emu = loader/emu/linux.c;
+-  fdt = lib/fdt.c;
+   common = loader/linux.c;
+   common = lib/cmdline.c;
+-  efi = loader/efi/linux.c;
+-  efi = loader/i386/linux.c;
+ };
+ 
+ module = {
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index f5ab0128991..44587df3858 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -25,7 +25,6 @@
+ #include <grub/loader.h>
+ #include <grub/mm.h>
+ #include <grub/types.h>
+-#include <grub/cpu/linux.h>
+ #include <grub/efi/efi.h>
+ #include <grub/efi/fdtload.h>
+ #include <grub/efi/memory.h>
diff --git a/0252-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch b/0252-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch
deleted file mode 100644
index d638c117..00000000
--- a/0252-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Darren Kenny <darren.kenny@oracle.com>
-Date: Tue, 29 Mar 2022 15:52:46 +0000
-Subject: [PATCH] fs/btrfs: Fix more ASAN and SEGV issues found with fuzzing
-
-The fuzzer is generating btrfs file systems that have chunks with
-invalid combinations of stripes and substripes for the given RAID
-configurations.
-
-After examining the Linux kernel fs/btrfs/tree-checker.c code, it
-appears that sub-stripes should only be applied to RAID10, and in that
-case there should only ever be 2 of them.
-
-Similarly, RAID single should only have 1 stripe, and RAID1/1C3/1C4
-should have 2. 3 or 4 stripes respectively, which is what redundancy
-corresponds.
-
-Some of the chunks ended up with a size of 0, which grub_malloc() still
-returned memory for and in turn generated ASAN errors later when
-accessed.
-
-While it would be possible to specifically limit the number of stripes,
-a more correct test was on the combination of the chunk item, and the
-number of stripes by the size of the chunk stripe structure in
-comparison to the size of the chunk itself.
-
-Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit 3849647b4b98a4419366708fc4b7f339c6f55ec7)
----
- grub-core/fs/btrfs.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 55 insertions(+)
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 2fcfb738fe..0e9b450413 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -941,6 +941,12 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
- 	return grub_error (GRUB_ERR_BAD_FS,
- 			   "couldn't find the chunk descriptor");
- 
-+      if (!chsize)
-+	{
-+	  grub_dprintf ("btrfs", "zero-size chunk\n");
-+	  return grub_error (GRUB_ERR_BAD_FS,
-+			     "got an invalid zero-size chunk");
-+	}
-       chunk = grub_malloc (chsize);
-       if (!chunk)
- 	return grub_errno;
-@@ -999,6 +1005,16 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
- 	      stripe_length = grub_divmod64 (grub_le_to_cpu64 (chunk->size),
- 					     nstripes,
- 					     NULL);
-+
-+	      /* For single, there should be exactly 1 stripe. */
-+	      if (grub_le_to_cpu16 (chunk->nstripes) != 1)
-+		{
-+		  grub_dprintf ("btrfs", "invalid RAID_SINGLE: nstripes != 1 (%u)\n",
-+				grub_le_to_cpu16 (chunk->nstripes));
-+		  return grub_error (GRUB_ERR_BAD_FS,
-+				     "invalid RAID_SINGLE: nstripes != 1 (%u)",
-+				      grub_le_to_cpu16 (chunk->nstripes));
-+		}
- 	      if (stripe_length == 0)
- 		stripe_length = 512;
- 	      stripen = grub_divmod64 (off, stripe_length, &stripe_offset);
-@@ -1018,6 +1034,19 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
- 	      stripen = 0;
- 	      stripe_offset = off;
- 	      csize = grub_le_to_cpu64 (chunk->size) - off;
-+
-+             /*
-+	      * Redundancy, and substripes only apply to RAID10, and there
-+	      * should be exactly 2 sub-stripes.
-+	      */
-+	     if (grub_le_to_cpu16 (chunk->nstripes) != redundancy)
-+               {
-+                 grub_dprintf ("btrfs", "invalid RAID1: nstripes != %u (%u)\n",
-+                               redundancy, grub_le_to_cpu16 (chunk->nstripes));
-+                 return grub_error (GRUB_ERR_BAD_FS,
-+                                    "invalid RAID1: nstripes != %u (%u)",
-+                                    redundancy, grub_le_to_cpu16 (chunk->nstripes));
-+               }
- 	      break;
- 	    }
- 	  case GRUB_BTRFS_CHUNK_TYPE_RAID0:
-@@ -1054,6 +1083,20 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
- 	      stripe_offset = low + chunk_stripe_length
- 		* high;
- 	      csize = chunk_stripe_length - low;
-+
-+	      /*
-+	       * Substripes only apply to RAID10, and there
-+	       * should be exactly 2 sub-stripes.
-+	       */
-+	      if (grub_le_to_cpu16 (chunk->nsubstripes) != 2)
-+		{
-+		  grub_dprintf ("btrfs", "invalid RAID10: nsubstripes != 2 (%u)",
-+				grub_le_to_cpu16 (chunk->nsubstripes));
-+		  return grub_error (GRUB_ERR_BAD_FS,
-+				     "invalid RAID10: nsubstripes != 2 (%u)",
-+				     grub_le_to_cpu16 (chunk->nsubstripes));
-+		}
-+
- 	      break;
- 	    }
- 	  case GRUB_BTRFS_CHUNK_TYPE_RAID5:
-@@ -1153,6 +1196,8 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
- 
- 	for (j = 0; j < 2; j++)
- 	  {
-+	    grub_size_t est_chunk_alloc = 0;
-+
- 	    grub_dprintf ("btrfs", "chunk 0x%" PRIxGRUB_UINT64_T
- 			  "+0x%" PRIxGRUB_UINT64_T
- 			  " (%d stripes (%d substripes) of %"
-@@ -1165,6 +1210,16 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
- 	    grub_dprintf ("btrfs", "reading laddr 0x%" PRIxGRUB_UINT64_T "\n",
- 			  addr);
- 
-+	    if (grub_mul (sizeof (struct grub_btrfs_chunk_stripe),
-+			  grub_le_to_cpu16 (chunk->nstripes), &est_chunk_alloc) ||
-+		grub_add (est_chunk_alloc,
-+			  sizeof (struct grub_btrfs_chunk_item), &est_chunk_alloc) ||
-+		est_chunk_alloc > chunk->size)
-+	      {
-+		err = GRUB_ERR_BAD_FS;
-+		break;
-+	      }
-+
- 	    if (is_raid56)
- 	      {
- 		err = btrfs_read_from_chunk (data, chunk, stripen,
diff --git a/0253-Add-support-for-Linux-EFI-stub-loading-on-arm-archit.patch b/0253-Add-support-for-Linux-EFI-stub-loading-on-arm-archit.patch
new file mode 100644
index 00000000..d9ff0b61
--- /dev/null
+++ b/0253-Add-support-for-Linux-EFI-stub-loading-on-arm-archit.patch
@@ -0,0 +1,270 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matthew Garrett <mjg@redhat.com>
+Date: Mon, 15 Apr 2024 11:19:31 -0600
+Subject: [PATCH] Add support for Linux EFI stub loading on arm architectures
+
+---
+ grub-core/loader/arm64/xen_boot.c |   1 -
+ grub-core/loader/efi/linux.c      | 116 ++++++++++++++++++--------------------
+ include/grub/efi/efi.h            |  28 ++++++++-
+ 3 files changed, 80 insertions(+), 65 deletions(-)
+
+diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
+index 26e1472c9d2..9838a0f878b 100644
+--- a/grub-core/loader/arm64/xen_boot.c
++++ b/grub-core/loader/arm64/xen_boot.c
+@@ -252,7 +252,6 @@ xen_boot (void)
+     return err;
+ 
+   return grub_arch_efi_linux_boot_image (xen_hypervisor->start,
+-					  xen_hypervisor->size,
+ 					  xen_hypervisor->cmdline);
+ }
+ 
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index 44587df3858..8742e303d85 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -28,6 +28,7 @@
+ #include <grub/efi/efi.h>
+ #include <grub/efi/fdtload.h>
+ #include <grub/efi/memory.h>
++#include <grub/efi/linux.h>
+ #include <grub/efi/pe32.h>
+ #include <grub/efi/linux.h>
+ #include <grub/efi/sb.h>
+@@ -42,6 +43,7 @@ static int loaded;
+ 
+ static void *kernel_addr;
+ static grub_uint64_t kernel_size;
++static grub_uint32_t handover_offset;
+ 
+ static char *linux_args;
+ static grub_uint32_t cmdline_size;
+@@ -94,7 +96,7 @@ static grub_efi_load_file2_t initrd_lf2 = {
+ typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
+ 
+ grub_err_t
+-grub_efi_linux_boot (void *kernel_address, grub_off_t handover_offset,
++grub_efi_linux_boot (void *kernel_address, grub_off_t ho_offset,
+ 		     void *kernel_params)
+ {
+   grub_efi_loaded_image_t *loaded_image = NULL;
+@@ -117,8 +119,8 @@ grub_efi_linux_boot (void *kernel_address, grub_off_t handover_offset,
+     grub_dprintf ("linux", "Loaded Image base address could not be set\n");
+ 
+   grub_dprintf ("linux", "kernel_address: %p handover_offset: %p params: %p\n",
+-		kernel_address, (void *)(grub_efi_uintn_t)handover_offset, kernel_params);
+-  hf = (handover_func)((char *)kernel_address + handover_offset + offset);
++		kernel_address, (void *)(grub_efi_uintn_t)ho_offset, kernel_params);
++  hf = (handover_func)((char *)kernel_address + ho_offset + offset);
+   hf (grub_efi_image_handle, grub_efi_system_table, kernel_params);
+ 
+   return GRUB_ERR_BUG;
+@@ -178,7 +180,8 @@ grub_arch_efi_linux_load_image_header (grub_file_t file,
+ static grub_err_t
+ finalize_params_linux (void)
+ {
+-  int node, retval;
++  grub_efi_loaded_image_t *loaded_image = NULL;
++  int node, retval, len;
+ 
+   void *fdt;
+ 
+@@ -213,79 +216,65 @@ finalize_params_linux (void)
+   if (grub_fdt_install() != GRUB_ERR_NONE)
+     goto failure;
+ 
+-  return GRUB_ERR_NONE;
+-
+-failure:
+-  grub_fdt_unload();
+-  return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
+-}
+-#endif
+-
+-grub_err_t
+-grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
+-{
+-  grub_efi_memory_mapped_device_path_t *mempath;
+-  grub_efi_handle_t image_handle;
+-  grub_efi_boot_services_t *b;
+-  grub_efi_status_t status;
+-  grub_efi_loaded_image_t *loaded_image;
+-  int len;
+-
+-  mempath = grub_malloc (2 * sizeof (grub_efi_memory_mapped_device_path_t));
+-  if (!mempath)
+-    return grub_errno;
+-
+-  mempath[0].header.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE;
+-  mempath[0].header.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE;
+-  mempath[0].header.length = grub_cpu_to_le16_compile_time (sizeof (*mempath));
+-  mempath[0].memory_type = GRUB_EFI_LOADER_DATA;
+-  mempath[0].start_address = addr;
+-  mempath[0].end_address = addr + size;
+-
+-  mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE;
+-  mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
+-  mempath[1].header.length = sizeof (grub_efi_device_path_t);
+-
+-  b = grub_efi_system_table->boot_services;
+-  status = b->load_image (0, grub_efi_image_handle,
+-			  (grub_efi_device_path_t *) mempath,
+-			  (void *) addr, size, &image_handle);
+-  if (status != GRUB_EFI_SUCCESS)
+-    return grub_error (GRUB_ERR_BAD_OS, "cannot load image");
+-
+-  grub_dprintf ("linux", "linux command line: '%s'\n", args);
++  grub_dprintf ("linux", "Installed/updated FDT configuration table @ %p\n",
++                fdt);
+ 
+   /* Convert command line to UCS-2 */
+-  loaded_image = grub_efi_get_loaded_image (image_handle);
++  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
+   if (loaded_image == NULL)
+     {
+       grub_error (GRUB_ERR_BAD_FIRMWARE, "missing loaded_image proto");
+-      goto unload;
++      goto failure;
+     }
+   loaded_image->load_options_size = len =
+-    (grub_strlen (args) + 1) * sizeof (grub_efi_char16_t);
++    (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t);
+   loaded_image->load_options =
+     grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
+   if (!loaded_image->load_options)
+-    return grub_errno;
++    return grub_error(GRUB_ERR_BAD_OS, "failed to create kernel parameters");
+ 
+   loaded_image->load_options_size =
+     2 * grub_utf8_to_utf16 (loaded_image->load_options, len,
+-			    (grub_uint8_t *) args, len, NULL);
++                           (grub_uint8_t *) linux_args, len, NULL);
+ 
+-  grub_dprintf ("linux", "starting image %p\n", image_handle);
+-  status = b->start_image (image_handle, 0, NULL);
++  return GRUB_ERR_NONE;
+ 
+-  /* When successful, not reached */
+-  grub_error (GRUB_ERR_BAD_OS, "start_image() returned 0x%" PRIxGRUB_EFI_UINTN_T, status);
+-  grub_efi_free_pages ((grub_addr_t) loaded_image->load_options,
+-		       GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
+-unload:
+-  b->unload_image (image_handle);
++failure:
++  grub_fdt_unload();
++  return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
++}
++#endif
++
++static void
++free_params (void)
++{
++  grub_efi_loaded_image_t *loaded_image = NULL;
+ 
+-  return grub_errno;
++  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
++  if (loaded_image)
++    {
++      if (loaded_image->load_options)
++       grub_efi_free_pages ((grub_efi_physical_address_t)(grub_efi_uintn_t)loaded_image->load_options,
++                            GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
++      loaded_image->load_options = NULL;
++      loaded_image->load_options_size = 0;
++    }
+ }
+ 
++grub_err_t
++grub_arch_efi_linux_boot_image (grub_addr_t addr, char *args)
++{
++  grub_err_t retval;
++
++  grub_dprintf ("linux", "linux command line: '%s'\n", args);
++
++  retval = grub_efi_linux_boot ((char *)addr, handover_offset, (void *)addr);
++
++  /* Never reached... */
++  free_params();
++  return retval;
++ }
++
+ static grub_err_t
+ grub_linux_boot (void)
+ {
+@@ -294,8 +283,7 @@ grub_linux_boot (void)
+     return grub_errno;
+ #endif
+ 
+-  return grub_arch_efi_linux_boot_image ((grub_addr_t) kernel_addr,
+-					 kernel_size, linux_args);
++  return grub_arch_efi_linux_boot_image ((grub_addr_t) kernel_addr, linux_args);
+ }
+ 
+ static grub_err_t
+@@ -572,6 +560,12 @@ fallback:
+ 
+   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
+ 
++#if !defined(__i386__) && !defined(__x86_64__)
++  struct grub_armxx_linux_pe_header *pe;
++  pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset);
++  handover_offset = pe->opt.entry_addr;
++#endif
++
+   cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);
+   linux_args = grub_malloc (cmdline_size);
+   if (!linux_args)
+diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
+index 83ddbe26e57..bff833468ee 100644
+--- a/include/grub/efi/efi.h
++++ b/include/grub/efi/efi.h
+@@ -20,6 +20,7 @@
+ #ifndef GRUB_EFI_EFI_HEADER
+ #define GRUB_EFI_EFI_HEADER	1
+ 
++#include <grub/efi/pe32.h>
+ #include <grub/types.h>
+ #include <grub/dl.h>
+ #include <grub/efi/api.h>
+@@ -36,7 +37,29 @@ struct linux_arch_kernel_header {
+   struct grub_pe_image_header pe_image_header;
+ };
+ 
+-#define GRUB_EFI_GRUB_VARIABLE_GUID \
++struct grub_arm_linux_pe_header
++{
++  grub_uint32_t magic;
++  struct grub_pe32_coff_header coff;
++  struct grub_pe32_optional_header opt;
++};
++
++struct grub_arm64_linux_pe_header
++{
++  grub_uint32_t magic;
++  struct grub_pe32_coff_header coff;
++  struct grub_pe64_optional_header opt;
++};
++
++#if defined(__arm__)
++# define grub_armxx_linux_pe_header grub_arm_linux_pe_header
++#endif
++
++#if defined(__aarch64__)
++# define grub_armxx_linux_pe_header grub_arm64_linux_pe_header
++#endif
++
++#define GRUB_EFI_GRUB_VARIABLE_GUID             \
+   { 0x91376aff, 0xcba6, 0x42be, \
+     { 0x94, 0x9d, 0x06, 0xfd, 0xe8, 0x11, 0x28, 0xe8 } \
+   }
+@@ -173,8 +196,7 @@ grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
+ #include <grub/file.h>
+ grub_err_t grub_arch_efi_linux_load_image_header(grub_file_t file,
+                                                 struct linux_arch_kernel_header *lh);
+-grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
+-                                           char *args);
++grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, char *args);
+ 
+ grub_addr_t grub_efi_section_addr (const char *section);
+ 
diff --git a/0253-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch b/0253-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch
deleted file mode 100644
index 2e5145fe..00000000
--- a/0253-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Darren Kenny <darren.kenny@oracle.com>
-Date: Thu, 7 Apr 2022 15:18:12 +0000
-Subject: [PATCH] fs/btrfs: Fix more fuzz issues related to chunks
-
-The corpus we generating issues in grub_btrfs_read_logical() when
-attempting to iterate over nstripes entries in the boot mapping.
-
-In most cases the reason for the failure was that the number of strips
-exceeded the possible space statically allocated in superblock bootmapping
-space. Each stripe entry in the bootmapping block consists of
-a grub_btrfs_key followed by a grub_btrfs_chunk_stripe.
-
-Another issue that came up was that while calculating the chunk size,
-in an earlier piece of code in that function, depending on the data
-provided in the btrfs file system, it would end up calculating a size
-that was too small to contain even 1 grub_btrfs_chunk_item, which is
-obviously invalid too.
-
-Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-(cherry picked from commit e00cd76cbadcc897a9cc4087cb2fcb5dbe15e596)
----
- grub-core/fs/btrfs.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 0e9b450413..47325f6ad7 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -947,6 +947,17 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
- 	  return grub_error (GRUB_ERR_BAD_FS,
- 			     "got an invalid zero-size chunk");
- 	}
-+
-+      /*
-+       * The space being allocated for a chunk should at least be able to
-+       * contain one chunk item.
-+       */
-+      if (chsize < sizeof (struct grub_btrfs_chunk_item))
-+       {
-+         grub_dprintf ("btrfs", "chunk-size too small\n");
-+         return grub_error (GRUB_ERR_BAD_FS,
-+                            "got an invalid chunk size");
-+       }
-       chunk = grub_malloc (chsize);
-       if (!chunk)
- 	return grub_errno;
-@@ -1194,6 +1205,13 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
- 	if (csize > (grub_uint64_t) size)
- 	  csize = size;
- 
-+	/*
-+	 * The space for a chunk stripe is limited to the space provide in the super-block's
-+	 * bootstrap mapping with an initial btrfs key at the start of each chunk.
-+	 */
-+	grub_size_t avail_stripes = sizeof (data->sblock.bootstrap_mapping) /
-+	  (sizeof (struct grub_btrfs_key) + sizeof (struct grub_btrfs_chunk_stripe));
-+
- 	for (j = 0; j < 2; j++)
- 	  {
- 	    grub_size_t est_chunk_alloc = 0;
-@@ -1220,6 +1238,12 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
- 		break;
- 	      }
- 
-+	   if (grub_le_to_cpu16 (chunk->nstripes) > avail_stripes)
-+             {
-+               err = GRUB_ERR_BAD_FS;
-+               break;
-+             }
-+
- 	    if (is_raid56)
- 	      {
- 		err = btrfs_read_from_chunk (data, chunk, stripen,
diff --git a/0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch b/0254-arm-arm64-loader-Better-memory-allocation-and-error-.patch
similarity index 80%
rename from 0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch
rename to 0254-arm-arm64-loader-Better-memory-allocation-and-error-.patch
index 57d937cd..b6c1dc91 100644
--- a/0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch
+++ b/0254-arm-arm64-loader-Better-memory-allocation-and-error-.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Thu, 11 Jul 2019 14:38:57 +0200
+Date: Mon, 15 Apr 2024 12:58:13 -0600
 Subject: [PATCH] arm/arm64 loader: Better memory allocation and error
  messages.
 
@@ -66,28 +66,31 @@ per-platform constraints on its given address are maintained.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/kern/efi/mm.c        | 33 +++++++++++++++-----
- grub-core/loader/arm64/linux.c | 68 +++++++++++++++++++++++++++++++-----------
- 2 files changed, 76 insertions(+), 25 deletions(-)
+ grub-core/kern/efi/mm.c      | 35 ++++++++++++++++++------
+ grub-core/loader/efi/linux.c | 65 +++++++++++++++++++++++++++++++++-----------
+ 2 files changed, 75 insertions(+), 25 deletions(-)
 
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index f6aef0ef64..85ad4b4494 100644
+index 8f75205a732..560b859b6f4 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
-@@ -154,6 +154,7 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
+@@ -153,8 +153,9 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
  {
    grub_efi_status_t status;
    grub_efi_boot_services_t *b;
 +  grub_efi_physical_address_t ret = address;
  
-   /* Limit the memory access to less than 4GB for 32-bit platforms.  */
+-  /* Limit the memory access to less than 4GB for 32-bit platforms.  */
++/* Limit the memory access to less than 4GB for 32-bit platforms.  */
    if (address > GRUB_EFI_MAX_USABLE_ADDRESS)
-@@ -170,19 +171,22 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
+     {
+       char inv_addr[17], max_addr[17]; /* log16(2^64) = 16, plus NUL. */
+@@ -169,19 +170,22 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
      }
  
    b = grub_efi_system_table->boot_services;
--  status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &address);
-+  status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &ret);
+-  status = b->allocate_pages (alloctype, memtype, pages, &address);
++  status = b->allocate_pages (alloctype, memtype, pages, &ret);
    if (status != GRUB_EFI_SUCCESS)
      {
 +      grub_dprintf ("efi",
@@ -103,13 +106,13 @@ index f6aef0ef64..85ad4b4494 100644
        /* Uggh, the address 0 was allocated... This is too annoying,
  	 so reallocate another one.  */
 -      address = GRUB_EFI_MAX_USABLE_ADDRESS;
--      status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &address);
+-      status = b->allocate_pages (alloctype, memtype, pages, &address);
 +      ret = address;
-+      status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &ret);
++      status = b->allocate_pages (alloctype, memtype, pages, &ret);
        grub_efi_free_pages (0, pages);
        if (status != GRUB_EFI_SUCCESS)
  	{
-@@ -191,9 +195,9 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
+@@ -190,9 +194,9 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
  	}
      }
  
@@ -121,7 +124,7 @@ index f6aef0ef64..85ad4b4494 100644
  }
  
  void *
-@@ -713,8 +717,21 @@ grub_efi_get_ram_base(grub_addr_t *base_addr)
+@@ -711,8 +715,21 @@ grub_efi_get_ram_base(grub_addr_t *base_addr)
    for (desc = memory_map, *base_addr = GRUB_EFI_MAX_USABLE_ADDRESS;
         (grub_addr_t) desc < ((grub_addr_t) memory_map + memory_map_size);
         desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))
@@ -145,11 +148,11 @@ index f6aef0ef64..85ad4b4494 100644
  
    grub_free(memory_map);
  
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 04994d5c67..70a0075ec5 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -71,20 +71,25 @@ finalize_params_linux (void)
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index 8742e303d85..ddb27834131 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -182,7 +182,7 @@ finalize_params_linux (void)
  {
    grub_efi_loaded_image_t *loaded_image = NULL;
    int node, retval, len;
@@ -157,29 +160,32 @@ index 04994d5c67..70a0075ec5 100644
 +  grub_err_t err = GRUB_ERR_NONE;
    void *fdt;
  
-   fdt = grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE);
--
-   if (!fdt)
--    goto failure;
-+    {
-+      err = grub_error(GRUB_ERR_BAD_OS, "failed to load FDT");
-+      goto failure;
-+    }
- 
-   node = grub_fdt_find_subnode (fdt, 0, "chosen");
-   if (node < 0)
-     node = grub_fdt_add_subnode (fdt, 0, "chosen");
- 
-   if (node < 1)
--    goto failure;
-+    {
-+      err = grub_error(grub_errno, "failed to load chosen fdt node.");
-+      goto failure;
-+    }
- 
    /* Set initrd info */
-   if (initrd_start && initrd_end > initrd_start)
-@@ -95,15 +100,26 @@ finalize_params_linux (void)
+@@ -191,14 +191,21 @@ finalize_params_linux (void)
+       fdt = grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE);
+ 
+       if (!fdt)
+-       goto failure;
++        {
++          err = grub_error(GRUB_ERR_BAD_OS, "failed to load FDT");
++          goto failure;
++        }
++
+ 
+       node = grub_fdt_find_subnode (fdt, 0, "chosen");
+       if (node < 0)
+        node = grub_fdt_add_subnode (fdt, 0, "chosen");
+ 
+       if (node < 1)
+-       goto failure;
++        {
++          err = grub_error(grub_errno, "failed to load chosen fdt node.");
++          goto failure;
++        }
+ 
+       grub_dprintf ("linux", "Initrd @ %p-%p\n",
+ 		    (void *) initrd_start, (void *) initrd_end);
+@@ -206,15 +213,26 @@ finalize_params_linux (void)
        retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-start",
  				    initrd_start);
        if (retval)
@@ -210,18 +216,16 @@ index 04994d5c67..70a0075ec5 100644
  
    grub_dprintf ("linux", "Installed/updated FDT configuration table @ %p\n",
                  fdt);
-@@ -111,14 +127,20 @@ finalize_params_linux (void)
-   /* Convert command line to UCS-2 */
+@@ -223,7 +241,7 @@ finalize_params_linux (void)
    loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
-   if (!loaded_image)
--    goto failure;
-+    {
+   if (loaded_image == NULL)
+     {
+-      grub_error (GRUB_ERR_BAD_FIRMWARE, "missing loaded_image proto");
 +      err = grub_error(grub_errno, "Failed to install fdt");
-+      goto failure;
-+    }
- 
+       goto failure;
+     }
    loaded_image->load_options_size = len =
-     (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t);
+@@ -231,7 +249,10 @@ finalize_params_linux (void)
    loaded_image->load_options =
      grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
    if (!loaded_image->load_options)
@@ -233,16 +237,16 @@ index 04994d5c67..70a0075ec5 100644
  
    loaded_image->load_options_size =
      2 * grub_utf8_to_utf16 (loaded_image->load_options, len,
-@@ -128,7 +150,7 @@ finalize_params_linux (void)
+@@ -241,7 +262,7 @@ finalize_params_linux (void)
  
  failure:
    grub_fdt_unload();
 -  return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
 +  return err;
  }
+ #endif
  
- static void
-@@ -212,16 +234,28 @@ grub_linux_unload (void)
+@@ -344,16 +365,28 @@ grub_linux_unload (void)
  static void *
  allocate_initrd_mem (int initrd_pages)
  {
@@ -275,5 +279,5 @@ index 04994d5c67..70a0075ec5 100644
 +  grub_dprintf ("linux", "got 0x%016llx\n", (unsigned long long)ret);
 +  return ret;
  }
+ #endif
  
- static grub_err_t
diff --git a/0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch b/0255-arm64-Fix-EFI-loader-kernel-image-allocation.patch
similarity index 67%
rename from 0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch
rename to 0255-arm64-Fix-EFI-loader-kernel-image-allocation.patch
index cc5458cc..61f6d44b 100644
--- a/0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch
+++ b/0255-arm64-Fix-EFI-loader-kernel-image-allocation.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-Date: Mon, 2 Aug 2021 23:10:01 +1000
+Date: Tue, 16 Apr 2024 12:22:54 -0600
 Subject: [PATCH] arm64: Fix EFI loader kernel image allocation
 
 We are currently allocating just enough memory for the file size,
@@ -18,15 +18,14 @@ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Signed-off-by: Peter Jones <pjones@redhat.com>
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/loader/arm64/linux.c | 100 +++++++++++++++++++++++++++--------------
- include/grub/arm/linux.h       |   1 +
- include/grub/arm64/linux.h     |   1 +
- 3 files changed, 68 insertions(+), 34 deletions(-)
+ grub-core/loader/efi/linux.c | 93 +++++++++++++++++++++++++++++++-------------
+ include/grub/efi/efi.h       |  3 +-
+ 2 files changed, 68 insertions(+), 28 deletions(-)
 
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 47f8cf0d84..f18d90bd74 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index ddb27834131..cb9de5565de 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
 @@ -41,6 +41,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
  static grub_dl_t my_mod;
  static int loaded;
@@ -36,7 +35,7 @@ index 47f8cf0d84..f18d90bd74 100644
  static void *kernel_addr;
  static grub_uint64_t kernel_size;
  static grub_uint32_t handover_offset;
-@@ -204,9 +206,8 @@ grub_linux_unload (void)
+@@ -319,9 +321,8 @@ grub_linux_unload (void)
  			 GRUB_EFI_BYTES_TO_PAGES (initrd_end - initrd_start));
    initrd_start = initrd_end = 0;
    grub_free (linux_args);
@@ -45,13 +44,14 @@ index 47f8cf0d84..f18d90bd74 100644
 -			 GRUB_EFI_BYTES_TO_PAGES (kernel_size));
 +  if (kernel_alloc_addr)
 +    grub_efi_free_pages ((grub_addr_t) kernel_alloc_addr, kernel_alloc_pages);
+ #if !defined(__i386__) && !defined(__x86_64__)
    grub_fdt_unload ();
-   return GRUB_ERR_NONE;
- }
-@@ -311,14 +312,35 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ #endif
+@@ -512,12 +513,37 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_errno;
  }
  
++#if !defined(__i386__) && !defined(__x86_64__)
 +static grub_err_t
 +parse_pe_header (void *kernel, grub_uint64_t *total_size,
 +		 grub_uint32_t *entry_offset,
@@ -71,106 +71,96 @@ index 47f8cf0d84..f18d90bd74 100644
 +
 +  return GRUB_ERR_NONE;
 +}
++#endif
 +
  static grub_err_t
  grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  		int argc, char *argv[])
  {
    grub_file_t file = 0;
--  struct linux_arch_kernel_header lh;
--  struct grub_armxx_linux_pe_header *pe;
-   grub_err_t err;
+   struct linux_arch_kernel_header lh;
 +  grub_off_t filelen;
 +  grub_uint32_t align;
 +  void *kernel = NULL;
-   int rc;
+   grub_err_t err;
  
    grub_dl_ref (my_mod);
-@@ -333,40 +355,24 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -548,8 +574,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    if (!file)
      goto fail;
  
 -  kernel_size = grub_file_size (file);
 -
--  if (grub_file_read (file, &lh, sizeof (lh)) < (long) sizeof (lh))
--    return grub_errno;
--
--  if (grub_arch_efi_linux_check_image (&lh) != GRUB_ERR_NONE)
--    goto fail;
--
--  grub_loader_unset();
--
--  grub_dprintf ("linux", "kernel file size: %lld\n", (long long) kernel_size);
--  kernel_addr = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (kernel_size));
--  grub_dprintf ("linux", "kernel numpages: %lld\n",
--		(long long) GRUB_EFI_BYTES_TO_PAGES (kernel_size));
--  if (!kernel_addr)
+   if (grub_arch_efi_linux_load_image_header (file, &lh) != GRUB_ERR_NONE)
+ #if !defined(__i386__) && !defined(__x86_64__)
+     goto fail;
+@@ -570,33 +594,46 @@ fallback:
+     }
+ #endif
+ 
 +  filelen = grub_file_size (file);
 +  kernel = grub_malloc(filelen);
 +  if (!kernel)
-     {
--      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
++    {
 +      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate kernel load buffer"));
-       goto fail;
-     }
- 
--  grub_file_seek (file, 0);
--  if (grub_file_read (file, kernel_addr, kernel_size)
--      < (grub_int64_t) kernel_size)
++      goto fail;
++    }
++
 +  if (grub_file_read (file, kernel, filelen) < (grub_ssize_t)filelen)
-     {
--      if (!grub_errno)
--	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), argv[0]);
++    {
 +      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"),
 +		  argv[0]);
-       goto fail;
-     }
- 
--  grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
--
-   if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
-     {
--      rc = grub_linuxefi_secure_validate (kernel_addr, kernel_size);
-+      rc = grub_linuxefi_secure_validate (kernel, filelen);
-       if (rc <= 0)
- 	{
- 	  grub_error (GRUB_ERR_INVALID_COMMAND,
-@@ -375,8 +381,32 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
- 	}
-     }
- 
--  pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset);
--  handover_offset = pe->opt.entry_addr;
-+  if (grub_arch_efi_linux_check_image (kernel) != GRUB_ERR_NONE)
-+    goto fail;
++      goto fail;
++    }
++
++#if !defined(__i386__) && !defined(__x86_64__)
 +  if (parse_pe_header (kernel, &kernel_size, &handover_offset, &align) != GRUB_ERR_NONE)
 +    goto fail;
 +  grub_dprintf ("linux", "kernel mem size     : %lld\n", (long long) kernel_size);
 +  grub_dprintf ("linux", "kernel entry offset : %d\n", handover_offset);
 +  grub_dprintf ("linux", "kernel alignment    : 0x%x\n", align);
 +
-+  grub_loader_unset();
-+
+   grub_loader_unset();
+ 
+-  grub_dprintf ("linux", "kernel file size: %lld\n", (long long) kernel_size);
+-  kernel_addr = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (kernel_size));
+-  grub_dprintf ("linux", "kernel numpages: %lld\n",
+-		(long long) GRUB_EFI_BYTES_TO_PAGES (kernel_size));
+-  if (!kernel_addr)
 +  kernel_alloc_pages = GRUB_EFI_BYTES_TO_PAGES (kernel_size + align - 1);
 +  kernel_alloc_addr = grub_efi_allocate_any_pages (kernel_alloc_pages);
 +  grub_dprintf ("linux", "kernel numpages: %d\n", kernel_alloc_pages);
 +  if (!kernel_alloc_addr)
-+    {
-+      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
-+      goto fail;
-+    }
+     {
+       grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
+       goto fail;
+     }
+-
+-  grub_file_seek (file, 0);
+-  if (grub_file_read (file, kernel_addr, kernel_size)
+-      < (grub_int64_t) kernel_size)
+-    {
+-      if (!grub_errno)
+-	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), argv[0]);
+-      goto fail;
+-    }
 +  kernel_addr = (void *)ALIGN_UP((grub_uint64_t)kernel_alloc_addr, align);
-+
-+  grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
+ 
+   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
+-
+-#if !defined(__i386__) && !defined(__x86_64__)
+-  struct grub_armxx_linux_pe_header *pe;
+-  pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset);
+-  handover_offset = pe->opt.entry_addr;
 +  grub_memcpy (kernel_addr, kernel, grub_min(filelen, kernel_size));
 +  if (kernel_size > filelen)
 +    grub_memset ((char *)kernel_addr + filelen, 0, kernel_size - filelen);
 +  grub_free(kernel);
 +  kernel = NULL;
+ #endif
  
    cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);
-   linux_args = grub_malloc (cmdline_size);
-@@ -400,6 +430,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -621,6 +658,9 @@ fallback:
      }
  
  fail:
@@ -180,7 +170,7 @@ index 47f8cf0d84..f18d90bd74 100644
    if (file)
      grub_file_close (file);
  
-@@ -412,9 +445,8 @@ fail:
+@@ -633,9 +673,8 @@ fail:
    if (linux_args && !loaded)
      grub_free (linux_args);
  
@@ -192,27 +182,28 @@ index 47f8cf0d84..f18d90bd74 100644
  
    return grub_errno;
  }
-diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
-index b582f67f66..966a5074f5 100644
---- a/include/grub/arm/linux.h
-+++ b/include/grub/arm/linux.h
-@@ -44,6 +44,7 @@ struct grub_arm_linux_pe_header
+diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
+index bff833468ee..c40684821e1 100644
+--- a/include/grub/efi/efi.h
++++ b/include/grub/efi/efi.h
+@@ -20,7 +20,6 @@
+ #ifndef GRUB_EFI_EFI_HEADER
+ #define GRUB_EFI_EFI_HEADER	1
+ 
+-#include <grub/efi/pe32.h>
+ #include <grub/types.h>
+ #include <grub/dl.h>
+ #include <grub/efi/api.h>
+@@ -52,10 +51,12 @@ struct grub_arm64_linux_pe_header
+ };
  
  #if defined(__arm__)
- # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
 +# define GRUB_PE32_PEXX_MAGIC GRUB_PE32_PE32_MAGIC
- # define linux_arch_kernel_header linux_arm_kernel_header
  # define grub_armxx_linux_pe_header grub_arm_linux_pe_header
  #endif
-diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
-index ea030312df..422bf2bf24 100644
---- a/include/grub/arm64/linux.h
-+++ b/include/grub/arm64/linux.h
-@@ -48,6 +48,7 @@ struct grub_arm64_linux_pe_header
  
  #if defined(__aarch64__)
- # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
 +# define GRUB_PE32_PEXX_MAGIC GRUB_PE32_PE64_MAGIC
- # define linux_arch_kernel_header linux_arm64_kernel_header
  # define grub_armxx_linux_pe_header grub_arm64_linux_pe_header
  #endif
+ 
diff --git a/0260-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch b/0256-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch
similarity index 68%
rename from 0260-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch
rename to 0256-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch
index ef51214f..222a13c5 100644
--- a/0260-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch
+++ b/0256-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Fri, 25 Mar 2022 15:40:12 -0400
+Date: Tue, 16 Apr 2024 12:51:50 -0600
 Subject: [PATCH] pe: add the DOS header struct and fix some bad naming.
 
 In order to properly validate a loaded kernel's support for being loaded
@@ -16,17 +16,17 @@ define, and adds defines for the actual PE magic.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/loader/arm64/linux.c |  2 +-
- include/grub/efi/pe32.h        | 28 ++++++++++++++++++++++++++--
+ grub-core/loader/efi/linux.c |  2 +-
+ include/grub/efi/pe32.h      | 28 ++++++++++++++++++++++++++--
  2 files changed, 27 insertions(+), 3 deletions(-)
 
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index d2af47c2c0..cc67f43906 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -58,7 +58,7 @@ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
-   if (lh->magic != GRUB_LINUX_ARMXX_MAGIC_SIGNATURE)
-     return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index cb9de5565de..ecaa8c18c4d 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -138,7 +138,7 @@ grub_arch_efi_linux_load_image_header (grub_file_t file,
+   if (grub_file_read (file, lh, sizeof (*lh)) < (grub_ssize_t) sizeof (*lh))
+     return grub_error(GRUB_ERR_FILE_READ_ERROR, "failed to read Linux image header");
  
 -  if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC)
 +  if ((lh->code0 & 0xffff) != GRUB_DOS_MAGIC)
@@ -34,7 +34,7 @@ index d2af47c2c0..cc67f43906 100644
  		       N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));
  
 diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
-index a43adf2746..2a5e1ee003 100644
+index a39743396dc..13fdd0e7d98 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
 @@ -46,7 +46,30 @@
@@ -67,15 +67,15 @@ index a43adf2746..2a5e1ee003 100644
 +  grub_uint32_t lfanew;
 +};
  
- /* According to the spec, the minimal alignment is 512 bytes...
-    But some examples (such as EFI drivers in the Intel
-@@ -280,7 +303,8 @@ struct grub_pe32_section_table
- 
- 
+ struct grub_msdos_image_header
+ {
+@@ -293,7 +316,8 @@ struct grub_pe32_section_table
+ #define GRUB_PE32_SCN_MEM_READ			0x40000000
+ #define GRUB_PE32_SCN_MEM_WRITE			0x80000000
  
 -#define GRUB_PE32_SIGNATURE_SIZE 4
 +#define GRUB_PE32_SIGNATURE_SIZE		4
 +#define GRUB_PE32_SIGNATURE			"PE\0\0"
  
- struct grub_pe32_header
- {
+ #if GRUB_TARGET_SIZEOF_VOID_P == 8
+ #define GRUB_PE32_NATIVE_MAGIC			GRUB_PE32_PE64_MAGIC
diff --git a/0257-Correct-BSS-zeroing-on-aarch64.patch b/0257-Correct-BSS-zeroing-on-aarch64.patch
new file mode 100644
index 00000000..232393f7
--- /dev/null
+++ b/0257-Correct-BSS-zeroing-on-aarch64.patch
@@ -0,0 +1,95 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Linton <jeremy.linton@arm.com>
+Date: Tue, 16 Apr 2024 13:26:55 -0600
+Subject: [PATCH] Correct BSS zeroing on aarch64
+
+The aarch64 loader doesn't use efi bootservices, and
+therefor it has a very minimal loader which makes a lot
+of assumptions about the kernel layout. With the ZBOOT
+changes, the layout has changed a bit and we not should
+really be parsing the PE sections to determine how much
+data to copy, otherwise the BSS won't be setup properly.
+
+This code still makes a lot of assumptions about the
+the kernel layout, so its far from ideal, but it works.
+
+Resolves: rhbz#2125069
+
+Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
+---
+ grub-core/loader/efi/linux.c | 27 ++++++++++++++++++++++-----
+ 1 file changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index ecaa8c18c4d..55c5c8600d4 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -517,10 +517,12 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ static grub_err_t
+ parse_pe_header (void *kernel, grub_uint64_t *total_size,
+ 		 grub_uint32_t *entry_offset,
+-		 grub_uint32_t *alignment)
++		 grub_uint32_t *alignment, grub_uint32_t *code_size)
+ {
+   struct linux_arch_kernel_header *lh = kernel;
+   struct grub_armxx_linux_pe_header *pe;
++  grub_uint16_t i;
++  struct grub_pe32_section_table *sections;
+ 
+   pe = (void *)((unsigned long)kernel + lh->hdr_offset);
+ 
+@@ -530,6 +532,19 @@ parse_pe_header (void *kernel, grub_uint64_t *total_size,
+   *total_size   = pe->opt.image_size;
+   *entry_offset = pe->opt.entry_addr;
+   *alignment    = pe->opt.section_alignment;
++  *code_size    = pe->opt.section_alignment;
++
++  sections = (struct grub_pe32_section_table *) ((char *)&pe->opt +
++						 pe->coff.optional_header_size);
++  grub_dprintf ("linux", "num_sections     : %d\n",  pe->coff.num_sections );
++  for (i = 0 ; i < pe->coff.num_sections; i++)
++    {
++      grub_dprintf ("linux", "raw_size   : %lld\n",
++		    (long long) sections[i].raw_data_size);
++      grub_dprintf ("linux", "virt_size  : %lld\n",
++		    (long long) sections[i].virtual_size);
++      *code_size += sections[i].raw_data_size;
++    }
+ 
+   return GRUB_ERR_NONE;
+ }
+@@ -543,6 +558,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   struct linux_arch_kernel_header lh;
+   grub_off_t filelen;
+   grub_uint32_t align;
++  grub_uint32_t code_size;
+   void *kernel = NULL;
+   grub_err_t err;
+ 
+@@ -610,11 +626,12 @@ fallback:
+     }
+ 
+ #if !defined(__i386__) && !defined(__x86_64__)
+-  if (parse_pe_header (kernel, &kernel_size, &handover_offset, &align) != GRUB_ERR_NONE)
++  if (parse_pe_header (kernel, &kernel_size, &handover_offset, &align, &code_size) != GRUB_ERR_NONE)
+     goto fail;
+   grub_dprintf ("linux", "kernel mem size     : %lld\n", (long long) kernel_size);
+   grub_dprintf ("linux", "kernel entry offset : %d\n", handover_offset);
+   grub_dprintf ("linux", "kernel alignment    : 0x%x\n", align);
++  grub_dprintf ("linux", "kernel size         : 0x%x\n", code_size);
+ 
+   grub_loader_unset();
+ 
+@@ -629,9 +646,9 @@ fallback:
+   kernel_addr = (void *)ALIGN_UP((grub_uint64_t)kernel_alloc_addr, align);
+ 
+   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
+-  grub_memcpy (kernel_addr, kernel, grub_min(filelen, kernel_size));
+-  if (kernel_size > filelen)
+-    grub_memset ((char *)kernel_addr + filelen, 0, kernel_size - filelen);
++  grub_memcpy (kernel_addr, kernel, grub_min(code_size, kernel_size));
++  if (kernel_size > code_size)
++    grub_memset ((char *)kernel_addr + code_size, 0, kernel_size - code_size);
+   grub_free(kernel);
+   kernel = NULL;
+ #endif
diff --git a/0258-arm64-Use-proper-memory-type-for-kernel-allocation.patch b/0258-arm64-Use-proper-memory-type-for-kernel-allocation.patch
new file mode 100644
index 00000000..453ee578
--- /dev/null
+++ b/0258-arm64-Use-proper-memory-type-for-kernel-allocation.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Tue, 16 Apr 2024 14:21:49 -0600
+Subject: [PATCH] arm64: Use proper memory type for kernel allocation
+
+Currently, the kernel pages are allocated with type EFI_LOADER_DATA.
+While the vast majority of systems will happily execute code from those
+pages (i.e. don't care about memory protection), the Microsoft Surface
+Pro X stalls, as this memory is not designated as "executable".
+
+Therefore, allocate the kernel pages as EFI_LOADER_CODE to request
+memory that is actually executable.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+---
+ grub-core/loader/efi/linux.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index 55c5c8600d4..d9ded7c4f12 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -25,7 +25,9 @@
+ #include <grub/loader.h>
+ #include <grub/mm.h>
+ #include <grub/types.h>
++#include <grub/efi/api.h>
+ #include <grub/efi/efi.h>
++#include <grub/cpu/efi/memory.h>
+ #include <grub/efi/fdtload.h>
+ #include <grub/efi/memory.h>
+ #include <grub/efi/linux.h>
+@@ -636,7 +638,10 @@ fallback:
+   grub_loader_unset();
+ 
+   kernel_alloc_pages = GRUB_EFI_BYTES_TO_PAGES (kernel_size + align - 1);
+-  kernel_alloc_addr = grub_efi_allocate_any_pages (kernel_alloc_pages);
++  kernel_alloc_addr = grub_efi_allocate_pages_real (GRUB_EFI_MAX_USABLE_ADDRESS,
++						    kernel_alloc_pages,
++						    GRUB_EFI_ALLOCATE_MAX_ADDRESS,
++						    GRUB_EFI_LOADER_CODE);
+   grub_dprintf ("linux", "kernel numpages: %d\n", kernel_alloc_pages);
+   if (!kernel_alloc_addr)
+     {
diff --git a/0259-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch b/0259-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch
new file mode 100644
index 00000000..af24bccb
--- /dev/null
+++ b/0259-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nicolas Frayer <nfrayer@redhat.com>
+Date: Tue, 19 Dec 2023 16:52:05 +0100
+Subject: [PATCH] normal: Remove grub_env_set prefix in grub_try_normal_prefix
+
+Commit de735a453aa35 added a grub_env_set where the prefix contains
+the arch name in the pathname. This create issues when trying to
+load modules using this prefix as the pathname contains a "doubled"
+arch name in it (ie .../powerpc-ieee1275/powerpc-ieee1275/).
+
+Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ grub-core/normal/main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index 803b9656d36..26872ce9477 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -372,7 +372,6 @@ grub_try_normal_prefix (const char *prefix)
+            file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
+            if (file)
+              {
+-               grub_env_set ("prefix", prefix);
+                grub_file_close (file);
+                err = GRUB_ERR_NONE;
+              }
diff --git a/0260-fs-xfs-Handle-non-continuous-data-blocks-in-director.patch b/0260-fs-xfs-Handle-non-continuous-data-blocks-in-director.patch
new file mode 100644
index 00000000..2198ce3c
--- /dev/null
+++ b/0260-fs-xfs-Handle-non-continuous-data-blocks-in-director.patch
@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jon DeVree <nuxi@vault24.org>
+Date: Sun, 11 Feb 2024 10:34:58 -0500
+Subject: [PATCH] fs/xfs: Handle non-continuous data blocks in directory
+ extents
+
+The directory extent list does not have to be a continuous list of data
+blocks. When GRUB tries to read a non-existant member of the list,
+grub_xfs_read_file() will return a block of zero'ed memory. Checking for
+a zero'ed magic number is sufficient to skip this non-existant data block.
+
+Prior to commit 07318ee7e (fs/xfs: Fix XFS directory extent parsing)
+this was handled as a subtle side effect of reading the (non-existant)
+tail data structure. Since the block was zero'ed the computation of the
+number of directory entries in the block would return 0 as well.
+
+Fixes: 07318ee7e (fs/xfs: Fix XFS directory extent parsing)
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2254370
+
+Signed-off-by: Jon DeVree <nuxi@vault24.org>
+Reviewed-By: Vladimir Serbinenko <phcoder@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/xfs.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index bc2224dbb46..8e02ab4a301 100644
+--- a/grub-core/fs/xfs.c
++++ b/grub-core/fs/xfs.c
+@@ -902,6 +902,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
+ 					grub_xfs_first_de(dir->data, dirblock);
+ 	    int entries = -1;
+ 	    char *end = dirblock + dirblk_size;
++	    grub_uint32_t magic;
+ 
+ 	    numread = grub_xfs_read_file (dir, 0, 0,
+ 					  blk << dirblk_log2,
+@@ -912,6 +913,15 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
+ 	        return 0;
+ 	      }
+ 
++	    /*
++	     * If this data block isn't actually part of the extent list then
++	     * grub_xfs_read_file() returns a block of zeros. So, if the magic
++	     * number field is all zeros then this block should be skipped.
++	     */
++	    magic = *(grub_uint32_t *)(void *) dirblock;
++	    if (!magic)
++	      continue;
++
+ 	    /*
+ 	     * Leaf and tail information are only in the data block if the number
+ 	     * of extents is 1.
diff --git a/0261-Ignore-warnings-for-incompatible-types.patch b/0261-Ignore-warnings-for-incompatible-types.patch
new file mode 100644
index 00000000..ad7dacb9
--- /dev/null
+++ b/0261-Ignore-warnings-for-incompatible-types.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nicolas Frayer <nfrayer@redhat.com>
+Date: Wed, 17 Jan 2024 21:15:14 +0100
+Subject: [PATCH] Ignore warnings for incompatible types
+
+Add -Wno-incompatible-pointer-types to ignore warnings for incompatible
+types
+
+Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d223fe3ef6e..4788f3d6adc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2166,8 +2166,8 @@ if test x"$enable_wextra" != xno ; then
+   HOST_CFLAGS="$HOST_CFLAGS -Wextra"
+ fi
+ 
+-TARGET_CFLAGS="$TARGET_CFLAGS -Werror=trampolines -fno-trampolines"
+-HOST_CFLAGS="$HOST_CFLAGS -Werror=trampolines -fno-trampolines"
++TARGET_CFLAGS="$TARGET_CFLAGS -Werror=trampolines -fno-trampolines -Wno-incompatible-pointer-types"
++HOST_CFLAGS="$HOST_CFLAGS -Werror=trampolines -fno-trampolines -Wno-incompatible-pointer-types"
+ 
+ TARGET_CPP="$TARGET_CC -E"
+ TARGET_CCAS=$TARGET_CC
diff --git a/0262-cmd-search-Rework-of-CVE-2023-4001-fix.patch b/0262-cmd-search-Rework-of-CVE-2023-4001-fix.patch
new file mode 100644
index 00000000..c63fc3e8
--- /dev/null
+++ b/0262-cmd-search-Rework-of-CVE-2023-4001-fix.patch
@@ -0,0 +1,180 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nicolas Frayer <nfrayer@redhat.com>
+Date: Thu, 16 May 2024 10:58:32 +0200
+Subject: [PATCH] cmd/search: Rework of CVE-2023-4001 fix
+
+The initial fix implemented a new flag that forces the grub cfg
+stub to be located on the same disk as grub. This created several
+issues such as RAID machines not being able to boot as their
+partition names under grub were different from the partition where
+grub is located. It also simply means that any machines with the
+/boot partition located on a disk other than the one containing grub
+won't boot.
+This commit denies booting if the grub cfg stub is located on a USB
+drive with a duplicated UUID (UUID being the same as the partition
+containing the actual grub cfg stub)
+
+Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ grub-core/commands/search.c | 134 +++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 126 insertions(+), 8 deletions(-)
+
+diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
+index db8692ffbfb..9dd937e6df4 100644
+--- a/grub-core/commands/search.c
++++ b/grub-core/commands/search.c
+@@ -30,6 +30,8 @@
+ #include <grub/i18n.h>
+ #include <grub/disk.h>
+ #include <grub/partition.h>
++#include <grub/efi/api.h>
++#include <grub/time.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -54,6 +56,100 @@ struct search_ctx
+   int is_cache;
+ };
+ 
++static int
++is_device_usb (const char *name)
++{
++  int ret = 0;
++
++  grub_device_t dev = grub_device_open(name);
++
++  if (dev)
++    {
++      struct grub_efidisk_data
++      {
++        grub_efi_handle_t handle;
++        grub_efi_device_path_t *device_path;
++        grub_efi_device_path_t *last_device_path;
++        grub_efi_block_io_t *block_io;
++        struct grub_efidisk_data *next;
++      };
++
++      if (dev->disk && dev->disk->data)
++        {
++        struct grub_efidisk_data *dp = dev->disk->data;
++
++        if ( GRUB_EFI_DEVICE_PATH_TYPE (dp->last_device_path) == GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE &&
++          GRUB_EFI_DEVICE_PATH_SUBTYPE (dp->last_device_path) == GRUB_EFI_USB_DEVICE_PATH_SUBTYPE)
++          {
++            ret = 1;
++          }
++        }
++      grub_device_close(dev);
++    }
++
++  return ret;
++}
++
++static int
++get_device_uuid(const char *name, char** quid)
++{
++  int ret = 0;
++
++  grub_device_t dev_part = grub_device_open(name);
++
++  if (dev_part)
++    {
++      grub_fs_t fs;
++
++      fs = grub_fs_probe (dev_part);
++
++#ifdef DO_SEARCH_FS_UUID
++#define read_fn fs_uuid
++#else
++#define read_fn fs_label
++#endif
++      if (fs && fs->read_fn)
++        {
++          fs->read_fn (dev_part, quid);
++
++          if (grub_errno == GRUB_ERR_NONE && *quid)
++            {
++	      ret = 1;
++            }
++
++        }
++        grub_device_close (dev_part);
++    }
++
++  return ret;
++}
++struct uuid_context {
++  char* name;
++  char* uuid;
++};
++
++static int
++check_for_duplicate (const char *name, void *data)
++{
++  int ret = 0;
++  struct uuid_context * uuid_ctx = (struct uuid_context *)data;
++  char *quid = 0;
++
++  get_device_uuid(name, &quid);
++
++  if (quid == NULL)
++    return 0;
++
++  if (!grub_strcasecmp(quid, uuid_ctx->uuid) && grub_strcasecmp(name, uuid_ctx->name))
++    {
++      ret = 1;
++    }
++
++  grub_free(quid);
++
++  return ret;
++}
++
+ /* Helper for FUNC_NAME.  */
+ static int
+ iterate_device (const char *name, void *data)
+@@ -106,14 +202,36 @@ iterate_device (const char *name, void *data)
+             grub_str_sep (name, name_disk, ',', rem_2);
+             if (root_disk != NULL && *root_disk != '\0' &&
+     	        name_disk != NULL && *name_disk != '\0')
+-              if (grub_strcmp(root_disk, name_disk) != 0)
+-                {
+-                  grub_free (root_disk);
+-                  grub_free (name_disk);
+-                  grub_free (rem_1);
+-                  grub_free (rem_2);
+-                  return 0;
+-                }
++              {
++                grub_device_t dev, dev_part;
++
++                if (is_device_usb(name) && !is_device_usb(root_dev))
++                  {
++                    char *quid_name = NULL;
++                    int longlist = 0;
++                    struct uuid_context uuid_ctx;
++                    int ret = 0;
++
++                    get_device_uuid(name, &quid_name);
++                    if (!grub_strcmp(quid_name, ctx->key))
++                      {
++                        uuid_ctx.name = name;
++                        uuid_ctx.uuid = quid_name;
++
++                        ret = grub_device_iterate (check_for_duplicate, &uuid_ctx);
++
++                        if (ret)
++                          {
++                            grub_printf("Duplicated media UUID found, rebooting ...\n");
++                            grub_sleep(10);
++                            grub_reboot();
++                          }
++                      }
++
++                    if (quid_name) grub_free (quid_name);
++
++                  }
++              }
+ 	  }
+         grub_free (root_disk);
+         grub_free (name_disk);
diff --git a/0263-loader-efi-linux.c-read-the-kernel-image-before-head.patch b/0263-loader-efi-linux.c-read-the-kernel-image-before-head.patch
new file mode 100644
index 00000000..e8dc2231
--- /dev/null
+++ b/0263-loader-efi-linux.c-read-the-kernel-image-before-head.patch
@@ -0,0 +1,69 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 29 May 2024 17:35:35 -0600
+Subject: [PATCH] loader/efi/linux.c: read the kernel image before header
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/loader/efi/linux.c | 34 ++++++++++++++++++++--------------
+ 1 file changed, 20 insertions(+), 14 deletions(-)
+
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index d9ded7c4f12..3ada50ed969 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -559,6 +559,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   grub_file_t file = 0;
+   struct linux_arch_kernel_header lh;
+   grub_off_t filelen;
++  grub_off_t filereadlen;
+   grub_uint32_t align;
+   grub_uint32_t code_size;
+   void *kernel = NULL;
+@@ -592,6 +593,25 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   if (!file)
+     goto fail;
+ 
++  filelen = grub_file_size (file);
++  kernel = grub_malloc(filelen);
++  if (!kernel)
++    {
++      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate kernel load buffer"));
++      goto fail;
++    }
++
++  filereadlen = grub_file_read (file, kernel, filelen);
++  grub_dprintf ("linux", "filelen     : %lld\n", (long long) filelen);
++  grub_dprintf ("linux", "filereadlen : %lld\n", (long long) filereadlen);
++
++  if (filereadlen < filelen)
++    {
++      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"),
++		  argv[0]);
++      goto fail;
++    }
++
+   if (grub_arch_efi_linux_load_image_header (file, &lh) != GRUB_ERR_NONE)
+ #if !defined(__i386__) && !defined(__x86_64__)
+     goto fail;
+@@ -612,20 +632,6 @@ fallback:
+     }
+ #endif
+ 
+-  filelen = grub_file_size (file);
+-  kernel = grub_malloc(filelen);
+-  if (!kernel)
+-    {
+-      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate kernel load buffer"));
+-      goto fail;
+-    }
+-
+-  if (grub_file_read (file, kernel, filelen) < (grub_ssize_t)filelen)
+-    {
+-      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"),
+-		  argv[0]);
+-      goto fail;
+-    }
+ 
+ #if !defined(__i386__) && !defined(__x86_64__)
+   if (parse_pe_header (kernel, &kernel_size, &handover_offset, &align, &code_size) != GRUB_ERR_NONE)
diff --git a/0265-nx-set-attrs-in-our-kernel-loaders.patch b/0264-nx-set-attrs-in-our-kernel-loaders.patch
similarity index 77%
rename from 0265-nx-set-attrs-in-our-kernel-loaders.patch
rename to 0264-nx-set-attrs-in-our-kernel-loaders.patch
index 514df1fe..6b0aa1d2 100644
--- a/0265-nx-set-attrs-in-our-kernel-loaders.patch
+++ b/0264-nx-set-attrs-in-our-kernel-loaders.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
-Date: Tue, 22 Mar 2022 10:57:07 -0400
+Date: Wed, 3 Jul 2024 17:54:41 -0600
 Subject: [PATCH] nx: set attrs in our kernel loaders
 
 For NX, our kernel loaders need to set write and execute page
@@ -12,23 +12,22 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 [rharwood: fix stack_attrs undefined, fix aarch64 callsites]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/kern/efi/mm.c            |  77 +++++++++++++++++
- grub-core/loader/arm64/linux.c     |  16 +++-
- grub-core/loader/arm64/xen_boot.c  |   4 +-
+ grub-core/kern/efi/mm.c            |  79 ++++++++++++++++
+ grub-core/loader/arm64/xen_boot.c  |   5 +-
  grub-core/loader/efi/chainloader.c |  11 +++
- grub-core/loader/efi/linux.c       | 164 ++++++++++++++++++++++++++++++++++++-
- grub-core/loader/i386/efi/linux.c  |  26 +++++-
- grub-core/loader/i386/linux.c      |   5 ++
+ grub-core/loader/efi/linux.c       | 188 ++++++++++++++++++++++++++++++++++---
+ grub-core/loader/i386/efi/linux.c  |  26 ++++-
+ grub-core/loader/i386/linux.c      |   5 +
  include/grub/efi/efi.h             |   6 +-
  include/grub/efi/linux.h           |  16 +++-
  include/grub/efi/pe32.h            |   2 +
- 10 files changed, 312 insertions(+), 15 deletions(-)
+ 9 files changed, 319 insertions(+), 19 deletions(-)
 
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 2c33758ed7..e460b072e6 100644
+index 560b859b6f4..464fe1c3c01 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
-@@ -610,6 +610,81 @@ print_memory_map (grub_efi_memory_descriptor_t *memory_map,
+@@ -603,6 +603,83 @@ print_memory_map (grub_efi_memory_descriptor_t *memory_map,
  }
  #endif
  
@@ -107,11 +106,13 @@ index 2c33758ed7..e460b072e6 100644
 +    }
 +}
 +
- void
- grub_efi_mm_init (void)
++
++
+ static grub_err_t
+ grub_efi_mm_add_regions (grub_size_t required_bytes, unsigned int flags)
  {
-@@ -623,6 +698,8 @@ grub_efi_mm_init (void)
-   grub_efi_uint64_t required_pages;
+@@ -615,6 +692,8 @@ grub_efi_mm_add_regions (grub_size_t required_bytes, unsigned int flags)
+   grub_err_t err;
    int mm_status;
  
 +  grub_nx_init ();
@@ -119,66 +120,11 @@ index 2c33758ed7..e460b072e6 100644
    /* Prepare a memory region to store two memory maps.  */
    memory_map = grub_efi_allocate_any_pages (2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
    if (! memory_map)
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index cc67f43906..de85583487 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -172,7 +172,8 @@ free_params (void)
- }
- 
- grub_err_t
--grub_arch_efi_linux_boot_image (grub_addr_t addr, char *args)
-+grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args,
-+				int nx_supported)
- {
-   grub_err_t retval;
- 
-@@ -182,7 +183,8 @@ grub_arch_efi_linux_boot_image (grub_addr_t addr, char *args)
- 
-   grub_dprintf ("linux", "linux command line: '%s'\n", args);
- 
--  retval = grub_efi_linux_boot ((char *)addr, handover_offset, (void *)addr);
-+  retval = grub_efi_linux_boot (addr, size, handover_offset,
-+				(void *)addr, nx_supported);
- 
-   /* Never reached... */
-   free_params();
-@@ -192,7 +194,10 @@ grub_arch_efi_linux_boot_image (grub_addr_t addr, char *args)
- static grub_err_t
- grub_linux_boot (void)
- {
--  return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr, linux_args));
-+  return grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr,
-+					(grub_size_t)kernel_size,
-+					linux_args,
-+					0);
- }
- 
- static grub_err_t
-@@ -340,6 +345,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   grub_off_t filelen;
-   grub_uint32_t align;
-   void *kernel = NULL;
-+  int nx_supported = 1;
- 
-   grub_dl_ref (my_mod);
- 
-@@ -376,6 +382,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   grub_dprintf ("linux", "kernel entry offset : %d\n", handover_offset);
-   grub_dprintf ("linux", "kernel alignment    : 0x%x\n", align);
- 
-+  err = grub_efi_check_nx_image_support((grub_addr_t)kernel, filelen, &nx_supported);
-+  if (err != GRUB_ERR_NONE)
-+    goto fail;
-+
-   grub_loader_unset();
- 
-   kernel_alloc_pages = GRUB_EFI_BYTES_TO_PAGES (kernel_size + align - 1);
 diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
-index d9b7a9ba40..6e7e920416 100644
+index 9838a0f878b..5d7c8603db9 100644
 --- a/grub-core/loader/arm64/xen_boot.c
 +++ b/grub-core/loader/arm64/xen_boot.c
-@@ -266,7 +266,9 @@ xen_boot (void)
+@@ -252,7 +252,10 @@ xen_boot (void)
      return err;
  
    return grub_arch_efi_linux_boot_image (xen_hypervisor->start,
@@ -186,14 +132,15 @@ index d9b7a9ba40..6e7e920416 100644
 +                                         xen_hypervisor->size,
 +                                         xen_hypervisor->cmdline,
 +                                         0);
++
  }
  
  static void
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index fb874f1855..dd31ac9bb3 100644
+index badff5e50b5..5cd6f6a5993 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -1070,6 +1070,17 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -1078,6 +1078,17 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -212,18 +159,18 @@ index fb874f1855..dd31ac9bb3 100644
    if (fsize >= (grub_ssize_t) sizeof (struct grub_macho_fat_header))
      {
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index 9265cf4200..277f352e0c 100644
+index 3ada50ed969..fe48001442a 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
-@@ -26,16 +26,127 @@
+@@ -96,16 +96,127 @@ static grub_efi_load_file2_t initrd_lf2 = {
  
  #pragma GCC diagnostic push
  #pragma GCC diagnostic ignored "-Wcast-align"
 +#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
 +
 +grub_err_t
-+grub_efi_check_nx_image_support (grub_addr_t kernel_addr,
-+				 grub_size_t kernel_size,
++grub_efi_check_nx_image_support (grub_addr_t k_add,
++				 grub_size_t k_size,
 +				 int *nx_supported)
 +{
 +  struct grub_dos_header *doshdr;
@@ -235,19 +182,19 @@ index 9265cf4200..277f352e0c 100644
 +  int image_is_compatible = 0;
 +  int is_64_bit;
 +
-+  if (kernel_size < sz)
++  if (k_size < sz)
 +    return grub_error (GRUB_ERR_BAD_OS, N_("kernel is too small"));
 +
-+  doshdr = (void *)kernel_addr;
++  doshdr = (void *)k_add;
 +
 +  if ((doshdr->magic & 0xffff) != GRUB_DOS_MAGIC)
 +    return grub_error (GRUB_ERR_BAD_OS, N_("kernel DOS magic is invalid"));
 +
 +  sz = doshdr->lfanew + sizeof (*pe32);
-+  if (kernel_size < sz)
++  if (k_size < sz)
 +    return grub_error (GRUB_ERR_BAD_OS, N_("kernel is too small"));
 +
-+  pe32 = (struct grub_pe32_header_32 *)(kernel_addr + doshdr->lfanew);
++  pe32 = (struct grub_pe32_header_32 *)(k_add + doshdr->lfanew);
 +  pe64 = (struct grub_pe32_header_64 *)pe32;
 +
 +  if (grub_memcmp (pe32->signature, GRUB_PE32_SIGNATURE,
@@ -275,7 +222,7 @@ index 9265cf4200..277f352e0c 100644
 +  if (is_64_bit)
 +    {
 +      sz = doshdr->lfanew + sizeof (*pe64);
-+      if (kernel_size < sz)
++      if (k_size < sz)
 +	return grub_error (GRUB_ERR_BAD_OS, N_("kernel is too small"));
 +
 +      if (pe64->optional_header.dll_characteristics & GRUB_PE32_NX_COMPAT)
@@ -295,7 +242,7 @@ index 9265cf4200..277f352e0c 100644
 +grub_efi_check_nx_required (int *nx_required)
 +{
 +  grub_efi_status_t status;
-+  grub_efi_guid_t guid = GRUB_EFI_SHIM_LOCK_GUID;
++  grub_guid_t guid = GRUB_EFI_SHIM_LOCK_GUID;
 +  grub_size_t mok_policy_sz = 0;
 +  char *mok_policy = NULL;
 +  grub_uint32_t mok_policy_attrs = 0;
@@ -325,10 +272,10 @@ index 9265cf4200..277f352e0c 100644
  typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
  
  grub_err_t
--grub_efi_linux_boot (void *kernel_addr, grub_off_t handover_offset,
+-grub_efi_linux_boot (void *kernel_address, grub_off_t ho_offset,
 -		     void *kernel_params)
-+grub_efi_linux_boot (grub_addr_t kernel_addr, grub_size_t kernel_size,
-+		     grub_off_t handover_offset, void *kernel_params,
++grub_efi_linux_boot (grub_addr_t k_address, grub_size_t k_size,
++		     grub_off_t h_offset, void *k_params,
 +		     int nx_supported)
  {
    grub_efi_loaded_image_t *loaded_image = NULL;
@@ -345,18 +292,20 @@ index 9265cf4200..277f352e0c 100644
  
  #ifdef __x86_64__
    offset = 512;
-@@ -48,12 +159,57 @@ grub_efi_linux_boot (void *kernel_addr, grub_off_t handover_offset,
+@@ -118,14 +229,59 @@ grub_efi_linux_boot (void *kernel_address, grub_off_t ho_offset,
     */
    loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
    if (loaded_image)
--    loaded_image->image_base = kernel_addr;
-+    loaded_image->image_base = (void *)kernel_addr;
+-    loaded_image->image_base = kernel_address;
++    loaded_image->image_base = (void *)k_address;
    else
      grub_dprintf ("linux", "Loaded Image base address could not be set\n");
  
-   grub_dprintf ("linux", "kernel_addr: %p handover_offset: %p params: %p\n",
--		kernel_addr, (void *)(grub_efi_uintn_t)handover_offset, kernel_params);
-+		(void *)kernel_addr, (void *)handover_offset, kernel_params);
+   grub_dprintf ("linux", "kernel_address: %p handover_offset: %p params: %p\n",
+-		kernel_address, (void *)(grub_efi_uintn_t)ho_offset, kernel_params);
+-  hf = (handover_func)((char *)kernel_address + ho_offset + offset);
+-  hf (grub_efi_image_handle, grub_efi_system_table, kernel_params);
++		(void *)k_address, (void *)h_offset, k_params);
 +
 +
 +  if (nx_required && !nx_supported)
@@ -371,14 +320,14 @@ index 9265cf4200..277f352e0c 100644
 +    }
 +
 +  grub_dprintf ("nx", "Setting attributes for 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" to r%cx\n",
-+		    kernel_addr, kernel_addr + kernel_size - 1,
++		    k_address, k_address + k_size - 1,
 +		    (kernel_set_attrs & GRUB_MEM_ATTR_W) ? 'w' : '-');
-+  grub_update_mem_attrs (kernel_addr, kernel_size,
++  grub_update_mem_attrs (k_address, k_size,
 +			 kernel_set_attrs, kernel_clear_attrs);
 +
-+  grub_get_mem_attrs (kernel_addr, 4096, &attrs);
++  grub_get_mem_attrs (k_address, 4096, &attrs);
 +  grub_dprintf ("nx", "permissions for 0x%"PRIxGRUB_ADDR" are %s%s%s\n",
-+		(grub_addr_t)kernel_addr,
++		(grub_addr_t)k_address,
 +		(attrs & GRUB_MEM_ATTR_R) ? "r" : "-",
 +		(attrs & GRUB_MEM_ATTR_W) ? "w" : "-",
 +		(attrs & GRUB_MEM_ATTR_X) ? "x" : "-");
@@ -402,11 +351,75 @@ index 9265cf4200..277f352e0c 100644
 +  asm volatile ("cli");
 +#endif
 +
-   hf = (handover_func)((char *)kernel_addr + handover_offset + offset);
-   hf (grub_efi_image_handle, grub_efi_system_table, kernel_params);
++  hf = (handover_func)((char *)k_address + h_offset + offset);
++  hf (grub_efi_image_handle, grub_efi_system_table, k_params);
  
+   return GRUB_ERR_BUG;
+ }
+@@ -287,13 +443,15 @@ free_params (void)
+ }
+ 
+ grub_err_t
+-grub_arch_efi_linux_boot_image (grub_addr_t addr, char *args)
++grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args,
++				int nx_supported)
+ {
+   grub_err_t retval;
+ 
+   grub_dprintf ("linux", "linux command line: '%s'\n", args);
+ 
+-  retval = grub_efi_linux_boot ((char *)addr, handover_offset, (void *)addr);
++  retval = grub_efi_linux_boot (addr, size, handover_offset,
++				(void *)addr, nx_supported);
+ 
+   /* Never reached... */
+   free_params();
+@@ -308,7 +466,10 @@ grub_linux_boot (void)
+     return grub_errno;
+ #endif
+ 
+-  return grub_arch_efi_linux_boot_image ((grub_addr_t) kernel_addr, linux_args);
++  return grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr,
++					(grub_size_t)kernel_size,
++					linux_args,
++					0);
+ }
+ 
+ static grub_err_t
+@@ -560,10 +721,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   struct linux_arch_kernel_header lh;
+   grub_off_t filelen;
+   grub_off_t filereadlen;
+-  grub_uint32_t align;
+-  grub_uint32_t code_size;
+   void *kernel = NULL;
+   grub_err_t err;
++  int nx_supported = 1;
+ 
+   grub_dl_ref (my_mod);
+ 
+@@ -634,6 +794,8 @@ fallback:
+ 
+ 
+ #if !defined(__i386__) && !defined(__x86_64__)
++  grub_uint32_t align;
++  grub_uint32_t code_size;
+   if (parse_pe_header (kernel, &kernel_size, &handover_offset, &align, &code_size) != GRUB_ERR_NONE)
+     goto fail;
+   grub_dprintf ("linux", "kernel mem size     : %lld\n", (long long) kernel_size);
+@@ -641,6 +803,10 @@ fallback:
+   grub_dprintf ("linux", "kernel alignment    : 0x%x\n", align);
+   grub_dprintf ("linux", "kernel size         : 0x%x\n", code_size);
+ 
++  err = grub_efi_check_nx_image_support((grub_addr_t)kernel, filelen, &nx_supported);
++  if (err != GRUB_ERR_NONE)
++    goto fail;
++
+   grub_loader_unset();
+ 
+   kernel_alloc_pages = GRUB_EFI_BYTES_TO_PAGES (kernel_size + align - 1);
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 92b2fb5091..91ae274299 100644
+index f97b123a51e..abbf6b24f50 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -44,7 +44,7 @@ struct grub_linuxefi_context {
@@ -418,7 +431,7 @@ index 92b2fb5091..91ae274299 100644
    void *initrd_mem;
  };
  
-@@ -110,13 +110,19 @@ kernel_alloc(grub_efi_uintn_t size,
+@@ -134,13 +134,19 @@ kernel_alloc(kernel_alloc_purpose_t purpose,
        pages = BYTES_TO_PAGES(size);
        grub_dprintf ("linux", "Trying to allocate %lu pages from %p\n",
  		    (unsigned long)pages, (void *)(unsigned long)max);
@@ -439,7 +452,7 @@ index 92b2fb5091..91ae274299 100644
      }
  
    while (grub_error_pop ())
-@@ -137,9 +143,11 @@ grub_linuxefi_boot (void *data)
+@@ -161,9 +167,11 @@ grub_linuxefi_boot (void *data)
  
    asm volatile ("cli");
  
@@ -453,7 +466,7 @@ index 92b2fb5091..91ae274299 100644
  }
  
  static grub_err_t
-@@ -304,7 +312,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -331,7 +339,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_uint32_t handover_offset;
    struct linux_kernel_params *params = 0;
    char *cmdline = 0;
@@ -463,7 +476,7 @@ index 92b2fb5091..91ae274299 100644
  
    grub_dl_ref (my_mod);
  
-@@ -334,6 +344,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -361,6 +371,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -477,7 +490,7 @@ index 92b2fb5091..91ae274299 100644
    lh = (struct linux_i386_kernel_header *)kernel;
    grub_dprintf ("linux", "original lh is at %p\n", kernel);
  
-@@ -498,6 +515,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -530,6 +547,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    context->handover_offset = handover_offset;
    context->params = params;
    context->cmdline = cmdline;
@@ -486,10 +499,10 @@ index 92b2fb5091..91ae274299 100644
    grub_loader_set_ex (grub_linuxefi_boot, grub_linuxefi_unload, context, 0);
  
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 4aeb0e4b9a..3c1ff64763 100644
+index 5a257552234..90121e9bc5a 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
-@@ -805,6 +805,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -817,6 +817,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        kernel_offset += len;
      }
  
@@ -502,29 +515,31 @@ index 4aeb0e4b9a..3c1ff64763 100644
    linux_params.kernel_alignment = (1 << align);
    linux_params.ps_mouse = linux_params.padding11 = 0;
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 34825c4adc..449e55269f 100644
+index c40684821e1..2c0e7f24bda 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -140,12 +140,16 @@ extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd,
- 						char **device,
- 						char **path);
+@@ -190,6 +190,9 @@ extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd,
+ void *
+ EXPORT_FUNC (grub_efi_find_configuration_table) (const grub_guid_t *target_guid);
  
 +extern grub_addr_t EXPORT_VAR(grub_stack_addr);
 +extern grub_size_t EXPORT_VAR(grub_stack_size);
 +
- #if defined(__arm__) || defined(__aarch64__) || defined(__riscv)
+ #if defined(__arm__) || defined(__aarch64__) || defined(__riscv) || defined(__loongarch__)
  void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);
  grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
- #include <grub/cpu/linux.h>
- grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh);
+@@ -197,7 +200,8 @@ grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
+ #include <grub/file.h>
+ grub_err_t grub_arch_efi_linux_load_image_header(grub_file_t file,
+                                                 struct linux_arch_kernel_header *lh);
 -grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, char *args);
 +grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
 +					  char *args, int nx_enabled);
- #endif
  
  grub_addr_t grub_efi_section_addr (const char *section);
+ 
 diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
-index 887b02fd9f..b82f71006a 100644
+index c806a7757f3..5b4e626c37c 100644
 --- a/include/grub/efi/linux.h
 +++ b/include/grub/efi/linux.h
 @@ -22,8 +22,20 @@
@@ -535,26 +550,26 @@ index 887b02fd9f..b82f71006a 100644
 +
  grub_err_t
 -EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
--				  void *kernel_param);
+-                                  void *kernel_param);
 +EXPORT_FUNC(grub_efi_linux_boot) (grub_addr_t kernel_address,
-+				  grub_size_t kernel_size,
-+				  grub_off_t handover_offset,
-+				  void *kernel_param, int nx_enabled);
++                                  grub_size_t kernel_size,
++                                  grub_off_t handover_offset,
++                                  void *kernel_param, int nx_enabled);
 +
 +grub_err_t
 +EXPORT_FUNC(grub_efi_check_nx_image_support) (grub_addr_t kernel_addr,
-+					      grub_size_t kernel_size,
-+					      int *nx_supported);
++                                              grub_size_t kernel_size,
++                                              int *nx_supported);
 +
 +grub_err_t
 +EXPORT_FUNC(grub_efi_check_nx_required) (int *nx_required);
  
  #endif /* ! GRUB_EFI_LINUX_HEADER */
 diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
-index 2a5e1ee003..a5e623eb04 100644
+index 13fdd0e7d98..a4d62373cc9 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
-@@ -181,6 +181,8 @@ struct grub_pe32_optional_header
+@@ -194,6 +194,8 @@ struct grub_pe32_optional_header
    struct grub_pe32_data_directory reserved_entry;
  };
  
diff --git a/0265-efi-Provide-wrappers-for-load_image-start_image.patch b/0265-efi-Provide-wrappers-for-load_image-start_image.patch
new file mode 100644
index 00000000..1ee0f327
--- /dev/null
+++ b/0265-efi-Provide-wrappers-for-load_image-start_image.patch
@@ -0,0 +1,183 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <julian.klode@canonical.com>
+Date: Tue, 9 Jul 2024 16:46:05 -0600
+Subject: [PATCH] efi: Provide wrappers for load_image, start_image,
+
+These can be used to register a different implementation later,
+for example, when shim provides a protocol with those functions.
+
+Signed-off-by: Mate Kukri <mate.kukri@canonical.com>
+---
+ grub-core/kern/efi/efi.c           | 57 ++++++++++++++++++++++++++++++++++++++
+ grub-core/loader/efi/chainloader.c | 13 ++++-----
+ include/grub/efi/efi.h             | 37 +++++++++++++++++++++++++
+ 3 files changed, 100 insertions(+), 7 deletions(-)
+
+diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
+index cdfc11565c7..b5b8a329622 100644
+--- a/grub-core/kern/efi/efi.c
++++ b/grub-core/kern/efi/efi.c
+@@ -1131,6 +1131,63 @@ grub_efi_find_configuration_table (const grub_guid_t *target_guid)
+   return 0;
+ }
+ 
++static const grub_efi_loader_t *override_loader = NULL;
++
++grub_err_t
++grub_efi_register_loader (const grub_efi_loader_t *loader)
++{
++  if (override_loader != NULL)
++    return grub_error (GRUB_ERR_BUG, "trying to register different loader");
++  override_loader = loader;
++  return GRUB_ERR_NONE;
++}
++
++grub_err_t
++grub_efi_unregister_loader (const grub_efi_loader_t *loader)
++{
++  if (loader != override_loader)
++    return grub_error (GRUB_ERR_BUG, "trying to unregister different loader");
++
++  override_loader = NULL;
++  return GRUB_ERR_NONE;
++}
++
++grub_efi_status_t
++grub_efi_load_image (grub_efi_boolean_t boot_policy,
++		     grub_efi_handle_t parent_image_handle,
++		     grub_efi_device_path_t *file_path, void *source_buffer,
++		     grub_efi_uintn_t source_size,
++		     grub_efi_handle_t *image_handle)
++{
++  if (override_loader != NULL)
++    return override_loader->load_image (boot_policy, parent_image_handle,
++					file_path, source_buffer, source_size,
++					image_handle);
++  return grub_efi_system_table->boot_services->load_image (
++      boot_policy, parent_image_handle, file_path, source_buffer, source_size,
++      image_handle);
++}
++
++grub_efi_status_t
++grub_efi_start_image (grub_efi_handle_t image_handle,
++		      grub_efi_uintn_t *exit_data_size,
++		      grub_efi_char16_t **exit_data)
++{
++  if (override_loader != NULL)
++    return override_loader->start_image (image_handle, exit_data_size,
++					 exit_data);
++  return grub_efi_system_table->boot_services->start_image (
++      image_handle, exit_data_size, exit_data);
++}
++
++grub_efi_status_t
++grub_efi_unload_image (grub_efi_handle_t image_handle)
++{
++  if (override_loader != NULL)
++    return override_loader->unload_image (image_handle);
++  return grub_efi_system_table->boot_services->unload_image (image_handle);
++}
++
+ grub_err_t
+ grub_efi_status_to_err (grub_efi_status_t status)
+ {
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index 5cd6f6a5993..9b1cc3fd41d 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -69,7 +69,7 @@ grub_start_image (grub_efi_handle_t handle)
+ 
+   b = grub_efi_system_table->boot_services;
+ 
+-  status = b->start_image (handle, &exit_data_size, &exit_data);
++  status = grub_efi_start_image (handle, &exit_data_size, &exit_data);
+   if (status != GRUB_EFI_SUCCESS)
+     {
+       if (exit_data)
+@@ -101,7 +101,6 @@ grub_chainloader_unload (void *context)
+ {
+   grub_efi_handle_t image_handle;
+   grub_efi_loaded_image_t *loaded_image;
+-  grub_efi_boot_services_t *b;
+ 
+   image_handle = (grub_efi_handle_t) context;
+ 
+@@ -109,8 +108,7 @@ grub_chainloader_unload (void *context)
+   if (loaded_image != NULL)
+     grub_free (loaded_image->load_options);
+ 
+-  b = grub_efi_system_table->boot_services;
+-  b->unload_image (image_handle);
++  grub_efi_unload_image (image_handle);
+ 
+   grub_dl_unref (my_mod);
+   return GRUB_ERR_NONE;
+@@ -871,8 +869,8 @@ grub_load_image(grub_efi_device_path_t *file_path, void *boot_image,
+ 
+   b = grub_efi_system_table->boot_services;
+ 
+-  status = b->load_image (0, grub_efi_image_handle, file_path,
+-                          boot_image, image_size, image_handle_out);
++  status = grub_efi_load_image (0, grub_efi_image_handle, file_path,
++				boot_image, image_size, image_handle_out);
+   if (status != GRUB_EFI_SUCCESS)
+     {
+       if (status == GRUB_EFI_OUT_OF_RESOURCES)
+@@ -1198,7 +1196,8 @@ fail:
+   if (cmdline)
+     grub_free (cmdline);
+ 
+-  b->unload_image (image_handle);
++  if (image_handle != NULL)
++    grub_efi_unload_image (image_handle);
+ 
+   grub_dl_unref (my_mod);
+ 
+diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
+index 2c0e7f24bda..7eed1bd791d 100644
+--- a/include/grub/efi/efi.h
++++ b/include/grub/efi/efi.h
+@@ -202,6 +202,43 @@ grub_err_t grub_arch_efi_linux_load_image_header(grub_file_t file,
+                                                 struct linux_arch_kernel_header *lh);
+ grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
+ 					  char *args, int nx_enabled);
++grub_efi_status_t
++EXPORT_FUNC (grub_efi_load_image) (grub_efi_boolean_t boot_policy,
++				   grub_efi_handle_t parent_image_handle,
++				   grub_efi_device_path_t *file_path,
++				   void *source_buffer, grub_efi_uintn_t source_size,
++				   grub_efi_handle_t *image_handle);
++
++grub_efi_status_t
++EXPORT_FUNC (grub_efi_start_image) (grub_efi_handle_t image_handle,
++				    grub_efi_uintn_t *exit_data_size,
++				    grub_efi_char16_t **exit_data);
++
++grub_efi_status_t
++EXPORT_FUNC (grub_efi_unload_image) (grub_efi_handle_t image_handle);
++
++typedef struct grub_efi_loader
++{
++  grub_efi_status_t (__grub_efi_api *load_image) (grub_efi_boolean_t boot_policy,
++				   grub_efi_handle_t parent_image_handle,
++				   grub_efi_device_path_t *file_path,
++				   void *source_buffer,
++				   grub_efi_uintn_t source_size,
++				   grub_efi_handle_t *image_handle);
++
++  grub_efi_status_t (__grub_efi_api *start_image) (grub_efi_handle_t image_handle,
++				    grub_efi_uintn_t *exit_data_size,
++				    grub_efi_char16_t **exit_data);
++
++  grub_efi_status_t (__grub_efi_api *unload_image) (grub_efi_handle_t image_handle);
++} grub_efi_loader_t;
++
++grub_err_t
++EXPORT_FUNC (grub_efi_register_loader) (const grub_efi_loader_t *loader);
++
++grub_err_t
++EXPORT_FUNC (grub_efi_unregister_loader) (const grub_efi_loader_t *loader);
++
+ 
+ grub_addr_t grub_efi_section_addr (const char *section);
+ 
diff --git a/0266-efi-Disallow-fallback-to-legacy-Linux-loader-when-sh.patch b/0266-efi-Disallow-fallback-to-legacy-Linux-loader-when-sh.patch
new file mode 100644
index 00000000..9b9104f0
--- /dev/null
+++ b/0266-efi-Disallow-fallback-to-legacy-Linux-loader-when-sh.patch
@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mate Kukri <mate.kukri@canonical.com>
+Date: Wed, 10 Jul 2024 12:07:17 -0600
+Subject: [PATCH] efi: Disallow fallback to legacy Linux loader when shim says
+ NX is required.
+
+Signed-off-by: Mate Kukri <mate.kukri@canonical.com>
+---
+ grub-core/loader/efi/linux.c | 13 ++++++++-----
+ include/grub/efi/api.h       |  2 ++
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index da5dcafad8b..21aad881ba0 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -724,6 +724,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+   void *kernel = NULL;
+   grub_err_t err;
+   int nx_supported = 1;
++  int nx_required = 0;
+ 
+   grub_dl_ref (my_mod);
+ 
+@@ -756,21 +757,23 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+       goto fail;
+     }
+ 
++#if !defined(__i386__) && !defined(__x86_64__)
+   if (grub_arch_efi_linux_load_image_header (file, &lh) != GRUB_ERR_NONE)
+-#if !defined(__i386__) && !defined(__x86_64__)
+     goto fail;
+ #else
+-    goto fallback;
+-
+-  if (!initrd_use_loadfile2)
++  if (grub_arch_efi_linux_load_image_header (file, &lh) != GRUB_ERR_NONE ||
++      !initrd_use_loadfile2)
+     {
++      /* We cannot use the legacy loader when NX is required */
++      if (grub_efi_check_nx_required(&nx_required))
++        goto fail;
++
+       /*
+        * This is a EFI stub image but it is too old to implement the LoadFile2
+        * based initrd loading scheme, and Linux/x86 does not support the DT
+        * based method either. So fall back to the x86-specific loader that
+        * enters Linux in EFI mode but without going through its EFI stub.
+        */
+-fallback:
+       grub_file_close (file);
+       return grub_cmd_linux_x86_legacy (cmd, argc, argv);
+     }
+diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
+index da51f57fd4a..637b1272d17 100644
+--- a/include/grub/efi/api.h
++++ b/include/grub/efi/api.h
+@@ -2011,6 +2011,8 @@ struct grub_efi_block_io
+ };
+ typedef struct grub_efi_block_io grub_efi_block_io_t;
+ 
++#define GRUB_MOK_POLICY_NX_REQUIRED	0x1
++
+ struct grub_efi_shim_lock_protocol
+ {
+   /*
diff --git a/0267-Set-non-executable-stack-sections-on-EFI-assembly-fi.patch b/0267-Set-non-executable-stack-sections-on-EFI-assembly-fi.patch
new file mode 100644
index 00000000..2f249143
--- /dev/null
+++ b/0267-Set-non-executable-stack-sections-on-EFI-assembly-fi.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Mon, 5 Aug 2024 13:19:28 -0600
+Subject: [PATCH] Set non-executable stack sections on EFI assembly files
+
+For those manual assembly files created where no '.note.GNU-stack'
+section is explicitly added, linker defaults it as executable and this
+is the reason that RHEL CI rpminspect & annocheck tests are
+failing. The proposed change sets the corresponding GNU-stack
+sections otherwise CI detects the following security vulnerability
+
+   $ annocheck annocheck --ignore-unknown --verbose --profile=el9 *.rpm 2>&1 | grep FAIL | grep stack
+   (standard input):(standard input):Hardened: ./usr/lib/grub/x86_64-efi/kernel.exec: FAIL: gnu-stack test because .note.GNU-stack section has execute permission
+   (standard input):(standard input):Hardened: ./usr/lib/grub/x86_64-efi/kernel.img: FAIL: gnu-stack test because .note.GNU-stack section has execute permission
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/kern/i386/efi/startup.S   | 5 +++++
+ grub-core/kern/x86_64/efi/startup.S | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/grub-core/kern/i386/efi/startup.S b/grub-core/kern/i386/efi/startup.S
+index fc5ea3dac..36d1b1a68 100644
+--- a/grub-core/kern/i386/efi/startup.S
++++ b/grub-core/kern/i386/efi/startup.S
+@@ -34,3 +34,8 @@ _start:
+ 	movl	%eax, EXT_C(grub_efi_system_table)
+ 	call	EXT_C(grub_main)
+ 	ret
++
++/* An executable stack is not required for these functions. */
++#if defined (__linux__) && defined (__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git a/grub-core/kern/x86_64/efi/startup.S b/grub-core/kern/x86_64/efi/startup.S
+index 9357e5c5d..f5c6bc3d8 100644
+--- a/grub-core/kern/x86_64/efi/startup.S
++++ b/grub-core/kern/x86_64/efi/startup.S
+@@ -33,3 +33,8 @@ _start:
+ 	andq	$~0xf, %rsp
+ 	call	EXT_C(grub_main)
+ 	/* Doesn't return.  */
++
++/* An executable stack is not required for these functions. */
++#if defined (__linux__) && defined (__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/0267-grub-probe-document-the-behavior-of-multiple-v.patch b/0267-grub-probe-document-the-behavior-of-multiple-v.patch
deleted file mode 100644
index 4e9d7ccf..00000000
--- a/0267-grub-probe-document-the-behavior-of-multiple-v.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Fri, 15 Jul 2022 15:49:25 -0400
-Subject: [PATCH] grub-probe: document the behavior of multiple -v
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit 51a55233eed08f7f12276afd6b3724b807a0b680)
----
- util/grub-probe.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/util/grub-probe.c b/util/grub-probe.c
-index c6fac732b4..ba867319a7 100644
---- a/util/grub-probe.c
-+++ b/util/grub-probe.c
-@@ -732,7 +732,8 @@ static struct argp_option options[] = {
-   {"device-map",  'm', N_("FILE"), 0,
-    N_("use FILE as the device map [default=%s]"), 0},
-   {"target",  't', N_("TARGET"), 0, 0, 0},
--  {"verbose",     'v', 0,      0, N_("print verbose messages."), 0},
-+  {"verbose",     'v', 0,      0,
-+   N_("print verbose messages (pass twice to enable debug printing)."), 0},
-   {0, '0', 0, 0, N_("separate items in output using ASCII NUL characters"), 0},
-   { 0, 0, 0, 0, 0, 0 }
- };
diff --git a/0268-grub-mkconfig.in-turn-off-executable-owner-bit.patch b/0268-grub-mkconfig.in-turn-off-executable-owner-bit.patch
new file mode 100644
index 00000000..e7dd610c
--- /dev/null
+++ b/0268-grub-mkconfig.in-turn-off-executable-owner-bit.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Mon, 6 May 2024 15:35:41 -0600
+Subject: [PATCH] grub-mkconfig.in: turn off executable owner bit
+
+Stricker permissions are required on the grub.cfg file, resulting in
+at most 0600 owner's file permissions. This resolves conflicting
+requirement permissions on grub2-pc package's grub2.cfg file.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ util/grub-mkconfig.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index bec52e052..461df7f09 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -316,7 +316,7 @@ and /etc/grub.d/* files or please file a bug report with
+   else
+     # none of the children aborted with error, install the new grub.cfg
+     oldumask=$(umask)
+-    umask 077
++    umask 177
+     cat ${grub_cfg}.new > ${grub_cfg}
+     umask $oldumask
+     rm -f ${grub_cfg}.new
diff --git a/0269-fs-fat-don-t-error-when-mtime-is-0.patch b/0269-fs-fat-don-t-error-when-mtime-is-0.patch
deleted file mode 100644
index f014f6c9..00000000
--- a/0269-fs-fat-don-t-error-when-mtime-is-0.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Fri, 15 Jul 2022 15:42:41 -0400
-Subject: [PATCH] fs/fat: don't error when mtime is 0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In the wild, we occasionally see valid ESPs where some file modification times
-are 0.  For instance:
-
-    ├── [Dec 31  1979]  EFI
-    │   ├── [Dec 31  1979]  BOOT
-    │   │   ├── [Dec 31  1979]  BOOTX64.EFI
-    │   │   └── [Dec 31  1979]  fbx64.efi
-    │   └── [Jun 27 02:41]  fedora
-    │       ├── [Dec 31  1979]  BOOTX64.CSV
-    │       ├── [Dec 31  1979]  fonts
-    │       ├── [Mar 14 03:35]  fw
-    │       │   ├── [Mar 14 03:35]  fwupd-359c1169-abd6-4a0d-8bce-e4d4713335c1.cap
-    │       │   ├── [Mar 14 03:34]  fwupd-9d255c4b-2d88-4861-860d-7ee52ade9463.cap
-    │       │   └── [Mar 14 03:34]  fwupd-b36438d8-9128-49d2-b280-487be02d948b.cap
-    │       ├── [Dec 31  1979]  fwupdx64.efi
-    │       ├── [May 10 10:47]  grub.cfg
-    │       ├── [Jun  3 12:38]  grub.cfg.new.new
-    │       ├── [May 10 10:41]  grub.cfg.old
-    │       ├── [Jun 27 02:41]  grubenv
-    │       ├── [Dec 31  1979]  grubx64.efi
-    │       ├── [Dec 31  1979]  mmx64.efi
-    │       ├── [Dec 31  1979]  shim.efi
-    │       ├── [Dec 31  1979]  shimx64.efi
-    │       └── [Dec 31  1979]  shimx64-fedora.efi
-    └── [Dec 31  1979]  FSCK0000.REC
-
-    5 directories, 17 files
-
-This causes grub-probe failure, which in turn causes grub-mkconfig
-failure.  They are valid filesystems that appear intact, and the Linux
-FAT stack is able to mount and manipulate them without complaint.
-
-The check for mtime of 0 has been present since
-20def1a3c3952982395cd7c3ea7e78638527962b ("fat: support file
-modification times").
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit 0615c4887352e32d7bb7198e9ad0d695f9dc2c31)
----
- grub-core/fs/fat.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/grub-core/fs/fat.c b/grub-core/fs/fat.c
-index dd82e4ee35..ff6200c5be 100644
---- a/grub-core/fs/fat.c
-+++ b/grub-core/fs/fat.c
-@@ -1027,9 +1027,6 @@ grub_fat_dir (grub_device_t device, const char *path, grub_fs_dir_hook_t hook,
- 					  grub_le_to_cpu16 (ctxt.dir.w_date),
- 					  &info.mtime);
- #endif
--      if (info.mtimeset == 0)
--	grub_error (GRUB_ERR_OUT_OF_RANGE,
--		    "invalid modification timestamp for %s", path);
- 
-       if (hook (ctxt.filename, &info, hook_data))
- 	break;
diff --git a/0269-kern-ieee1275-init-Add-IEEE-1275-Radix-support-for-K.patch b/0269-kern-ieee1275-init-Add-IEEE-1275-Radix-support-for-K.patch
new file mode 100644
index 00000000..619ff06b
--- /dev/null
+++ b/0269-kern-ieee1275-init-Add-IEEE-1275-Radix-support-for-K.patch
@@ -0,0 +1,119 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Avnish Chouhan <avnish@linux.ibm.com>
+Date: Thu, 23 May 2024 18:43:14 +0530
+Subject: [PATCH] kern/ieee1275/init: Add IEEE 1275 Radix support for KVM on
+ Power
+
+This patch adds support for Radix, Xive and Radix_gtse in Options
+vector5 which is required for KVM LPARs. KVM LPARs ONLY support
+Radix and not the Hash. Not enabling Radix on any PowerVM KVM LPARs
+will result in boot failure.
+
+Signed-off-by: Avnish Chouhan <avnish@linux.ibm.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/ieee1275/init.c | 63 +++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 62 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
+index 13e8a5b4b..6c5f4fb77 100644
+--- a/grub-core/kern/ieee1275/init.c
++++ b/grub-core/kern/ieee1275/init.c
+@@ -113,6 +113,16 @@ grub_addr_t grub_ieee1275_original_stack;
+ #define DRC_INFO            0x40
+ #define BYTE22              (DY_MEM_V2 | DRC_INFO)
+ 
++/* For ibm,arch-vec-5-platform-support. */
++#define XIVE_INDEX           0x17
++#define MMU_INDEX            0x18
++#define RADIX_GTSE_INDEX     0x1a
++#define RADIX_ENABLED        0x40
++#define XIVE_ENABLED         0x40
++#define HASH_ENABLED         0x00
++#define MAX_SUPPORTED        0xC0
++#define RADIX_GTSE_ENABLED   0x40
++
+ void
+ grub_exit (int rc __attribute__((unused)))
+ {
+@@ -739,6 +749,10 @@ struct option_vector5
+   grub_uint32_t platform_facilities;
+   grub_uint8_t sub_processors;
+   grub_uint8_t byte22;
++  grub_uint8_t xive;
++  grub_uint8_t mmu;
++  grub_uint8_t hpt_ext;
++  grub_uint8_t radix_gtse;
+ } GRUB_PACKED;
+ 
+ struct pvr_entry
+@@ -777,6 +791,13 @@ grub_ieee1275_ibm_cas (void)
+ {
+   int rc;
+   grub_ieee1275_ihandle_t root;
++  grub_uint8_t ibm_arch_platform_support[8];
++  grub_ssize_t actual;
++  grub_uint8_t xive_support = 0;
++  grub_uint8_t mmu_support = 0;
++  grub_uint8_t radix_gtse_support = 0;
++  int i = 0;
++  int prop_len = 8;
+   struct cas_args
+   {
+     struct grub_ieee1275_common_hdr common;
+@@ -785,6 +806,46 @@ grub_ieee1275_ibm_cas (void)
+     grub_ieee1275_cell_t cas_addr;
+     grub_ieee1275_cell_t result;
+   } args;
++
++  grub_ieee1275_get_integer_property (grub_ieee1275_chosen,
++                                      "ibm,arch-vec-5-platform-support",
++                                      (grub_uint32_t *) ibm_arch_platform_support,
++                                      sizeof (ibm_arch_platform_support),
++                                      &actual);
++
++  for (i = 0; i < prop_len; i++)
++    {
++      switch (ibm_arch_platform_support[i])
++        {
++          case XIVE_INDEX:
++            if (ibm_arch_platform_support[i + 1] & MAX_SUPPORTED)
++              xive_support = XIVE_ENABLED;
++            else
++              xive_support = 0;
++            break;
++
++          case MMU_INDEX:
++            if (ibm_arch_platform_support[i + 1] & MAX_SUPPORTED)
++              mmu_support = RADIX_ENABLED;
++            else
++              mmu_support = HASH_ENABLED;
++            break;
++
++          case RADIX_GTSE_INDEX:
++            if (mmu_support == RADIX_ENABLED)
++              radix_gtse_support = ibm_arch_platform_support[i + 1] & RADIX_GTSE_ENABLED;
++            else
++              radix_gtse_support = 0;
++            break;
++
++          default:
++            /* Ignoring the other indexes of ibm,arch-vec-5-platform-support. */
++            break;
++        }
++      /* Skipping the property value. */
++      i++;
++    }
++
+   struct cas_vector vector =
+   {
+     .pvr_list = { { 0x00000000, 0xffffffff } }, /* any processor */
+@@ -801,7 +862,7 @@ grub_ieee1275_ibm_cas (void)
+     .vec4 = 0x0001, /* set required minimum capacity % to the lowest value */
+     .vec5_size = 1 + sizeof (struct option_vector5) - 2,
+     .vec5 = {
+-      0, BYTE2, 0, CMO, ASSOCIATIVITY, BIN_OPTS, 0, 0, MAX_CPU, 0, 0, PLATFORM_FACILITIES, SUB_PROCESSORS, BYTE22
++      0, BYTE2, 0, CMO, ASSOCIATIVITY, BIN_OPTS, 0, 0, MAX_CPU, 0, 0, PLATFORM_FACILITIES, SUB_PROCESSORS, BYTE22, xive_support, mmu_support, 0, radix_gtse_support
+     }
+   };
+ 
diff --git a/0270-grub2-mkconfig-Ensure-grub-cfg-stub-is-not-overwritt.patch b/0270-grub2-mkconfig-Ensure-grub-cfg-stub-is-not-overwritt.patch
new file mode 100644
index 00000000..60f36bce
--- /dev/null
+++ b/0270-grub2-mkconfig-Ensure-grub-cfg-stub-is-not-overwritt.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nicolas Frayer <nfrayer@redhat.com>
+Date: Tue, 16 Jul 2024 11:11:43 +0200
+Subject: [PATCH] grub2-mkconfig: Ensure grub cfg stub is not overwritten
+
+/boot/efi/EFI/$os_name/grub.cfg contains a grub cfg stub
+that should not be overwritten by grub2-mkconfig.
+Ensure that we prevent this from happening.
+
+Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
+Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ util/grub-mkconfig.in | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index 461df7f09..b560aae6c 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -109,6 +109,20 @@ do
+     esac
+ done
+ 
++os_name=$(grep '^ID=' /etc/os-release | sed 's/ID=//')
++if test "$os_name" = '"rhel"'; then
++  os_name=redhat
++elif test "$os_name" = '"centos"'; then
++  os_name=centos
++fi
++if test "x${grub_cfg}" = "x/boot/efi/EFI/$os_name/grub.cfg" &&\
++        mountpoint -q /boot/efi; then
++  gettext_printf "Running \`grub2-mkconfig -o %s' will overwrite the GRUB wrapper.\n" "$grub_cfg" 1>&2
++  gettext_printf "Please run \`grub2-mkconfig -o /boot/grub2/grub.cfg' instead to update grub.cfg.\n" 1>&2
++  gettext_printf "GRUB configuration file was not updated.\n" 1>&2
++  exit 1
++fi
++
+ if [ "x$EUID" = "x" ] ; then
+   EUID=`id -u`
+ fi
diff --git a/0271-efi-make-the-default-arena-most-of-ram.patch b/0271-efi-make-the-default-arena-most-of-ram.patch
deleted file mode 100644
index 49143703..00000000
--- a/0271-efi-make-the-default-arena-most-of-ram.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Fri, 29 Jul 2022 15:57:57 -0400
-Subject: [PATCH] efi: make the default arena most of ram
-
-Currently when populating the initial memory arena on EFI systems, we
-count the available regions below GRUB_EFI_MAX_ALLOCATION_ADDRESS from
-the EFI memory map and then allocates one quarter of that for our arena.
-
-Because many systems come up without IOMMUs, we currently set
-GRUB_EFI_MAX_ALLOCATION_ADDRESS to 0x7fffffff, i.e. all addresses
-allocated must be below 2G[0].  Due to firmware and other
-considerations, this makes the most memory we can possibly have in our
-arena 512M.
-
-Because our EFI loader doesn't get kernel and initrd memory from grub's
-allocator, but rather reserves it directly from UEFI and then simply
-marks those as allocated if they're within grub's arena, it was
-historically possible to have initrds that are larger than 512M, because
-we could use any memory region below 4G, without concern for grub's
-choice of arena size.
-
-Unfortunately, when we switched to using the "verifiers" API (and thus
-the file_filter_t API) to do measurement of kernel and initrd, this
-introduced a pattern that allocates the entire file when we call
-grub_file_open(), and buffers it to pass to the filter.  This results in
-needing to have enough space for the initramfs in the grub arena.
-
-This is bad.
-
-Since it's unlikely you're going to do anything *other* than loading a
-kernel and initramfs that takes much of the available free memory from
-UEFI, this patch introduces a workaround by changing the amount we give
-to the arena be three quarters of the available memory, rather than one
-quarter, thus changing our theoretical initrd limit to 1.5G.  In
-practice, it may still be smaller than that depending on allocation
-fragmentation, but generally it will be most of it.
-
-Note that this doesn't fix the underlying flaw, which is that there is
-no safe way to do the validation correctly using the "verifiers" system
-with the current file API without buffering the whole file before
-grub_file_read() is ever called, and thus you can't set an allocation
-policy for the initial buffer of the file at all, so unless we raise the
-allocation limit to >4G, it can't be allocated in the big region.
-
-[0] I'm not sure there was a good reason not to pick 4G, but even if we
-    had, at least one common firmware routes the first 2G of physical
-    RAM to 0x0, and any additional memory starting at 0x100000000.
-
-Related: rhbz#2112134
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/kern/efi/mm.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index e460b072e6..150e412ee7 100644
---- a/grub-core/kern/efi/mm.c
-+++ b/grub-core/kern/efi/mm.c
-@@ -737,10 +737,10 @@ grub_efi_mm_init (void)
-   filtered_memory_map_end = filter_memory_map (memory_map, filtered_memory_map,
- 					       desc_size, memory_map_end);
- 
--  /* By default, request a quarter of the available memory.  */
-+  /* By default, request three quarters of the available memory.  */
-   total_pages = get_total_pages (filtered_memory_map, desc_size,
- 				 filtered_memory_map_end);
--  required_pages = (total_pages >> 2);
-+  required_pages = (total_pages >> 1) + (total_pages >> 2);
-   if (required_pages < BYTES_TO_PAGES (MIN_HEAP_SIZE))
-     required_pages = BYTES_TO_PAGES (MIN_HEAP_SIZE);
-   else if (required_pages > BYTES_TO_PAGES (MAX_HEAP_SIZE))
diff --git a/0271-grub2-mkconfig-Simplify-os_name-detection.patch b/0271-grub2-mkconfig-Simplify-os_name-detection.patch
new file mode 100644
index 00000000..bd7ba1b4
--- /dev/null
+++ b/0271-grub2-mkconfig-Simplify-os_name-detection.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Wed, 31 Jul 2024 16:06:10 +0000
+Subject: [PATCH] grub2-mkconfig: Simplify os_name detection
+
+---
+ util/grub-mkconfig.in | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index efa36cc45a69..8b7883072e46 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -109,12 +109,7 @@ do
+     esac
+ done
+ 
+-os_name=$(grep '^ID=' /etc/os-release | sed 's/ID=//')
+-if test "$os_name" = '"rhel"'; then
+-  os_name=redhat
+-elif test "$os_name" = '"centos"'; then
+-  os_name=centos
+-fi
++os_name=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g')
+ if test "x${grub_cfg}" = "x/boot/efi/EFI/$os_name/grub.cfg" &&\
+         mountpoint -q /boot/efi; then
+   gettext_printf "Running \`grub2-mkconfig -o %s' will overwrite the GRUB wrapper.\n" "$grub_cfg" 1>&2
diff --git a/0272-grub-mkconfig-Remove-check-for-mount-point-for-grub-.patch b/0272-grub-mkconfig-Remove-check-for-mount-point-for-grub-.patch
new file mode 100644
index 00000000..fc3ec414
--- /dev/null
+++ b/0272-grub-mkconfig-Remove-check-for-mount-point-for-grub-.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nicolas Frayer <nfrayer@redhat.com>
+Date: Thu, 1 Aug 2024 11:13:20 +0200
+Subject: [PATCH] grub/mkconfig: Remove check for mount point for grub cfg stub
+
+Remove mountpoint when checking whether or not the grub cfg stub
+exists and add -s to the test. This should cover scenarios where
+the ESP doesn't have a seperate partition but still uses a grub
+cfg stub
+
+Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ util/grub-mkconfig.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index 8b7883072e46..31a72a39e0cf 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -110,8 +110,7 @@ do
+ done
+ 
+ os_name=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g')
+-if test "x${grub_cfg}" = "x/boot/efi/EFI/$os_name/grub.cfg" &&\
+-        mountpoint -q /boot/efi; then
++if test -s "${grub_cfg}" && test "x${grub_cfg}" = "x/boot/efi/EFI/$os_name/grub.cfg"; then
+   gettext_printf "Running \`grub2-mkconfig -o %s' will overwrite the GRUB wrapper.\n" "$grub_cfg" 1>&2
+   gettext_printf "Please run \`grub2-mkconfig -o /boot/grub2/grub.cfg' instead to update grub.cfg.\n" 1>&2
+   gettext_printf "GRUB configuration file was not updated.\n" 1>&2
diff --git a/0273-efi-api.h-include-missing-__grub_efi_api-macros-on-E.patch b/0273-efi-api.h-include-missing-__grub_efi_api-macros-on-E.patch
new file mode 100644
index 00000000..61ffbdcd
--- /dev/null
+++ b/0273-efi-api.h-include-missing-__grub_efi_api-macros-on-E.patch
@@ -0,0 +1,495 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 29 Aug 2024 12:11:11 -0600
+Subject: [PATCH] efi/api.h: include missing __grub_efi_api macros on EFI
+ functions
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/loader/efi/chainloader.c |  2 +-
+ include/grub/efi/api.h             | 34 +++++++++++++-------------
+ include/grub/efi/dhcp.h            | 42 ++++++++++++++++----------------
+ include/grub/efi/edid.h            |  2 +-
+ include/grub/efi/http.h            | 12 ++++-----
+ include/grub/efi/pci.h             | 50 +++++++++++++++++++-------------------
+ 6 files changed, 71 insertions(+), 71 deletions(-)
+
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index 5cd6f6a59..460a44041 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -555,7 +555,7 @@ handle_image (struct grub_secureboot_chainloader_context *load_context)
+   grub_uint32_t buffer_size;
+   int found_entry_point = 0;
+   int rc;
+-  grub_efi_status_t (*entry_point) (grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
++  grub_efi_status_t (__grub_efi_api *entry_point) (grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
+ 
+   b = grub_efi_system_table->boot_services;
+ 
+diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
+index 2376182d7..5047ecf28 100644
+--- a/include/grub/efi/api.h
++++ b/include/grub/efi/api.h
+@@ -1094,11 +1094,11 @@ typedef struct grub_efi_bios_device_path grub_efi_bios_device_path_t;
+ struct grub_efi_service_binding;
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_service_binding_create_child) (struct grub_efi_service_binding *this,
++(__grub_efi_api *grub_efi_service_binding_create_child) (struct grub_efi_service_binding *this,
+                                           grub_efi_handle_t *child_handle);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_service_binding_destroy_child) (struct grub_efi_service_binding *this,
++(__grub_efi_api *grub_efi_service_binding_destroy_child) (struct grub_efi_service_binding *this,
+                                            grub_efi_handle_t *child_handle);
+ 
+ typedef struct grub_efi_service_binding
+@@ -1754,12 +1754,12 @@ typedef struct grub_efi_pxe_mode
+ typedef struct grub_efi_pxe
+ {
+   grub_uint64_t rev;
+-  grub_efi_status_t (*start) (struct grub_efi_pxe *this, grub_efi_boolean_t use_ipv6);
++  grub_efi_status_t (__grub_efi_api *start) (struct grub_efi_pxe *this, grub_efi_boolean_t use_ipv6);
+   void (*stop) (void);
+-  grub_efi_status_t (*dhcp) (struct grub_efi_pxe *this,
++  grub_efi_status_t (__grub_efi_api *dhcp) (struct grub_efi_pxe *this,
+ 			    grub_efi_boolean_t sort_offers);
+   void (*discover) (void);
+-  grub_efi_status_t (*mtftp) (struct grub_efi_pxe *this,
++  grub_efi_status_t (__grub_efi_api *mtftp) (struct grub_efi_pxe *this,
+ 			    grub_efi_pxe_base_code_tftp_opcode_t operation,
+ 			    void *buffer_ptr,
+ 			    grub_efi_boolean_t overwrite,
+@@ -1775,7 +1775,7 @@ typedef struct grub_efi_pxe
+   void (*setipfilter) (void);
+   void (*arp) (void);
+   void (*setparams) (void);
+-  grub_efi_status_t (*set_station_ip) (struct grub_efi_pxe *this,
++  grub_efi_status_t (__grub_efi_api *set_station_ip) (struct grub_efi_pxe *this,
+ 			    grub_efi_pxe_ip_address_t *new_station_ip,
+ 			    grub_efi_pxe_ip_address_t *new_subnet_mask);
+   void (*setpackets) (void);
+@@ -2054,21 +2054,21 @@ typedef enum grub_efi_ip4_config2_data_type grub_efi_ip4_config2_data_type_t;
+ 
+ struct grub_efi_ip4_config2_protocol
+ {
+-  grub_efi_status_t (*set_data) (struct grub_efi_ip4_config2_protocol *this,
++  grub_efi_status_t (__grub_efi_api *set_data) (struct grub_efi_ip4_config2_protocol *this,
+ 				 grub_efi_ip4_config2_data_type_t data_type,
+ 				 grub_efi_uintn_t data_size,
+ 				 void *data);
+ 
+-  grub_efi_status_t (*get_data) (struct grub_efi_ip4_config2_protocol *this,
++  grub_efi_status_t (__grub_efi_api *get_data) (struct grub_efi_ip4_config2_protocol *this,
+ 				 grub_efi_ip4_config2_data_type_t data_type,
+ 				 grub_efi_uintn_t *data_size,
+ 				 void *data);
+ 
+-  grub_efi_status_t (*register_data_notify) (struct grub_efi_ip4_config2_protocol *this,
++  grub_efi_status_t (__grub_efi_api *register_data_notify) (struct grub_efi_ip4_config2_protocol *this,
+ 					     grub_efi_ip4_config2_data_type_t data_type,
+ 					     grub_efi_event_t event);
+ 
+-  grub_efi_status_t (*unregister_datanotify) (struct grub_efi_ip4_config2_protocol *this,
++  grub_efi_status_t (__grub_efi_api *unregister_datanotify) (struct grub_efi_ip4_config2_protocol *this,
+ 					     grub_efi_ip4_config2_data_type_t data_type,
+ 					     grub_efi_event_t event);
+ };
+@@ -2126,21 +2126,21 @@ typedef enum grub_efi_ip6_config_data_type grub_efi_ip6_config_data_type_t;
+ 
+ struct grub_efi_ip6_config_protocol
+ {
+-  grub_efi_status_t (*set_data) (struct grub_efi_ip6_config_protocol *this,
++  grub_efi_status_t (__grub_efi_api *set_data) (struct grub_efi_ip6_config_protocol *this,
+ 				 grub_efi_ip6_config_data_type_t data_type,
+ 				 grub_efi_uintn_t data_size,
+ 				 void *data);
+ 
+-  grub_efi_status_t (*get_data) (struct grub_efi_ip6_config_protocol *this,
++  grub_efi_status_t (__grub_efi_api *get_data) (struct grub_efi_ip6_config_protocol *this,
+ 				 grub_efi_ip6_config_data_type_t data_type,
+ 				 grub_efi_uintn_t *data_size,
+ 				 void *data);
+ 
+-  grub_efi_status_t (*register_data_notify) (struct grub_efi_ip6_config_protocol *this,
++  grub_efi_status_t (__grub_efi_api *register_data_notify) (struct grub_efi_ip6_config_protocol *this,
+ 					     grub_efi_ip6_config_data_type_t data_type,
+ 					     grub_efi_event_t event);
+ 
+-  grub_efi_status_t (*unregister_datanotify) (struct grub_efi_ip6_config_protocol *this,
++  grub_efi_status_t (__grub_efi_api *unregister_datanotify) (struct grub_efi_ip6_config_protocol *this,
+ 					     grub_efi_ip6_config_data_type_t data_type,
+ 					     grub_efi_event_t event);
+ };
+@@ -2191,17 +2191,17 @@ typedef struct grub_efi_ip6_config_manual_address grub_efi_ip6_config_manual_add
+ 
+ struct grub_efi_memory_attribute_protocol
+ {
+-  grub_efi_status_t (*get_memory_attributes) (
++  grub_efi_status_t (__grub_efi_api *get_memory_attributes) (
+ 			    struct grub_efi_memory_attribute_protocol *this,
+ 			    grub_efi_physical_address_t base_address,
+ 			    grub_efi_uint64_t length,
+ 			    grub_efi_uint64_t *attributes);
+-  grub_efi_status_t (*set_memory_attributes) (
++  grub_efi_status_t (__grub_efi_api *set_memory_attributes) (
+ 			    struct grub_efi_memory_attribute_protocol *this,
+ 			    grub_efi_physical_address_t base_address,
+ 			    grub_efi_uint64_t length,
+ 			    grub_efi_uint64_t attributes);
+-  grub_efi_status_t (*clear_memory_attributes) (
++  grub_efi_status_t (__grub_efi_api *clear_memory_attributes) (
+ 			    struct grub_efi_memory_attribute_protocol *this,
+ 			    grub_efi_physical_address_t base_address,
+ 			    grub_efi_uint64_t length,
+diff --git a/include/grub/efi/dhcp.h b/include/grub/efi/dhcp.h
+index fdb88eb81..d996716e4 100644
+--- a/include/grub/efi/dhcp.h
++++ b/include/grub/efi/dhcp.h
+@@ -123,7 +123,7 @@ struct grub_efi_dhcp4_config_data {
+   grub_efi_uint32_t request_try_count;
+   grub_efi_uint32_t *request_timeout;
+   grub_efi_ipv4_address_t client_address;
+-  grub_efi_status_t (*dhcp4_callback) (
++  grub_efi_status_t (__grub_efi_api *dhcp4_callback) (
+     grub_efi_dhcp4_protocol_t *this,
+     void *context,
+     grub_efi_dhcp4_state_t current_state,
+@@ -153,27 +153,27 @@ struct grub_efi_dhcp4_mode_data {
+ typedef struct grub_efi_dhcp4_mode_data grub_efi_dhcp4_mode_data_t;
+ 
+ struct grub_efi_dhcp4_protocol {
+-  grub_efi_status_t (*get_mode_data) (grub_efi_dhcp4_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *get_mode_data) (grub_efi_dhcp4_protocol_t *this,
+ 	      grub_efi_dhcp4_mode_data_t *dhcp4_mode_data);
+-  grub_efi_status_t (*configure) (grub_efi_dhcp4_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *configure) (grub_efi_dhcp4_protocol_t *this,
+ 	      grub_efi_dhcp4_config_data_t *dhcp4_cfg_data);
+-  grub_efi_status_t (*start) (grub_efi_dhcp4_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *start) (grub_efi_dhcp4_protocol_t *this,
+ 	      grub_efi_event_t completion_event);
+-  grub_efi_status_t (*renew_rebind) (grub_efi_dhcp4_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *renew_rebind) (grub_efi_dhcp4_protocol_t *this,
+ 	      grub_efi_boolean_t rebind_request,
+ 	      grub_efi_event_t completion_event);
+-  grub_efi_status_t (*release) (grub_efi_dhcp4_protocol_t *this);
+-  grub_efi_status_t (*stop) (grub_efi_dhcp4_protocol_t *this);
+-  grub_efi_status_t (*build) (grub_efi_dhcp4_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *release) (grub_efi_dhcp4_protocol_t *this);
++  grub_efi_status_t (__grub_efi_api *stop) (grub_efi_dhcp4_protocol_t *this);
++  grub_efi_status_t (__grub_efi_api *build) (grub_efi_dhcp4_protocol_t *this,
+ 	      grub_efi_dhcp4_packet_t *seed_packet,
+ 	      grub_efi_uint32_t delete_count,
+ 	      grub_efi_uint8_t *delete_list,
+ 	      grub_efi_uint32_t append_count,
+ 	      grub_efi_dhcp4_packet_option_t *append_list[],
+ 	      grub_efi_dhcp4_packet_t **new_packet);
+-  grub_efi_status_t (*transmit_receive) (grub_efi_dhcp4_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *transmit_receive) (grub_efi_dhcp4_protocol_t *this,
+ 	      grub_efi_dhcp4_transmit_receive_token_t *token);
+-  grub_efi_status_t (*parse) (grub_efi_dhcp4_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *parse) (grub_efi_dhcp4_protocol_t *this,
+ 	      grub_efi_dhcp4_packet_t *packet,
+ 	      grub_efi_uint32_t *option_count,
+ 	      grub_efi_dhcp4_packet_option_t *packet_option_list[]);
+@@ -289,7 +289,7 @@ struct grub_efi_dhcp6_mode_data {
+ typedef struct grub_efi_dhcp6_mode_data grub_efi_dhcp6_mode_data_t;
+ 
+ struct grub_efi_dhcp6_config_data {
+-  grub_efi_status_t (*dhcp6_callback) (grub_efi_dhcp6_protocol_t this,
++  grub_efi_status_t (__grub_efi_api *dhcp6_callback) (grub_efi_dhcp6_protocol_t this,
+ 		void *context,
+ 		grub_efi_dhcp6_state_t current_state,
+ 		grub_efi_dhcp6_event_t dhcp6_event,
+@@ -308,33 +308,33 @@ struct grub_efi_dhcp6_config_data {
+ typedef struct grub_efi_dhcp6_config_data grub_efi_dhcp6_config_data_t;
+ 
+ struct grub_efi_dhcp6_protocol {
+-  grub_efi_status_t (*get_mode_data) (grub_efi_dhcp6_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *get_mode_data) (grub_efi_dhcp6_protocol_t *this,
+ 	    grub_efi_dhcp6_mode_data_t *dhcp6_mode_data,
+ 	    grub_efi_dhcp6_config_data_t *dhcp6_config_data);
+-  grub_efi_status_t (*configure) (grub_efi_dhcp6_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *configure) (grub_efi_dhcp6_protocol_t *this,
+ 	    grub_efi_dhcp6_config_data_t *dhcp6_cfg_data);
+-  grub_efi_status_t (*start) (grub_efi_dhcp6_protocol_t *this);
+-  grub_efi_status_t (*info_request) (grub_efi_dhcp6_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *start) (grub_efi_dhcp6_protocol_t *this);
++  grub_efi_status_t (__grub_efi_api *info_request) (grub_efi_dhcp6_protocol_t *this,
+ 	    grub_efi_boolean_t send_client_id,
+ 	    grub_efi_dhcp6_packet_option_t *option_request,
+ 	    grub_efi_uint32_t option_count,
+ 	    grub_efi_dhcp6_packet_option_t *option_list[],
+ 	    grub_efi_dhcp6_retransmission_t *retransmission,
+ 	    grub_efi_event_t timeout_event,
+-	    grub_efi_status_t (*reply_callback) (grub_efi_dhcp6_protocol_t *this,
++	    grub_efi_status_t (__grub_efi_api *reply_callback) (grub_efi_dhcp6_protocol_t *this,
+ 		    void *context,
+ 		    grub_efi_dhcp6_packet_t *packet),
+ 	    void *callback_context);
+-  grub_efi_status_t (*renew_rebind) (grub_efi_dhcp6_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *renew_rebind) (grub_efi_dhcp6_protocol_t *this,
+ 	    grub_efi_boolean_t rebind_request);
+-  grub_efi_status_t (*decline) (grub_efi_dhcp6_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *decline) (grub_efi_dhcp6_protocol_t *this,
+ 	    grub_efi_uint32_t address_count,
+ 	    grub_efi_ipv6_address_t *addresses);
+-  grub_efi_status_t (*release) (grub_efi_dhcp6_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *release) (grub_efi_dhcp6_protocol_t *this,
+ 	    grub_efi_uint32_t address_count,
+ 	    grub_efi_ipv6_address_t *addresses);
+-  grub_efi_status_t (*stop) (grub_efi_dhcp6_protocol_t *this);
+-  grub_efi_status_t (*parse) (grub_efi_dhcp6_protocol_t *this,
++  grub_efi_status_t (__grub_efi_api *stop) (grub_efi_dhcp6_protocol_t *this);
++  grub_efi_status_t (__grub_efi_api *parse) (grub_efi_dhcp6_protocol_t *this,
+ 	    grub_efi_dhcp6_packet_t *packet,
+ 	    grub_efi_uint32_t *option_count,
+ 	    grub_efi_dhcp6_packet_option_t *packet_option_list[]);
+diff --git a/include/grub/efi/edid.h b/include/grub/efi/edid.h
+index 43c0c4372..ac1b8e2fd 100644
+--- a/include/grub/efi/edid.h
++++ b/include/grub/efi/edid.h
+@@ -33,7 +33,7 @@
+ struct grub_efi_edid_override;
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_edid_override_get_edid) (struct grub_efi_edid_override *this,
++(__grub_efi_api *grub_efi_edid_override_get_edid) (struct grub_efi_edid_override *this,
+ 				    grub_efi_handle_t *childhandle,
+ 				    grub_efi_uint32_t *attributes,
+ 				    grub_efi_uintn_t *edidsize,
+diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h
+index ad164ba19..242d001b6 100644
+--- a/include/grub/efi/http.h
++++ b/include/grub/efi/http.h
+@@ -188,27 +188,27 @@ typedef struct {
+ 
+ struct grub_efi_http {
+   grub_efi_status_t
+-  (*get_mode_data) (struct grub_efi_http *this,
++  (__grub_efi_api *get_mode_data) (struct grub_efi_http *this,
+                     grub_efi_http_config_data_t *http_config_data);
+ 
+   grub_efi_status_t
+-  (*configure) (struct grub_efi_http *this,
++  (__grub_efi_api *configure) (struct grub_efi_http *this,
+                 grub_efi_http_config_data_t *http_config_data);
+ 
+   grub_efi_status_t
+-  (*request) (struct grub_efi_http *this,
++  (__grub_efi_api *request) (struct grub_efi_http *this,
+               grub_efi_http_token_t *token);
+ 
+   grub_efi_status_t
+-  (*cancel) (struct grub_efi_http *this,
++  (__grub_efi_api *cancel) (struct grub_efi_http *this,
+              grub_efi_http_token_t *token);
+ 
+   grub_efi_status_t
+-  (*response) (struct grub_efi_http *this,
++  (__grub_efi_api *response) (struct grub_efi_http *this,
+                grub_efi_http_token_t *token);
+ 
+   grub_efi_status_t
+-  (*poll) (struct grub_efi_http *this);
++  (__grub_efi_api *poll) (struct grub_efi_http *this);
+ };
+ typedef struct grub_efi_http grub_efi_http_t;
+ 
+diff --git a/include/grub/efi/pci.h b/include/grub/efi/pci.h
+index b17245549..a90f61042 100644
+--- a/include/grub/efi/pci.h
++++ b/include/grub/efi/pci.h
+@@ -48,7 +48,7 @@ typedef enum
+ struct grub_efi_pci_io;
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_mem_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_mem_t) (struct grub_efi_pci_io *this,
+ 			  grub_efi_pci_io_width_t width,
+ 			  grub_efi_uint8_t bar_index,
+ 			  grub_efi_uint64_t offset,
+@@ -56,7 +56,7 @@ typedef grub_efi_status_t
+ 			  void *buffer);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_config_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_config_t) (struct grub_efi_pci_io *this,
+ 			     grub_efi_pci_io_width_t width,
+ 			     grub_efi_uint32_t offset,
+ 			     grub_efi_uintn_t count,
+@@ -113,7 +113,7 @@ typedef enum
+   grub_efi_pci_io_attribute_operation_t;
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_poll_io_mem_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_poll_io_mem_t) (struct grub_efi_pci_io *this,
+ 				  grub_efi_pci_io_width_t  width,
+ 				  grub_efi_uint8_t bar_ndex,
+ 				  grub_efi_uint64_t offset,
+@@ -123,7 +123,7 @@ typedef grub_efi_status_t
+ 				  grub_efi_uint64_t *result);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_copy_mem_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_copy_mem_t) (struct grub_efi_pci_io *this,
+ 			       grub_efi_pci_io_width_t width,
+ 			       grub_efi_uint8_t dest_bar_index,
+ 			       grub_efi_uint64_t dest_offset,
+@@ -132,7 +132,7 @@ typedef grub_efi_status_t
+ 			       grub_efi_uintn_t count);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_map_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_map_t) (struct grub_efi_pci_io *this,
+ 			  grub_efi_pci_io_operation_t operation,
+ 			  void *host_address,
+ 			  grub_efi_uintn_t *number_of_bytes,
+@@ -140,11 +140,11 @@ typedef grub_efi_status_t
+ 			  void **mapping);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_unmap_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_unmap_t) (struct grub_efi_pci_io *this,
+ 			    void *mapping);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_allocate_buffer_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_allocate_buffer_t) (struct grub_efi_pci_io *this,
+ 				      grub_efi_allocate_type_t type,
+ 				      grub_efi_memory_type_t memory_type,
+ 				      grub_efi_uintn_t pages,
+@@ -152,7 +152,7 @@ typedef grub_efi_status_t
+ 				      grub_efi_uint64_t attributes);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_free_buffer_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_free_buffer_t) (struct grub_efi_pci_io *this,
+ 				  grub_efi_allocate_type_t type,
+ 				  grub_efi_memory_type_t memory_type,
+ 				  grub_efi_uintn_t pages,
+@@ -160,29 +160,29 @@ typedef grub_efi_status_t
+ 				  grub_efi_uint64_t attributes);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_flush_t) (struct grub_efi_pci_io *this);
++(__grub_efi_api *grub_efi_pci_io_flush_t) (struct grub_efi_pci_io *this);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_get_location_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_get_location_t) (struct grub_efi_pci_io *this,
+ 				   grub_efi_uintn_t *segment_number,
+ 				   grub_efi_uintn_t *bus_number,
+ 				   grub_efi_uintn_t *device_number,
+ 				   grub_efi_uintn_t *function_number);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_attributes_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_attributes_t) (struct grub_efi_pci_io *this,
+ 				 grub_efi_pci_io_attribute_operation_t operation,
+ 				 grub_efi_uint64_t attributes,
+ 				 grub_efi_uint64_t *result);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_get_bar_attributes_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_get_bar_attributes_t) (struct grub_efi_pci_io *this,
+ 					 grub_efi_uint8_t bar_index,
+ 					 grub_efi_uint64_t *supports,
+ 					 void **resources);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_io_set_bar_attributes_t) (struct grub_efi_pci_io *this,
++(__grub_efi_api *grub_efi_pci_io_set_bar_attributes_t) (struct grub_efi_pci_io *this,
+ 					 grub_efi_uint64_t attributes,
+ 					 grub_efi_uint8_t bar_index,
+ 					 grub_efi_uint64_t *offset,
+@@ -212,12 +212,12 @@ struct grub_efi_pci_root_io;
+ 
+ typedef struct
+ {
+-  grub_efi_status_t(*read) (struct grub_efi_pci_root_io *this,
++  grub_efi_status_t(__grub_efi_api *read) (struct grub_efi_pci_root_io *this,
+ 			    grub_efi_pci_io_width_t width,
+ 			    grub_efi_uint64_t address,
+ 			    grub_efi_uintn_t count,
+ 			    void *buffer);
+-  grub_efi_status_t(*write) (struct grub_efi_pci_root_io *this,
++  grub_efi_status_t(__grub_efi_api *write) (struct grub_efi_pci_root_io *this,
+ 			     grub_efi_pci_io_width_t width,
+ 			     grub_efi_uint64_t address,
+ 			     grub_efi_uintn_t count,
+@@ -237,7 +237,7 @@ typedef enum
+   grub_efi_pci_root_io_operation_t;
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_root_io_poll_io_mem_t) (struct grub_efi_pci_root_io *this,
++(__grub_efi_api *grub_efi_pci_root_io_poll_io_mem_t) (struct grub_efi_pci_root_io *this,
+ 				       grub_efi_pci_io_width_t  width,
+ 				       grub_efi_uint64_t address,
+ 				       grub_efi_uint64_t mask,
+@@ -246,7 +246,7 @@ typedef grub_efi_status_t
+ 				       grub_efi_uint64_t *result);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_root_io_copy_mem_t) (struct grub_efi_pci_root_io *this,
++(__grub_efi_api *grub_efi_pci_root_io_copy_mem_t) (struct grub_efi_pci_root_io *this,
+ 				    grub_efi_pci_io_width_t width,
+ 				    grub_efi_uint64_t dest_offset,
+ 				    grub_efi_uint64_t src_offset,
+@@ -254,7 +254,7 @@ typedef grub_efi_status_t
+ 
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_root_io_map_t) (struct grub_efi_pci_root_io *this,
++(__grub_efi_api *grub_efi_pci_root_io_map_t) (struct grub_efi_pci_root_io *this,
+ 				grub_efi_pci_root_io_operation_t operation,
+ 			       void *host_address,
+ 			       grub_efi_uintn_t *number_of_bytes,
+@@ -262,11 +262,11 @@ typedef grub_efi_status_t
+ 			       void **mapping);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_root_io_unmap_t) (struct grub_efi_pci_root_io *this,
++(__grub_efi_api *grub_efi_pci_root_io_unmap_t) (struct grub_efi_pci_root_io *this,
+ 				 void *mapping);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_root_io_allocate_buffer_t) (struct grub_efi_pci_root_io *this,
++(__grub_efi_api *grub_efi_pci_root_io_allocate_buffer_t) (struct grub_efi_pci_root_io *this,
+ 					   grub_efi_allocate_type_t type,
+ 					   grub_efi_memory_type_t memory_type,
+ 					   grub_efi_uintn_t pages,
+@@ -274,26 +274,26 @@ typedef grub_efi_status_t
+ 					   grub_efi_uint64_t attributes);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_root_io_free_buffer_t) (struct grub_efi_pci_root_io *this,
++(__grub_efi_api *grub_efi_pci_root_io_free_buffer_t) (struct grub_efi_pci_root_io *this,
+ 				       grub_efi_uintn_t pages,
+ 				       void **host_address);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_root_io_flush_t) (struct grub_efi_pci_root_io *this);
++(__grub_efi_api *grub_efi_pci_root_io_flush_t) (struct grub_efi_pci_root_io *this);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_root_io_get_attributes_t) (struct grub_efi_pci_root_io *this,
++(__grub_efi_api *grub_efi_pci_root_io_get_attributes_t) (struct grub_efi_pci_root_io *this,
+ 					  grub_efi_uint64_t *supports,
+ 					  void **resources);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_root_io_set_attributes_t) (struct grub_efi_pci_root_io *this,
++(__grub_efi_api *grub_efi_pci_root_io_set_attributes_t) (struct grub_efi_pci_root_io *this,
+ 					  grub_efi_uint64_t attributes,
+ 					  grub_efi_uint64_t *offset,
+ 					  grub_efi_uint64_t *length);
+ 
+ typedef grub_efi_status_t
+-(*grub_efi_pci_root_io_configuration_t) (struct grub_efi_pci_root_io *this,
++(__grub_efi_api *grub_efi_pci_root_io_configuration_t) (struct grub_efi_pci_root_io *this,
+ 					 void **resources);
+ 
+ struct grub_efi_pci_root_io {
diff --git a/0274-grub-core-net-arp.c-fix-variable-name.patch b/0274-grub-core-net-arp.c-fix-variable-name.patch
new file mode 100644
index 00000000..a94167c6
--- /dev/null
+++ b/0274-grub-core-net-arp.c-fix-variable-name.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 28 Aug 2024 13:37:42 -0600
+Subject: [PATCH] grub-core/net/arp.c: fix variable name
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/net/arp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
+index 8bf0a06e1..7adeb7447 100644
+--- a/grub-core/net/arp.c
++++ b/grub-core/net/arp.c
+@@ -159,7 +159,7 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
+   sender_addr.option = 0;
+   target_addr.option = 0;
+ 
+-  grub_memcpy(&target_addr.ipv4, tmp_ptr, pln);
++  grub_memcpy(&sender_addr.ipv4, tmp_ptr, pln);
+   tmp_ptr += pln;
+ 
+   grub_net_link_layer_add_address (card, &sender_addr, &sender_mac_addr, 1);
diff --git a/0275-load-EFI-commands-inside-test-expressions.patch b/0275-load-EFI-commands-inside-test-expressions.patch
new file mode 100644
index 00000000..137890ef
--- /dev/null
+++ b/0275-load-EFI-commands-inside-test-expressions.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 4 Sep 2024 13:25:23 -0600
+Subject: [PATCH] load EFI commands inside test expressions
+
+These two commands may fail interrumping the normal boot process,
+so placing these inside test expressions is a safer approach.
+
+Resolves: #2305291
+Suggested-by: Kan-Ru Chen: <kanru@kanru.info>
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ util/grub.d/25_bli.in           | 4 +++-
+ util/grub.d/30_uefi-firmware.in | 3 +--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/util/grub.d/25_bli.in b/util/grub.d/25_bli.in
+index 26e27a019..00a8d7159 100644
+--- a/util/grub.d/25_bli.in
++++ b/util/grub.d/25_bli.in
+@@ -19,6 +19,8 @@ set -e
+ 
+ cat << EOF
+ if [ "\$grub_platform" = "efi" ]; then
+-  insmod bli
++        if [ ! insmod bli ]; then
++                echo "bli module not available"
++        fi
+ fi
+ EOF
+diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
+index 1c2365ddb..1ef31e08f 100644
+--- a/util/grub.d/30_uefi-firmware.in
++++ b/util/grub.d/30_uefi-firmware.in
+@@ -32,8 +32,7 @@ gettext_printf "Adding boot menu entry for UEFI Firmware Settings ...\n" >&2
+ 
+ cat << EOF
+ if [ "\$grub_platform" = "efi" ]; then
+-	fwsetup --is-supported
+-	if [ "\$?" = 0 ]; then
++	if [ fwsetup --is-supported ]; then
+ 		menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
+ 			fwsetup
+ 		}
diff --git a/0276-efi-loader-Check-if-NX-is-required-in-grub_efi_linux.patch b/0276-efi-loader-Check-if-NX-is-required-in-grub_efi_linux.patch
new file mode 100644
index 00000000..0942ea42
--- /dev/null
+++ b/0276-efi-loader-Check-if-NX-is-required-in-grub_efi_linux.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nicolas Frayer <nfrayer@redhat.com>
+Date: Wed, 25 Sep 2024 17:23:33 +0200
+Subject: [PATCH] efi/loader: Check if NX is required in grub_efi_linux_boot()
+
+Call grub_efi_check_nx_required() passing it nx_required to
+assign the correct value
+
+Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ grub-core/loader/efi/linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index 0d1804b602da..5889e3f36f89 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -236,6 +236,7 @@ grub_efi_linux_boot (grub_addr_t k_address, grub_size_t k_size,
+   grub_dprintf ("linux", "kernel_address: %p handover_offset: %p params: %p\n",
+ 		(void *)k_address, (void *)h_offset, k_params);
+ 
++  grub_efi_check_nx_required(&nx_required);
+ 
+   if (nx_required && !nx_supported)
+     return grub_error (GRUB_ERR_BAD_OS, N_("kernel does not support NX loading required by policy"));
diff --git a/0277-Stop-grub.efi-from-always-printing-dynamic_load_symb.patch b/0277-Stop-grub.efi-from-always-printing-dynamic_load_symb.patch
new file mode 100644
index 00000000..02a64177
--- /dev/null
+++ b/0277-Stop-grub.efi-from-always-printing-dynamic_load_symb.patch
@@ -0,0 +1,80 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Thu, 3 Oct 2024 12:26:07 +0200
+Subject: [PATCH] Stop grub.efi from always printing "dynamic_load_symbols
+ %p\n" during boot
+
+Commit 972aa68d2bf5 ("Make a "gdb" dprintf that tells us load addresses.")
+added some debug prints to help with running gdb against grub.
+
+Besides adding a new grub_dl_print_gdb_info () function which uses
+`grub_qdprintf ("gdb", ...);` it also adds a new grub_efi_print_gdb_info ()
+call to grub_efi_init ().
+
+grub_efi_print_gdb_info () is intended for the gdbinfo command and uses
+a non debug grub_printf () call leading to grub now always printing this
+message during boot breaking flicker-free boot.
+
+Add a new "debug" parameter to grub_efi_print_gdb_info () and use
+`grub_qdprintf ("gdb", ...);` when this is set to silence the printing
+done from grub_efi_init () when debugging is not enabled.
+
+Fixes: 972aa68d2bf5 ("Make a "gdb" dprintf that tells us load addresses.")
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ grub-core/kern/efi/debug.c | 2 +-
+ grub-core/kern/efi/init.c  | 2 +-
+ include/grub/efi/debug.h   | 7 +++++--
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/kern/efi/debug.c b/grub-core/kern/efi/debug.c
+index 5d2ab1a36ff4..5ac194fc8f46 100644
+--- a/grub-core/kern/efi/debug.c
++++ b/grub-core/kern/efi/debug.c
+@@ -26,7 +26,7 @@ grub_cmd_gdbinfo (struct grub_command *cmd __attribute__ ((unused)),
+ 		  int argc __attribute__ ((unused)),
+ 		  char **args __attribute__ ((unused)))
+ {
+-  grub_efi_print_gdb_info ();
++  grub_efi_print_gdb_info (false);
+   return 0;
+ }
+ 
+diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
+index d35d69747342..ce8a7fe7122f 100644
+--- a/grub-core/kern/efi/init.c
++++ b/grub-core/kern/efi/init.c
+@@ -157,7 +157,7 @@ grub_efi_init (void)
+   grub_efi_system_table->boot_services->set_watchdog_timer (0, 0, 0, NULL);
+ 
+   grub_efi_env_init ();
+-  grub_efi_print_gdb_info ();
++  grub_efi_print_gdb_info (true);
+   grub_efidisk_init ();
+ 
+   grub_efi_register_debug_commands ();
+diff --git a/include/grub/efi/debug.h b/include/grub/efi/debug.h
+index c2d2a03b06f1..961e591afa3e 100644
+--- a/include/grub/efi/debug.h
++++ b/include/grub/efi/debug.h
+@@ -27,7 +27,7 @@
+ void grub_efi_register_debug_commands (void);
+ 
+ static inline void
+-grub_efi_print_gdb_info (void)
++grub_efi_print_gdb_info (bool debug)
+ {
+   grub_addr_t text;
+ 
+@@ -35,7 +35,10 @@ grub_efi_print_gdb_info (void)
+   if (!text)
+     return;
+ 
+-  grub_printf ("dynamic_load_symbols %p\n", (void *)text);
++  if (debug)
++    grub_qdprintf ("gdb", "dynamic_load_symbols %p\n", (void *)text);
++  else
++    grub_printf ("dynamic_load_symbols %p\n", (void *)text);
+ }
+ 
+ #endif /* ! GRUB_EFI_DEBUG_HEADER */
diff --git a/0277-Try-reserving-less-ram.patch b/0277-Try-reserving-less-ram.patch
deleted file mode 100644
index 46fb871f..00000000
--- a/0277-Try-reserving-less-ram.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 8 Aug 2022 11:23:59 -0400
-Subject: [PATCH] Try reserving less ram...
-
-In 005a0aaaad2a00a1fa1e60d94cc4fd5407c22e7d, we switched from reserving
-one quarter of the available free memory to three quarters.  Apparently
-this has some unfortunate side-affects for some workloads, and has
-negatively effected chainloading[0] as well as Fedora CoreOS[1].
-
-This patch changes it to reserve /half/ of available memory, in hopes
-that this is a working compromise.
-
-[0] https://bugzilla.redhat.com/show_bug.cgi?id=2115202
-[1] https://github.com/coreos/fedora-coreos-tracker/issues/1271
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/kern/efi/mm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 150e412ee7..b4e012f5e7 100644
---- a/grub-core/kern/efi/mm.c
-+++ b/grub-core/kern/efi/mm.c
-@@ -740,7 +740,7 @@ grub_efi_mm_init (void)
-   /* By default, request three quarters of the available memory.  */
-   total_pages = get_total_pages (filtered_memory_map, desc_size,
- 				 filtered_memory_map_end);
--  required_pages = (total_pages >> 1) + (total_pages >> 2);
-+  required_pages = (total_pages >> 1);
-   if (required_pages < BYTES_TO_PAGES (MIN_HEAP_SIZE))
-     required_pages = BYTES_TO_PAGES (MIN_HEAP_SIZE);
-   else if (required_pages > BYTES_TO_PAGES (MAX_HEAP_SIZE))
diff --git a/0278-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch b/0278-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch
new file mode 100644
index 00000000..20d2de34
--- /dev/null
+++ b/0278-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Date: Wed, 16 Oct 2024 16:20:24 +1100
+Subject: [PATCH] acpi: Fix out of bounds access in grub_acpi_xsdt_find_table()
+
+The calculation of the size of the table was incorrect (copy/pasta from
+grub_acpi_rsdt_find_table() I assume...). The entries are 64-bit long.
+
+This causes us to access beyond the end of the table which is causing
+crashes during boot on some systems. Typically this is causing a crash
+on VMWare when using UEFI and enabling serial autodetection, as
+
+grub_acpi_find_table (GRUB_ACPI_SPCR_SIGNATURE);
+
+Will goes past the end of the table (the SPCR table doesn't exits)
+
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+---
+ grub-core/kern/acpi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/acpi.c b/grub-core/kern/acpi.c
+index 48ded4e2ea6e..8ff0835d501f 100644
+--- a/grub-core/kern/acpi.c
++++ b/grub-core/kern/acpi.c
+@@ -75,7 +75,7 @@ grub_acpi_xsdt_find_table (struct grub_acpi_table_header *xsdt, const char *sig)
+     return 0;
+ 
+   ptr = (grub_unaligned_uint64_t *) (xsdt + 1);
+-  s = (xsdt->length - sizeof (*xsdt)) / sizeof (grub_uint32_t);
++  s = (xsdt->length - sizeof (*xsdt)) / sizeof (grub_uint64_t);
+   for (; s; s--, ptr++)
+     {
+       struct grub_acpi_table_header *tbl;
diff --git a/0279-cmd-search-Fix-a-possible-NULL-ptr-dereference.patch b/0279-cmd-search-Fix-a-possible-NULL-ptr-dereference.patch
new file mode 100644
index 00000000..7da6e10b
--- /dev/null
+++ b/0279-cmd-search-Fix-a-possible-NULL-ptr-dereference.patch
@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nicolas Frayer <nfrayer@redhat.com>
+Date: Wed, 16 Oct 2024 15:50:32 +0200
+Subject: [PATCH] cmd/search: Fix a possible NULL ptr dereference
+
+When querying about a partition UUID, we're not checking
+for get_device_uuid() return value, which can possibly
+result in dereferencing a NULL pointer.
+
+Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
+Co-authored-by: Chuong Tran <anhchuong89@gmail.com>
+---
+ grub-core/commands/search.c | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
+index 9dd937e6df4e..d538b36219fb 100644
+--- a/grub-core/commands/search.c
++++ b/grub-core/commands/search.c
+@@ -212,24 +212,26 @@ iterate_device (const char *name, void *data)
+                     struct uuid_context uuid_ctx;
+                     int ret = 0;
+ 
+-                    get_device_uuid(name, &quid_name);
+-                    if (!grub_strcmp(quid_name, ctx->key))
++                    if (get_device_uuid(name, &quid_name))
+                       {
+-                        uuid_ctx.name = name;
+-                        uuid_ctx.uuid = quid_name;
++                      if (!grub_strcmp(quid_name, ctx->key))
++                        {
++                          uuid_ctx.name = name;
++                          uuid_ctx.uuid = quid_name;
+ 
+-                        ret = grub_device_iterate (check_for_duplicate, &uuid_ctx);
++                          ret = grub_device_iterate (check_for_duplicate, &uuid_ctx);
+ 
+-                        if (ret)
+-                          {
+-                            grub_printf("Duplicated media UUID found, rebooting ...\n");
+-                            grub_sleep(10);
+-                            grub_reboot();
+-                          }
+-                      }
++                          if (ret)
++                            {
++                              grub_printf("Duplicated media UUID found, rebooting ...\n");
++                              grub_sleep(10);
++                              grub_reboot();
++                            }
++                        }
+ 
+-                    if (quid_name) grub_free (quid_name);
++                      if (quid_name) grub_free (quid_name);
+ 
++                    }
+                   }
+               }
+ 	  }
diff --git a/0280-Enable-building-blscfg-module-on-xen-and-xen_pvh.patch b/0280-Enable-building-blscfg-module-on-xen-and-xen_pvh.patch
new file mode 100644
index 00000000..d1747377
--- /dev/null
+++ b/0280-Enable-building-blscfg-module-on-xen-and-xen_pvh.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matyáš Kroupa <kroupa.matyas@gmail.com>
+Date: Fri, 30 Aug 2024 16:28:21 +0200
+Subject: [PATCH] Enable building blscfg module on xen and xen_pvh
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building blscfg module for Xen targets makes it possible to include them
+in custom pvgrub2 and pvhgrub2 images. Those are then used to boot PV and
+PVH domUs.
+
+Signed-off-by: Matyáš Kroupa <kroupa.matyas@gmail.com>
+---
+ grub-core/Makefile.core.def | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 6ff4835..95fd18d 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -880,6 +880,8 @@ module = {
+   enable = efi;
+   enable = i386_pc;
+   enable = emu;
++  enable = xen;
++  enable = i386_xen_pvh;
+ };
+
+ module = {
+--
+2.46.0
diff --git a/0281-loader-efi-Fix-RISC-V-build.patch b/0281-loader-efi-Fix-RISC-V-build.patch
new file mode 100644
index 00000000..91ccb602
--- /dev/null
+++ b/0281-loader-efi-Fix-RISC-V-build.patch
@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Tue, 19 Nov 2024 15:42:01 +0000
+Subject: [PATCH] loader/efi: Fix RISC-V build
+
+Some struct definitions are currently limited to 32-bit and
+64-bit Arm architectures, but they actually apply to other
+architectures as well, specifically 32-bit and 64-bit RISC-V
+respectively.
+
+Update the preprocessor checks guarding their definition, and
+change their names to make them more accurate by replacing the
+word "arm" with the word "efi".
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+---
+ grub-core/loader/efi/linux.c |  2 +-
+ include/grub/efi/efi.h       | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index 5889e3f36f8..ef55556f2d9 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -684,7 +684,7 @@ parse_pe_header (void *kernel, grub_uint64_t *total_size,
+ 		 grub_uint32_t *alignment, grub_uint32_t *code_size)
+ {
+   struct linux_arch_kernel_header *lh = kernel;
+-  struct grub_armxx_linux_pe_header *pe;
++  struct grub_efixx_linux_pe_header *pe;
+   grub_uint16_t i;
+   struct grub_pe32_section_table *sections;
+ 
+diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
+index 7eed1bd791d..81daf6bead1 100644
+--- a/include/grub/efi/efi.h
++++ b/include/grub/efi/efi.h
+@@ -36,28 +36,28 @@ struct linux_arch_kernel_header {
+   struct grub_pe_image_header pe_image_header;
+ };
+ 
+-struct grub_arm_linux_pe_header
++struct grub_efi32_linux_pe_header
+ {
+   grub_uint32_t magic;
+   struct grub_pe32_coff_header coff;
+   struct grub_pe32_optional_header opt;
+ };
+ 
+-struct grub_arm64_linux_pe_header
++struct grub_efi64_linux_pe_header
+ {
+   grub_uint32_t magic;
+   struct grub_pe32_coff_header coff;
+   struct grub_pe64_optional_header opt;
+ };
+ 
+-#if defined(__arm__)
++#if defined(__arm__) || (defined(__riscv) && (__riscv_xlen == 32))
+ # define GRUB_PE32_PEXX_MAGIC GRUB_PE32_PE32_MAGIC
+-# define grub_armxx_linux_pe_header grub_arm_linux_pe_header
++# define grub_efixx_linux_pe_header grub_efi32_linux_pe_header
+ #endif
+ 
+-#if defined(__aarch64__)
++#if defined(__aarch64__) || (defined(__riscv) && (__riscv_xlen == 64))
+ # define GRUB_PE32_PEXX_MAGIC GRUB_PE32_PE64_MAGIC
+-# define grub_armxx_linux_pe_header grub_arm64_linux_pe_header
++# define grub_efixx_linux_pe_header grub_efi64_linux_pe_header
+ #endif
+ 
+ #define GRUB_EFI_GRUB_VARIABLE_GUID             \
diff --git a/0282-kern-riscv-efi-init-Use-time-register-in-grub_efi_ge.patch b/0282-kern-riscv-efi-init-Use-time-register-in-grub_efi_ge.patch
new file mode 100644
index 00000000..c38e333c
--- /dev/null
+++ b/0282-kern-riscv-efi-init-Use-time-register-in-grub_efi_ge.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
+Date: Mon, 12 Aug 2024 16:13:18 +0200
+Subject: [PATCH] kern/riscv/efi/init: Use time register in
+ grub_efi_get_time_ms()
+
+The cycle register is not guaranteed to count at constant frequency.
+If it is counting at all depends on the state the performance monitoring
+unit. Use the time register to measure time.
+
+Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/riscv/efi/init.c | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/grub-core/kern/riscv/efi/init.c b/grub-core/kern/riscv/efi/init.c
+index 38795fe6741..0d7de4f541a 100644
+--- a/grub-core/kern/riscv/efi/init.c
++++ b/grub-core/kern/riscv/efi/init.c
+@@ -33,16 +33,15 @@ grub_efi_get_time_ms (void)
+   grub_uint64_t tmr;
+ 
+ #if __riscv_xlen == 64
+-  asm volatile ("rdcycle %0" : "=r" (tmr));
++  asm volatile ("rdtime %0" : "=r"(tmr));
+ #else
+   grub_uint32_t lo, hi, tmp;
+-  asm volatile (
+-    "1:\n"
+-    "rdcycleh %0\n"
+-    "rdcycle %1\n"
+-    "rdcycleh %2\n"
+-    "bne %0, %2, 1b"
+-    : "=&r" (hi), "=&r" (lo), "=&r" (tmp));
++  asm volatile ("1:\n"
++                "rdtimeh %0\n"
++                "rdtime %1\n"
++                "rdtimeh %2\n"
++                "bne %0, %2, 1b"
++                : "=&r" (hi), "=&r" (lo), "=&r" (tmp));
+   tmr = ((grub_uint64_t)hi << 32) | lo;
+ #endif
+ 
diff --git a/0283-Use-medany-instead-of-large-model-for-RISCV.patch b/0283-Use-medany-instead-of-large-model-for-RISCV.patch
new file mode 100644
index 00000000..37540c47
--- /dev/null
+++ b/0283-Use-medany-instead-of-large-model-for-RISCV.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Montleon <jason@montleon.com>
+Date: Fri, 3 May 2024 13:18:37 -0400
+Subject: [PATCH] Use medany instead of large model for RISCV
+
+Signed-off-by: Jason Montleon <jason@montleon.com>
+---
+ configure.ac | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4788f3d6adc..a6a6957fbdb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1313,7 +1313,7 @@ AC_SUBST(TARGET_LDFLAGS_OLDMAGIC)
+ 
+ LDFLAGS="$TARGET_LDFLAGS"
+ 
+-if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 || test "$target_cpu" = riscv64 ; then
++if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 ; then
+   # Use large model to support 4G memory
+   AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
+     CFLAGS="$TARGET_CFLAGS -mcmodel=large"
+@@ -1323,9 +1323,11 @@ if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 || test "$target_
+   ])
+   if test "x$grub_cv_cc_mcmodel" = xyes; then
+     TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
+-  elif test "$target_cpu" = sparc64 || test "$target_cpu" = riscv64; then
++  elif test "$target_cpu" = sparc64; then
+     TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=medany"
+   fi
++elif test "$target_cpu" = riscv64 ; then
++    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=medany"
+ fi
+ 
+ if test "$target_cpu"-"$platform" = x86_64-efi; then
diff --git a/0284-fs-xfs-Fix-large-extent-counters-incompat-feature-su.patch b/0284-fs-xfs-Fix-large-extent-counters-incompat-feature-su.patch
new file mode 100644
index 00000000..ba641630
--- /dev/null
+++ b/0284-fs-xfs-Fix-large-extent-counters-incompat-feature-su.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Eric Sandeen <sandeen@redhat.com>
+Date: Wed, 4 Dec 2024 07:50:28 -0600
+Subject: [PATCH] fs/xfs: fix large extent counters incompat feature support
+
+When large extent counter / NREXT64 support was added to grub, it missed
+a couple of direct reads of nextents which need to be changed to the new
+NREXT64-aware helper as well. Without this, we'll have mis-reads of some
+directories with this feature enabled.
+
+(The large extent counter fix likely raced on merge with
+07318ee7e ("fs/xfs: Fix XFS directory extent parsing") which added the new
+direct nextents reads just prior, causing this issue.)
+
+Fixes: aa7c1322671e ("fs/xfs: Add large extent counters incompat feature support")
+Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+Reviewed-by: Anthony Iliopoulos <ailiop@suse.com>
+Reviewed-by: Jon DeVree <nuxi@vault24.org>
+---
+ grub-core/fs/xfs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index 8e02ab4a3014..92046f9bdf49 100644
+--- a/grub-core/fs/xfs.c
++++ b/grub-core/fs/xfs.c
+@@ -926,7 +926,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
+ 	     * Leaf and tail information are only in the data block if the number
+ 	     * of extents is 1.
+ 	     */
+-	    if (dir->inode.nextents == grub_cpu_to_be32_compile_time (1))
++	    if (grub_xfs_get_inode_nextents(&dir->inode) == 1)
+ 	      {
+ 		struct grub_xfs_dirblock_tail *tail = grub_xfs_dir_tail (dir->data, dirblock);
+ 
+@@ -980,7 +980,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
+ 		 * The expected number of directory entries is only tracked for the
+ 		 * single extent case.
+ 		 */
+-		if (dir->inode.nextents == grub_cpu_to_be32_compile_time (1))
++		if (grub_xfs_get_inode_nextents(&dir->inode) == 1)
+ 		  {
+ 		    /* Check if last direntry in this block is reached. */
+ 		    entries--;
diff --git a/0285-term-nns8250-spcr-return-if-redirection-is-disabled.patch b/0285-term-nns8250-spcr-return-if-redirection-is-disabled.patch
new file mode 100644
index 00000000..4e5cdc1c
--- /dev/null
+++ b/0285-term-nns8250-spcr-return-if-redirection-is-disabled.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Date: Thu, 16 Jan 2025 10:22:48 -0600
+Subject: [PATCH] term/nns8250-spcr: return if redirection is disabled
+
+The Microsoft spec for SPCR says "The base address of the Serial Port register
+set described using the ACPI Generic Address Structure, or 0 if console
+redirection is disabled." so return if disable (base address = 0). If this check
+is not done, we may get invalid ports for those particular machines that
+redirection is disabled and at some point hanging the booting execution when
+reading the grub.cfg configuration file.
+
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Reviewed-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/term/ns8250-spcr.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/grub-core/term/ns8250-spcr.c b/grub-core/term/ns8250-spcr.c
+index d52b52c26..86f1aa078 100644
+--- a/grub-core/term/ns8250-spcr.c
++++ b/grub-core/term/ns8250-spcr.c
+@@ -75,6 +75,11 @@ grub_ns8250_spcr_init (void)
+         config.speed = 115200;
+         break;
+     };
++
++  /* if base address is 0, it means redirection is disable, so return it */
++  if (spcr->base_addr.addr == 0)
++    return NULL;
++
+   switch (spcr->base_addr.space_id)
+     {
+       case GRUB_ACPI_GENADDR_MEM_SPACE:
diff --git a/0286-commands-legacycfg-Avoid-closing-file-twice.patch b/0286-commands-legacycfg-Avoid-closing-file-twice.patch
new file mode 100644
index 00000000..2e126ab3
--- /dev/null
+++ b/0286-commands-legacycfg-Avoid-closing-file-twice.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 16 Oct 2024 11:54:38 -0600
+Subject: [PATCH] commands/legacycfg: Avoid closing file twice
+
+An internal (at Red Hat) static soure code scan detected an
+use-after-free scenario:
+
+  Error: USE_AFTER_FREE (CWE-416):
+  grub-2.06/grub-core/commands/legacycfg.c:194: freed_arg: "grub_file_close" frees "file".
+  grub-2.06/grub-core/commands/legacycfg.c:201: deref_arg: Calling "grub_file_close" dereferences freed pointer "file".
+  #  199|         if (!args)
+  #  200|   	{
+  #  201|-> 	  grub_file_close (file);
+  #  202|   	  grub_free (suffix);
+  #  203|   	  grub_free (entrysrc);
+
+So, remove the extra file close call.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/legacycfg.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
+index 2c5d1a0ef..86bcda695 100644
+--- a/grub-core/commands/legacycfg.c
++++ b/grub-core/commands/legacycfg.c
+@@ -198,7 +198,6 @@ legacy_file (const char *filename)
+       const char **args = grub_malloc (sizeof (args[0]));
+       if (!args)
+ 	{
+-	  grub_file_close (file);
+ 	  grub_free (suffix);
+ 	  grub_free (entrysrc);
+ 	  return grub_errno;
diff --git a/0287-disk-ahci.c-remove-conditional-operator-for-endtime.patch b/0287-disk-ahci.c-remove-conditional-operator-for-endtime.patch
new file mode 100644
index 00000000..759cd4f9
--- /dev/null
+++ b/0287-disk-ahci.c-remove-conditional-operator-for-endtime.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 22 Jan 2025 13:37:42 -0600
+Subject: [PATCH] disk/ahci.c: remove conditional operator for endtime
+
+The conditional makes no sense when the two possible expressions have the same
+value, so remove it (perhaps the compiler does it for us but better to remove
+it).
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/disk/ahci.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
+index e7b5dc5f2..b247161b9 100644
+--- a/grub-core/disk/ahci.c
++++ b/grub-core/disk/ahci.c
+@@ -1038,7 +1038,7 @@ grub_ahci_readwrite_real (struct grub_ahci_device *dev,
+   grub_dprintf ("ahci", "AHCI tfd = %x\n",
+ 		dev->hba->ports[dev->port].task_file_data);
+ 
+-  endtime = grub_get_time_ms () + (spinup ? 20000 : 20000);
++  endtime = grub_get_time_ms () + 20000;
+   while ((dev->hba->ports[dev->port].command_issue & 1))
+     if (grub_get_time_ms () > endtime ||
+ 	(dev->hba->ports[dev->port].intstatus & GRUB_AHCI_HBA_PORT_IS_FATAL_MASK))
diff --git a/0288-commands-bli-Fix-crash-in-get_part_uuid.patch b/0288-commands-bli-Fix-crash-in-get_part_uuid.patch
new file mode 100644
index 00000000..fe26cecb
--- /dev/null
+++ b/0288-commands-bli-Fix-crash-in-get_part_uuid.patch
@@ -0,0 +1,80 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Wed, 17 Jul 2024 14:46:46 +0800
+Subject: [PATCH] commands/bli: Fix crash in get_part_uuid()
+
+The get_part_uuid() function made an assumption that the target GRUB
+device is a partition device and accessed device->disk->partition
+without checking for NULL. There are four situations where this
+assumption is problematic:
+
+1. The device is a net device instead of a disk.
+2. The device is an abstraction device, like LVM, RAID, or CRYPTO, which
+   is mostly logical "disk" ((lvmid/<UUID>) and so on).
+3. Firmware RAID may present the ESP to GRUB as an EFI disk (hd0) device
+   if it is contained within a Linux software RAID.
+4. When booting from a CD-ROM, the ESP is a VFAT image indexed by the El
+   Torito boot catalog. The boot device is set to (cd0), corresponding
+   to the CD-ROM image mounted as an ISO 9660 filesystem.
+
+As a result, get_part_uuid() could lead to a NULL pointer dereference
+and trigger a synchronous exception during boot if the ESP falls into
+one of these categories. This patch fixes the problem by adding the
+necessary checks to handle cases where the ESP is not a partition device.
+
+Additionally, to avoid disrupting the boot process, this patch relaxes
+the severity of the errors in this context to non-critical. Errors will
+be logged, but they will not prevent the boot process from continuing.
+
+Fixes: e0fa7dc84 (bli: Add a module for the Boot Loader Interface)
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-By: Oliver Steffen <osteffen@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/bli.c | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/bli.c b/grub-core/commands/bli.c
+index e0d8a54f7bea..298c5f70a876 100644
+--- a/grub-core/commands/bli.c
++++ b/grub-core/commands/bli.c
+@@ -48,6 +48,22 @@ get_part_uuid (const char *device_name, char **part_uuid)
+   if (device == NULL)
+     return grub_error (grub_errno, N_("cannot open device: %s"), device_name);
+ 
++  if (device->disk == NULL)
++    {
++      grub_dprintf ("bli", "%s is not a disk device, partuuid skipped\n", device_name);
++      *part_uuid = NULL;
++      grub_device_close (device);
++      return GRUB_ERR_NONE;
++    }
++
++  if (device->disk->partition == NULL)
++    {
++      grub_dprintf ("bli", "%s has no partition, partuuid skipped\n", device_name);
++      *part_uuid = NULL;
++      grub_device_close (device);
++      return GRUB_ERR_NONE;
++    }
++
+   disk = grub_disk_open (device->disk->name);
+   if (disk == NULL)
+     {
+@@ -99,7 +115,7 @@ set_loader_device_part_uuid (void)
+ 
+   status = get_part_uuid (device_name, &part_uuid);
+ 
+-  if (status == GRUB_ERR_NONE)
++  if (status == GRUB_ERR_NONE && part_uuid)
+     status = grub_efi_set_variable_to_string ("LoaderDevicePartUUID", &bli_vendor_guid, part_uuid,
+ 					      GRUB_EFI_VARIABLE_BOOTSERVICE_ACCESS |
+ 					      GRUB_EFI_VARIABLE_RUNTIME_ACCESS);
+@@ -117,4 +133,6 @@ GRUB_MOD_INIT (bli)
+ 				   GRUB_EFI_VARIABLE_BOOTSERVICE_ACCESS |
+ 				   GRUB_EFI_VARIABLE_RUNTIME_ACCESS);
+   set_loader_device_part_uuid ();
++  /* No error here is critical, other than being logged */
++  grub_print_error ();
+ }
diff --git a/0289-misc-Implement-grub_strlcpy.patch b/0289-misc-Implement-grub_strlcpy.patch
new file mode 100644
index 00000000..d6932f2e
--- /dev/null
+++ b/0289-misc-Implement-grub_strlcpy.patch
@@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sat, 15 Jun 2024 02:33:08 +0100
+Subject: [PATCH] misc: Implement grub_strlcpy()
+
+grub_strlcpy() acts the same way as strlcpy() does on most *NIX,
+returning the length of src and ensuring dest is always NUL
+terminated except when size is 0.
+
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ include/grub/misc.h | 39 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+
+diff --git a/include/grub/misc.h b/include/grub/misc.h
+index db517acd5..6b1e084af 100644
+--- a/include/grub/misc.h
++++ b/include/grub/misc.h
+@@ -72,6 +72,45 @@ grub_stpcpy (char *dest, const char *src)
+   return d - 1;
+ }
+ 
++static inline grub_size_t
++grub_strlcpy (char *dest, const char *src, grub_size_t size)
++{
++  char *d = dest;
++  grub_size_t res = 0;
++  /*
++   * We do not subtract one from size here to avoid dealing with underflowing
++   * the value, which is why to_copy is always checked to be greater than one
++   * throughout this function.
++   */
++  grub_size_t to_copy = size;
++
++  /* Copy size - 1 bytes to dest. */
++  if (to_copy > 1)
++    while ((*d++ = *src++) != '\0' && ++res && --to_copy > 1)
++      ;
++
++  /*
++   * NUL terminate if size != 0. The previous step may have copied a NUL byte
++   * if it reached the end of the string, but we know dest[size - 1] must always
++   * be a NUL byte.
++   */
++  if (size != 0)
++    dest[size - 1] = '\0';
++
++  /* If there is still space in dest, but are here, we reached the end of src. */
++  if (to_copy > 1)
++    return res;
++
++  /*
++   * If we haven't reached the end of the string, iterate through to determine
++   * the strings total length.
++   */
++  while (*src++ != '\0' && ++res)
++   ;
++
++  return res;
++}
++
+ /* XXX: If grub_memmove is too slow, we must implement grub_memcpy.  */
+ static inline void *
+ grub_memcpy (void *dest, const void *src, grub_size_t n)
diff --git a/0290-fs-ufs-Fix-a-heap-OOB-write.patch b/0290-fs-ufs-Fix-a-heap-OOB-write.patch
new file mode 100644
index 00000000..ed1be4cb
--- /dev/null
+++ b/0290-fs-ufs-Fix-a-heap-OOB-write.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sun, 12 May 2024 02:03:33 +0100
+Subject: [PATCH] fs/ufs: Fix a heap OOB write
+
+grub_strcpy() was used to copy a symlink name from the filesystem
+image to a heap allocated buffer. This led to a OOB write to adjacent
+heap allocations. Fix by using grub_strlcpy().
+
+Fixes: CVE-2024-45781
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ufs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c
+index a354c92d9..01235101b 100644
+--- a/grub-core/fs/ufs.c
++++ b/grub-core/fs/ufs.c
+@@ -463,7 +463,7 @@ grub_ufs_lookup_symlink (struct grub_ufs_data *data, int ino)
+   /* Check against zero is paylindromic, no need to swap.  */
+   if (data->inode.nblocks == 0
+       && INODE_SIZE (data) <= sizeof (data->inode.symlink))
+-    grub_strcpy (symlink, (char *) data->inode.symlink);
++    grub_strlcpy (symlink, (char *) data->inode.symlink, sz);
+   else
+     {
+       if (grub_ufs_read_file (data, 0, 0, 0, sz, symlink) < 0)
diff --git a/0291-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch b/0291-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch
new file mode 100644
index 00000000..5a836725
--- /dev/null
+++ b/0291-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sun, 12 May 2024 02:48:33 +0100
+Subject: [PATCH] fs/hfs: Fix stack OOB write with grub_strcpy()
+
+Replaced with grub_strlcpy().
+
+Fixes: CVE-2024-45782
+Fixes: CVE-2024-56737
+Fixes: https://savannah.gnu.org/bugs/?66599
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/hfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c
+index 91dc0e69c..920112b03 100644
+--- a/grub-core/fs/hfs.c
++++ b/grub-core/fs/hfs.c
+@@ -379,7 +379,7 @@ grub_hfs_mount (grub_disk_t disk)
+      volume name.  */
+   key.parent_dir = grub_cpu_to_be32_compile_time (1);
+   key.strlen = data->sblock.volname[0];
+-  grub_strcpy ((char *) key.str, (char *) (data->sblock.volname + 1));
++  grub_strlcpy ((char *) key.str, (char *) (data->sblock.volname + 1), sizeof (key.str));
+ 
+   if (grub_hfs_find_node (data, (char *) &key, data->cat_root,
+ 			  0, (char *) &dir, sizeof (dir)) == 0)
diff --git a/0292-fs-tar-Initialize-name-in-grub_cpio_find_file.patch b/0292-fs-tar-Initialize-name-in-grub_cpio_find_file.patch
new file mode 100644
index 00000000..6433d2d5
--- /dev/null
+++ b/0292-fs-tar-Initialize-name-in-grub_cpio_find_file.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sun, 12 May 2024 02:47:54 +0100
+Subject: [PATCH] fs/tar: Initialize name in grub_cpio_find_file()
+
+It was possible to iterate through grub_cpio_find_file() without
+allocating name and not setting mode to GRUB_ARCHELP_ATTR_END, which
+would cause the uninitialized value for name to be used as an argument
+for canonicalize() in grub_archelp_dir().
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/tar.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c
+index c551ed6b5..646bce5eb 100644
+--- a/grub-core/fs/tar.c
++++ b/grub-core/fs/tar.c
+@@ -78,6 +78,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+   int reread = 0, have_longname = 0, have_longlink = 0;
+ 
+   data->hofs = data->next_hofs;
++  *name = NULL;
+ 
+   for (reread = 0; reread < 3; reread++)
+     {
+@@ -202,6 +203,10 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+ 	}
+       return GRUB_ERR_NONE;
+     }
++
++  if (*name == NULL)
++    return grub_error (GRUB_ERR_BAD_FS, "invalid tar archive");
++
+   return GRUB_ERR_NONE;
+ }
+ 
diff --git a/0293-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch b/0293-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch
new file mode 100644
index 00000000..b059e496
--- /dev/null
+++ b/0293-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch
@@ -0,0 +1,89 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Fri, 22 Nov 2024 06:27:58 +0000
+Subject: [PATCH] fs/tar: Integer overflow leads to heap OOB write
+
+Both namesize and linksize are derived from hd.size, a 12-digit octal
+number parsed by read_number(). Later direct arithmetic calculation like
+"namesize + 1" and "linksize + 1" may exceed the maximum value of
+grub_size_t leading to heap OOB write. This patch fixes the issue by
+using grub_add() and checking for an overflow.
+
+Fixes: CVE-2024-45780
+
+Reported-by: Nils Langius <nils@langius.de>
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Reviewed-by: Alec Brown <alec.r.brown@oracle.com>
+---
+ grub-core/fs/tar.c | 23 ++++++++++++++++++-----
+ 1 file changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c
+index 646bce5eb..386c09022 100644
+--- a/grub-core/fs/tar.c
++++ b/grub-core/fs/tar.c
+@@ -25,6 +25,7 @@
+ #include <grub/mm.h>
+ #include <grub/dl.h>
+ #include <grub/i18n.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -76,6 +77,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+ {
+   struct head hd;
+   int reread = 0, have_longname = 0, have_longlink = 0;
++  grub_size_t sz;
+ 
+   data->hofs = data->next_hofs;
+   *name = NULL;
+@@ -98,7 +100,11 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+ 	{
+ 	  grub_err_t err;
+ 	  grub_size_t namesize = read_number (hd.size, sizeof (hd.size));
+-	  *name = grub_malloc (namesize + 1);
++
++	  if (grub_add (namesize, 1, &sz))
++	    return grub_error (GRUB_ERR_BAD_FS, N_("name size overflow"));
++
++	  *name = grub_malloc (sz);
+ 	  if (*name == NULL)
+ 	    return grub_errno;
+ 	  err = grub_disk_read (data->disk, 0,
+@@ -118,15 +124,19 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+ 	{
+ 	  grub_err_t err;
+ 	  grub_size_t linksize = read_number (hd.size, sizeof (hd.size));
+-	  if (data->linkname_alloc < linksize + 1)
++
++	  if (grub_add (linksize, 1, &sz))
++	    return grub_error (GRUB_ERR_BAD_FS, N_("link size overflow"));
++
++	  if (data->linkname_alloc < sz)
+ 	    {
+ 	      char *n;
+-	      n = grub_calloc (2, linksize + 1);
++	      n = grub_calloc (2, sz);
+ 	      if (!n)
+ 		return grub_errno;
+ 	      grub_free (data->linkname);
+ 	      data->linkname = n;
+-	      data->linkname_alloc = 2 * (linksize + 1);
++	      data->linkname_alloc = 2 * (sz);
+ 	    }
+ 
+ 	  err = grub_disk_read (data->disk, 0,
+@@ -149,7 +159,10 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+ 	  while (extra_size < sizeof (hd.prefix)
+ 		 && hd.prefix[extra_size])
+ 	    extra_size++;
+-	  *name = grub_malloc (sizeof (hd.name) + extra_size + 2);
++
++	  if (grub_add (sizeof (hd.name) + 2, extra_size, &sz))
++	    return grub_error (GRUB_ERR_BAD_FS, N_("long name size overflow"));
++	  *name = grub_malloc (sz);
+ 	  if (*name == NULL)
+ 	    return grub_errno;
+ 	  if (hd.prefix[0])
diff --git a/0294-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch b/0294-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch
new file mode 100644
index 00000000..0b72b727
--- /dev/null
+++ b/0294-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sun, 12 May 2024 06:15:03 +0100
+Subject: [PATCH] fs/f2fs: Set a grub_errno if mount fails
+
+It was previously possible for grub_errno to not be set when
+grub_f2fs_mount() failed if nat_bitmap_ptr() returned NULL.
+
+This issue is solved by ensuring a grub_errno is set in the fail case.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/f2fs.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c
+index 855e24618..db8a65f8d 100644
+--- a/grub-core/fs/f2fs.c
++++ b/grub-core/fs/f2fs.c
+@@ -872,6 +872,9 @@ grub_f2fs_mount (grub_disk_t disk)
+   return data;
+ 
+  fail:
++  if (grub_errno == GRUB_ERR_NONE)
++    grub_error (GRUB_ERR_BAD_FS, "not a F2FS filesystem");
++
+   grub_free (data);
+ 
+   return NULL;
diff --git a/0295-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch b/0295-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch
new file mode 100644
index 00000000..eb36c019
--- /dev/null
+++ b/0295-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sun, 12 May 2024 06:22:51 +0100
+Subject: [PATCH] fs/hfsplus: Set a grub_errno if mount fails
+
+It was possible for mount to fail but not set grub_errno. This led to
+a possible double decrement of the module reference count if the NULL
+page was mapped.
+
+Fixing in general as a similar bug was fixed in commit 61b13c187
+(fs/hfsplus: Set grub_errno to prevent NULL pointer access) and there
+are likely more variants around.
+
+Fixes: CVE-2024-45783
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/hfsplus.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
+index 295822f69..de71fd486 100644
+--- a/grub-core/fs/hfsplus.c
++++ b/grub-core/fs/hfsplus.c
+@@ -405,7 +405,7 @@ grub_hfsplus_mount (grub_disk_t disk)
+ 
+  fail:
+ 
+-  if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
++  if (grub_errno == GRUB_ERR_OUT_OF_RANGE || grub_errno == GRUB_ERR_NONE)
+     grub_error (GRUB_ERR_BAD_FS, "not a HFS+ filesystem");
+ 
+   grub_free (data);
diff --git a/0296-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch b/0296-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch
new file mode 100644
index 00000000..69470f69
--- /dev/null
+++ b/0296-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sun, 12 May 2024 06:37:08 +0100
+Subject: [PATCH] fs/iso9660: Set a grub_errno if mount fails
+
+It was possible for a grub_errno to not be set if mount of an ISO 9660
+filesystem failed when set_rockridge() returned 0.
+
+This isn't known to be exploitable as the other filesystems due to
+filesystem helper checking the requested file type. Though fixing
+as a precaution.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/iso9660.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
+index 8c348b59a..8d480e602 100644
+--- a/grub-core/fs/iso9660.c
++++ b/grub-core/fs/iso9660.c
+@@ -551,6 +551,9 @@ grub_iso9660_mount (grub_disk_t disk)
+   return data;
+ 
+  fail:
++  if (grub_errno == GRUB_ERR_NONE)
++    grub_error (GRUB_ERR_BAD_FS, "not a ISO9660 filesystem");
++
+   grub_free (data);
+   return 0;
+ }
diff --git a/0297-fs-iso9660-Fix-invalid-free.patch b/0297-fs-iso9660-Fix-invalid-free.patch
new file mode 100644
index 00000000..61bd5cce
--- /dev/null
+++ b/0297-fs-iso9660-Fix-invalid-free.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Fri, 31 May 2024 15:14:42 +0800
+Subject: [PATCH] fs/iso9660: Fix invalid free
+
+The ctx->filename can point to either a string literal or a dynamically
+allocated string. The ctx->filename_alloc field is used to indicate the
+type of allocation.
+
+An issue has been identified where ctx->filename is reassigned to
+a string literal in susp_iterate_dir() but ctx->filename_alloc is not
+correctly handled. This oversight causes a memory leak and an invalid
+free operation later.
+
+The fix involves checking ctx->filename_alloc, freeing the allocated
+string if necessary and clearing ctx->filename_alloc for string literals.
+
+Reported-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/iso9660.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
+index 8d480e602..8e3c95c4f 100644
+--- a/grub-core/fs/iso9660.c
++++ b/grub-core/fs/iso9660.c
+@@ -628,9 +628,19 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry,
+ 	 filename type is stored.  */
+       /* FIXME: Fix this slightly improper cast.  */
+       if (entry->data[0] & GRUB_ISO9660_RR_DOT)
+-	ctx->filename = (char *) ".";
++	{
++	  if (ctx->filename_alloc)
++	    grub_free (ctx->filename);
++	  ctx->filename_alloc = 0;
++	  ctx->filename = (char *) ".";
++	}
+       else if (entry->data[0] & GRUB_ISO9660_RR_DOTDOT)
+-	ctx->filename = (char *) "..";
++	{
++	  if (ctx->filename_alloc)
++	    grub_free (ctx->filename);
++	  ctx->filename_alloc = 0;
++	  ctx->filename = (char *) "..";
++	}
+       else if (entry->len >= 5)
+ 	{
+ 	  grub_size_t off = 0, csize = 1;
diff --git a/0298-fs-jfs-Fix-OOB-read-in-jfs_getent.patch b/0298-fs-jfs-Fix-OOB-read-in-jfs_getent.patch
new file mode 100644
index 00000000..49464e74
--- /dev/null
+++ b/0298-fs-jfs-Fix-OOB-read-in-jfs_getent.patch
@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Fri, 22 Nov 2024 06:27:59 +0000
+Subject: [PATCH] fs/jfs: Fix OOB read in jfs_getent()
+
+The JFS fuzzing revealed an OOB read in grub_jfs_getent(). The crash
+was caused by an invalid leaf nodes count, diro->dirpage->header.count,
+which was larger than the maximum number of leaf nodes allowed in an
+inode. This fix is to ensure that the leaf nodes count is validated in
+grub_jfs_opendir() before calling grub_jfs_getent().
+
+On the occasion replace existing raw numbers with newly defined constant.
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Reviewed-by: Alec Brown <alec.r.brown@oracle.com>
+---
+ grub-core/fs/jfs.c | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
+index 6f7c43904..32dec7fb7 100644
+--- a/grub-core/fs/jfs.c
++++ b/grub-core/fs/jfs.c
+@@ -41,6 +41,12 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+ #define GRUB_JFS_TREE_LEAF	2
+ 
++/*
++ * Define max entries stored in-line in an inode.
++ * https://jfs.sourceforge.net/project/pub/jfslayout.pdf
++ */
++#define GRUB_JFS_INODE_INLINE_ENTRIES	8
++
+ struct grub_jfs_sblock
+ {
+   /* The magic for JFS.  It should contain the string "JFS1".  */
+@@ -203,9 +209,9 @@ struct grub_jfs_inode
+ 	grub_uint8_t freecnt;
+ 	grub_uint8_t freelist;
+ 	grub_uint32_t idotdot;
+-	grub_uint8_t sorted[8];
++	grub_uint8_t sorted[GRUB_JFS_INODE_INLINE_ENTRIES];
+       } header;
+-      struct grub_jfs_leaf_dirent dirents[8];
++      struct grub_jfs_leaf_dirent dirents[GRUB_JFS_INODE_INLINE_ENTRIES];
+     } GRUB_PACKED dir;
+     /* Fast symlink.  */
+     struct
+@@ -453,6 +459,13 @@ grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode)
+   /* Check if the entire tree is contained within the inode.  */
+   if (inode->file.tree.flags & GRUB_JFS_TREE_LEAF)
+     {
++      if (inode->dir.header.count > GRUB_JFS_INODE_INLINE_ENTRIES)
++	{
++	  grub_free (diro);
++	  grub_error (GRUB_ERR_BAD_FS, N_("invalid JFS inode"));
++	  return 0;
++	}
++
+       diro->leaf = inode->dir.dirents;
+       diro->next_leaf = (struct grub_jfs_leaf_next_dirent *) de;
+       diro->sorted = inode->dir.header.sorted;
diff --git a/0299-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch b/0299-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch
new file mode 100644
index 00000000..029e8485
--- /dev/null
+++ b/0299-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch
@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Fri, 22 Nov 2024 06:28:00 +0000
+Subject: [PATCH] fs/jfs: Fix OOB read caused by invalid dir slot index
+
+While fuzz testing JFS with ASAN enabled an OOB read was detected in
+grub_jfs_opendir(). The issue occurred due to an invalid directory slot
+index in the first entry of the sorted directory slot array in the inode
+directory header. The fix ensures the slot index is validated before
+accessing it. Given that an internal or a leaf node in a directory B+
+tree is a 4 KiB in size and each directory slot is always 32 bytes, the
+max number of slots in a node is 128. The validation ensures that the
+slot index doesn't exceed this limit.
+
+[1] https://jfs.sourceforge.net/project/pub/jfslayout.pdf
+
+  JFS will allocate 4K of disk space for an internal node of the B+ tree.
+  An internal node looks the same as a leaf node.
+          - page 10
+
+  Fixed number of Directory Slots depending on the size of the node. These are
+  the slots to be used for storing the directory slot array and the directory
+  entries or router entries. A directory slot is always 32 bytes.
+  ...
+  A Directory Slot Array which is a sorted array of indices to the directory
+  slots that are currently in use.
+  ...
+  An internal or a leaf node in the directory B+ tree is a 4K page.
+          - page 25
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Reviewed-by: Alec Brown <alec.r.brown@oracle.com>
+---
+ grub-core/fs/jfs.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
+index 32dec7fb7..88fb884df 100644
+--- a/grub-core/fs/jfs.c
++++ b/grub-core/fs/jfs.c
+@@ -46,6 +46,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+  * https://jfs.sourceforge.net/project/pub/jfslayout.pdf
+  */
+ #define GRUB_JFS_INODE_INLINE_ENTRIES	8
++#define GRUB_JFS_DIR_MAX_SLOTS		128
+ 
+ struct grub_jfs_sblock
+ {
+@@ -481,6 +482,14 @@ grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode)
+       return 0;
+     }
+ 
++  if (inode->dir.header.sorted[0] >= GRUB_JFS_DIR_MAX_SLOTS)
++    {
++      grub_error (GRUB_ERR_BAD_FS, N_("invalid directory slot index"));
++      grub_free (diro->dirpage);
++      grub_free (diro);
++      return 0;
++    }
++
+   blk = grub_le_to_cpu32 (de[inode->dir.header.sorted[0]].ex.blk2);
+   blk <<= (grub_le_to_cpu16 (data->sblock.log2_blksz) - GRUB_DISK_SECTOR_BITS);
+ 
diff --git a/0300-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch b/0300-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch
new file mode 100644
index 00000000..ed387aeb
--- /dev/null
+++ b/0300-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch
@@ -0,0 +1,128 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Mon, 16 Dec 2024 20:22:39 +0000
+Subject: [PATCH] fs/jfs: Use full 40 bits offset and address for a data extent
+
+An extent's logical offset and address are represented as a 40-bit value
+split into two parts: the most significant 8 bits and the least
+significant 32 bits. Currently the JFS code uses only the least
+significant 32 bits value for offsets and addresses assuming the data
+size will never exceed the 32-bit range. This approach ignores the most
+significant 8 bits potentially leading to incorrect offsets and
+addresses for larger values. The patch fixes it by incorporating the
+most significant 8 bits into the calculation to get the full 40-bits
+value for offsets and addresses.
+
+https://jfs.sourceforge.net/project/pub/jfslayout.pdf
+
+  "off1,off2 is a 40-bit field, containing the logical offset of the first
+   block in the extent.
+   ...
+   addr1,addr2 is a 40-bit field, containing the address of the extent."
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/jfs.c | 41 +++++++++++++++++++++++++++++------------
+ 1 file changed, 29 insertions(+), 12 deletions(-)
+
+diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
+index 88fb884df..2bde48d45 100644
+--- a/grub-core/fs/jfs.c
++++ b/grub-core/fs/jfs.c
+@@ -265,6 +265,20 @@ static grub_dl_t my_mod;
+ 
+ static grub_err_t grub_jfs_lookup_symlink (struct grub_jfs_data *data, grub_uint32_t ino);
+ 
++/*
++ * An extent's offset, physical and logical, is represented as a 40-bit value.
++ * This 40-bit value is split into two parts:
++ *   - offset1: the most signficant 8 bits of the offset,
++ *   - offset2: the least significant 32 bits of the offset.
++ *
++ * This function calculates and returns the 64-bit offset of an extent.
++ */
++static grub_uint64_t
++get_ext_offset (grub_uint8_t offset1, grub_uint32_t offset2)
++{
++  return (((grub_uint64_t) offset1 << 32) | grub_le_to_cpu32 (offset2));
++}
++
+ static grub_int64_t
+ getblk (struct grub_jfs_treehead *treehead,
+ 	struct grub_jfs_tree_extent *extents,
+@@ -274,22 +288,25 @@ getblk (struct grub_jfs_treehead *treehead,
+ {
+   int found = -1;
+   int i;
++  grub_uint64_t ext_offset, ext_blk;
+ 
+   for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2 &&
+ 	      i < max_extents; i++)
+     {
++      ext_offset = get_ext_offset (extents[i].offset1, extents[i].offset2);
++      ext_blk = get_ext_offset (extents[i].extent.blk1, extents[i].extent.blk2);
++
+       if (treehead->flags & GRUB_JFS_TREE_LEAF)
+ 	{
+ 	  /* Read the leafnode.  */
+-	  if (grub_le_to_cpu32 (extents[i].offset2) <= blk
++	  if (ext_offset <= blk
+ 	      && ((grub_le_to_cpu16 (extents[i].extent.length))
+ 		  + (extents[i].extent.length2 << 16)
+-		  + grub_le_to_cpu32 (extents[i].offset2)) > blk)
+-	    return (blk - grub_le_to_cpu32 (extents[i].offset2)
+-		    + grub_le_to_cpu32 (extents[i].extent.blk2));
++		  + ext_offset) > blk)
++	    return (blk - ext_offset + ext_blk);
+ 	}
+       else
+-	if (blk >= grub_le_to_cpu32 (extents[i].offset2))
++	if (blk >= ext_offset)
+ 	  found = i;
+     }
+ 
+@@ -307,10 +324,9 @@ getblk (struct grub_jfs_treehead *treehead,
+ 	return -1;
+ 
+       if (!grub_disk_read (data->disk,
+-			   ((grub_disk_addr_t) grub_le_to_cpu32 (extents[found].extent.blk2))
+-			   << (grub_le_to_cpu16 (data->sblock.log2_blksz)
+-			       - GRUB_DISK_SECTOR_BITS), 0,
+-			   sizeof (*tree), (char *) tree))
++			   (grub_disk_addr_t) ext_blk
++			   << (grub_le_to_cpu16 (data->sblock.log2_blksz) - GRUB_DISK_SECTOR_BITS),
++			   0, sizeof (*tree), (char *) tree))
+ 	{
+ 	  if (grub_memcmp (&tree->treehead, treehead, sizeof (struct grub_jfs_treehead)) ||
+ 	      grub_memcmp (&tree->extents, extents, 254 * sizeof (struct grub_jfs_tree_extent)))
+@@ -361,7 +377,7 @@ grub_jfs_read_inode (struct grub_jfs_data *data, grub_uint32_t ino,
+ 		      sizeof (iag_inodes), &iag_inodes))
+     return grub_errno;
+ 
+-  inoblk = grub_le_to_cpu32 (iag_inodes[inoext].blk2);
++  inoblk = get_ext_offset (iag_inodes[inoext].blk1, iag_inodes[inoext].blk2);
+   inoblk <<= (grub_le_to_cpu16 (data->sblock.log2_blksz)
+ 	      - GRUB_DISK_SECTOR_BITS);
+   inoblk += inonum;
+@@ -490,7 +506,8 @@ grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode)
+       return 0;
+     }
+ 
+-  blk = grub_le_to_cpu32 (de[inode->dir.header.sorted[0]].ex.blk2);
++  blk = get_ext_offset (de[inode->dir.header.sorted[0]].ex.blk1,
++		      de[inode->dir.header.sorted[0]].ex.blk2);
+   blk <<= (grub_le_to_cpu16 (data->sblock.log2_blksz) - GRUB_DISK_SECTOR_BITS);
+ 
+   /* Read in the nodes until we are on the leaf node level.  */
+@@ -508,7 +525,7 @@ grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode)
+ 
+       de = (struct grub_jfs_internal_dirent *) diro->dirpage->dirent;
+       index = diro->dirpage->sorted[diro->dirpage->header.sindex * 32];
+-      blk = (grub_le_to_cpu32 (de[index].ex.blk2)
++      blk = (get_ext_offset (de[index].ex.blk1, de[index].ex.blk2)
+ 	     << (grub_le_to_cpu16 (data->sblock.log2_blksz)
+ 		 - GRUB_DISK_SECTOR_BITS));
+     } while (!(diro->dirpage->header.flags & GRUB_JFS_TREE_LEAF));
diff --git a/0301-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch b/0301-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch
new file mode 100644
index 00000000..33c684b2
--- /dev/null
+++ b/0301-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch
@@ -0,0 +1,85 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Mon, 16 Dec 2024 20:22:40 +0000
+Subject: [PATCH] fs/jfs: Inconsistent signed/unsigned types usage in return
+ values
+
+The getblk() returns a value of type grub_int64_t which is assigned to
+iagblk and inoblk, both of type grub_uint64_t, in grub_jfs_read_inode()
+via grub_jfs_blkno(). This patch fixes the type mismatch in the
+functions. Additionally, the getblk() will return 0 instead of -1 on
+failure cases. This change is safe because grub_errno is always set in
+getblk() to indicate errors and it is later checked in the callers.
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/jfs.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
+index 2bde48d45..70a2f4947 100644
+--- a/grub-core/fs/jfs.c
++++ b/grub-core/fs/jfs.c
+@@ -279,7 +279,7 @@ get_ext_offset (grub_uint8_t offset1, grub_uint32_t offset2)
+   return (((grub_uint64_t) offset1 << 32) | grub_le_to_cpu32 (offset2));
+ }
+ 
+-static grub_int64_t
++static grub_uint64_t
+ getblk (struct grub_jfs_treehead *treehead,
+ 	struct grub_jfs_tree_extent *extents,
+ 	int max_extents,
+@@ -290,6 +290,8 @@ getblk (struct grub_jfs_treehead *treehead,
+   int i;
+   grub_uint64_t ext_offset, ext_blk;
+ 
++  grub_errno = GRUB_ERR_NONE;
++
+   for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2 &&
+ 	      i < max_extents; i++)
+     {
+@@ -312,7 +314,7 @@ getblk (struct grub_jfs_treehead *treehead,
+ 
+   if (found != -1)
+     {
+-      grub_int64_t ret = -1;
++      grub_uint64_t ret = 0;
+       struct
+       {
+ 	struct grub_jfs_treehead treehead;
+@@ -321,7 +323,7 @@ getblk (struct grub_jfs_treehead *treehead,
+ 
+       tree = grub_zalloc (sizeof (*tree));
+       if (!tree)
+-	return -1;
++	return 0;
+ 
+       if (!grub_disk_read (data->disk,
+ 			   (grub_disk_addr_t) ext_blk
+@@ -334,19 +336,20 @@ getblk (struct grub_jfs_treehead *treehead,
+ 	  else
+ 	    {
+ 	      grub_error (GRUB_ERR_BAD_FS, "jfs: infinite recursion detected");
+-	      ret = -1;
++	      ret = 0;
+ 	    }
+ 	}
+       grub_free (tree);
+       return ret;
+     }
+ 
+-  return -1;
++  grub_error (GRUB_ERR_READ_ERROR, "jfs: block %" PRIuGRUB_UINT64_T " not found", blk);
++  return 0;
+ }
+ 
+ /* Get the block number for the block BLK in the node INODE in the
+    mounted filesystem DATA.  */
+-static grub_int64_t
++static grub_uint64_t
+ grub_jfs_blkno (struct grub_jfs_data *data, struct grub_jfs_inode *inode,
+ 		grub_uint64_t blk)
+ {
diff --git a/0302-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch b/0302-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch
new file mode 100644
index 00000000..880ef764
--- /dev/null
+++ b/0302-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Fri, 31 May 2024 15:14:23 +0800
+Subject: [PATCH] fs/ext2: Fix out-of-bounds read for inline extents
+
+When inline extents are used, i.e. the extent tree depth equals zero,
+a maximum of four entries can fit into the inode's data block. If the
+extent header states a number of entries greater than four the current
+ext2 implementation causes an out-of-bounds read. Fix this issue by
+capping the number of extents to four when reading inline extents.
+
+Reported-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ext2.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index e1cc5e62a..3f9f6b208 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -495,6 +495,8 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
+       struct grub_ext4_extent *ext;
+       int i;
+       grub_disk_addr_t ret;
++      grub_uint16_t nent;
++      const grub_uint16_t max_inline_ext = sizeof (inode->blocks) / sizeof (*ext) - 1; /* Minus 1 extent header. */
+ 
+       if (grub_ext4_find_leaf (data, (struct grub_ext4_extent_header *) inode->blocks.dir_blocks,
+ 			       fileblock, &leaf) != GRUB_ERR_NONE)
+@@ -508,7 +510,13 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
+         return 0;
+ 
+       ext = (struct grub_ext4_extent *) (leaf + 1);
+-      for (i = 0; i < grub_le_to_cpu16 (leaf->entries); i++)
++
++      nent = grub_le_to_cpu16 (leaf->entries);
++
++      if (leaf->depth == 0)
++	nent = grub_min (nent, max_inline_ext);
++
++      for (i = 0; i < nent; i++)
+         {
+           if (fileblock < grub_le_to_cpu32 (ext[i].block))
+             break;
diff --git a/0303-fs-ntfs-Fix-out-of-bounds-read.patch b/0303-fs-ntfs-Fix-out-of-bounds-read.patch
new file mode 100644
index 00000000..4d4acdce
--- /dev/null
+++ b/0303-fs-ntfs-Fix-out-of-bounds-read.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Mon, 3 Jun 2024 12:12:06 +0800
+Subject: [PATCH] fs/ntfs: Fix out-of-bounds read
+
+When parsing NTFS file records the presence of the 0xFF marker indicates
+the end of the attribute list. This value signifies that there are no
+more attributes to process.
+
+However, when the end marker is missing due to corrupted metadata the
+loop continues to read beyond the attribute list resulting in out-of-bounds
+reads and potentially entering an infinite loop.
+
+This patch adds a check to provide a stop condition for the loop ensuring
+it stops at the end of the attribute list or at the end of the Master File
+Table. This guards against out-of-bounds reads and prevents infinite loops.
+
+Reported-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ntfs.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
+index de435aa14..8a5384247 100644
+--- a/grub-core/fs/ntfs.c
++++ b/grub-core/fs/ntfs.c
+@@ -139,6 +139,8 @@ free_attr (struct grub_ntfs_attr *at)
+ static grub_uint8_t *
+ find_attr (struct grub_ntfs_attr *at, grub_uint8_t attr)
+ {
++  grub_uint8_t *mft_end;
++
+   if (at->flags & GRUB_NTFS_AF_ALST)
+     {
+     retry:
+@@ -191,7 +193,8 @@ find_attr (struct grub_ntfs_attr *at, grub_uint8_t attr)
+       return NULL;
+     }
+   at->attr_cur = at->attr_nxt;
+-  while (*at->attr_cur != 0xFF)
++  mft_end = at->mft->buf + (at->mft->data->mft_size << GRUB_NTFS_BLK_SHR);
++  while (at->attr_cur < mft_end && *at->attr_cur != 0xFF)
+     {
+       at->attr_nxt += u16at (at->attr_cur, 4);
+       if (*at->attr_cur == GRUB_NTFS_AT_ATTRIBUTE_LIST)
diff --git a/0304-fs-ntfs-Track-the-end-of-the-MFT-attribute-buffer.patch b/0304-fs-ntfs-Track-the-end-of-the-MFT-attribute-buffer.patch
new file mode 100644
index 00000000..e6a5c144
--- /dev/null
+++ b/0304-fs-ntfs-Track-the-end-of-the-MFT-attribute-buffer.patch
@@ -0,0 +1,141 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Tue, 7 Jan 2025 11:38:34 +0000
+Subject: [PATCH] fs/ntfs: Track the end of the MFT attribute buffer
+
+The end of the attribute buffer should be stored alongside the rest of
+the attribute struct as right now it is not possible to implement bounds
+checking when accessing attributes sequentially.
+
+This is done via:
+  - updating init_attr() to set at->end and check is is not initially out of bounds,
+  - implementing checks as init_attr() had its type change in its callers,
+  - updating the value of at->end when needed.
+
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ntfs.c | 34 ++++++++++++++++++++++++++++------
+ include/grub/ntfs.h |  1 +
+ 2 files changed, 29 insertions(+), 6 deletions(-)
+
+diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
+index 8a5384247..dbda720e1 100644
+--- a/grub-core/fs/ntfs.c
++++ b/grub-core/fs/ntfs.c
+@@ -119,13 +119,20 @@ static grub_err_t read_data (struct grub_ntfs_attr *at, grub_uint8_t *pa,
+ 			     grub_disk_read_hook_t read_hook,
+ 			     void *read_hook_data);
+ 
+-static void
++static grub_err_t
+ init_attr (struct grub_ntfs_attr *at, struct grub_ntfs_file *mft)
+ {
+   at->mft = mft;
+   at->flags = (mft == &mft->data->mmft) ? GRUB_NTFS_AF_MMFT : 0;
+   at->attr_nxt = mft->buf + first_attr_off (mft->buf);
++  at->end = mft->buf + (mft->data->mft_size << GRUB_NTFS_BLK_SHR);
++
++  if (at->attr_nxt > at->end)
++    return grub_error (GRUB_ERR_BAD_FS, "attributes start outside the MFT");
++
+   at->attr_end = at->emft_buf = at->edat_buf = at->sbuf = NULL;
++
++  return GRUB_ERR_NONE;
+ }
+ 
+ static void
+@@ -239,6 +246,10 @@ find_attr (struct grub_ntfs_attr *at, grub_uint8_t attr)
+ 	  pa_end = at->mft->buf + (at->mft->data->mft_size << GRUB_NTFS_BLK_SHR);
+ 	}
+       at->flags |= GRUB_NTFS_AF_ALST;
++
++      /* From this point on pa_end is the end of the buffer */
++      at->end = pa_end;
++
+       while (at->attr_nxt < at->attr_end)
+ 	{
+ 	  if ((*at->attr_nxt == attr) || (attr == 0))
+@@ -298,7 +309,9 @@ locate_attr (struct grub_ntfs_attr *at, struct grub_ntfs_file *mft,
+ {
+   grub_uint8_t *pa;
+ 
+-  init_attr (at, mft);
++  if (init_attr (at, mft) != GRUB_ERR_NONE)
++    return NULL;
++
+   pa = find_attr (at, attr);
+   if (pa == NULL)
+     return NULL;
+@@ -314,7 +327,8 @@ locate_attr (struct grub_ntfs_attr *at, struct grub_ntfs_file *mft,
+ 	}
+       grub_errno = GRUB_ERR_NONE;
+       free_attr (at);
+-      init_attr (at, mft);
++      if (init_attr (at, mft) != GRUB_ERR_NONE)
++	return NULL;
+       pa = find_attr (at, attr);
+     }
+   return pa;
+@@ -585,7 +599,7 @@ init_file (struct grub_ntfs_file *mft, grub_uint64_t mftno)
+ 	mft->attr.attr_end = 0;	/*  Don't jump to attribute list */
+     }
+   else
+-    init_attr (&mft->attr, mft);
++    return init_attr (&mft->attr, mft);
+ 
+   return 0;
+ }
+@@ -811,7 +825,9 @@ grub_ntfs_iterate_dir (grub_fshelp_node_t dir,
+   bmp = NULL;
+ 
+   at = &attr;
+-  init_attr (at, mft);
++  if (init_attr (at, mft) != GRUB_ERR_NONE)
++    return 0;
++
+   while (1)
+     {
+       cur_pos = find_attr (at, GRUB_NTFS_AT_INDEX_ROOT);
+@@ -842,7 +858,9 @@ grub_ntfs_iterate_dir (grub_fshelp_node_t dir,
+   bitmap = NULL;
+   bitmap_len = 0;
+   free_attr (at);
++  /* No need to check errors here, as it will already be fine */
+   init_attr (at, mft);
++
+   while ((cur_pos = find_attr (at, GRUB_NTFS_AT_BITMAP)) != NULL)
+     {
+       int ofs;
+@@ -1207,6 +1225,7 @@ grub_ntfs_label (grub_device_t device, char **label)
+   struct grub_ntfs_data *data = 0;
+   struct grub_fshelp_node *mft = 0;
+   grub_uint8_t *pa;
++  grub_err_t err;
+ 
+   grub_dl_ref (my_mod);
+ 
+@@ -1232,7 +1251,10 @@ grub_ntfs_label (grub_device_t device, char **label)
+ 	goto fail;
+     }
+ 
+-  init_attr (&mft->attr, mft);
++  err = init_attr (&mft->attr, mft);
++  if (err != GRUB_ERR_NONE)
++    return err;
++
+   pa = find_attr (&mft->attr, GRUB_NTFS_AT_VOLUME_NAME);
+ 
+   if (pa >= mft->buf + (mft->data->mft_size << GRUB_NTFS_BLK_SHR))
+diff --git a/include/grub/ntfs.h b/include/grub/ntfs.h
+index d1a6af696..ec1c4db38 100644
+--- a/include/grub/ntfs.h
++++ b/include/grub/ntfs.h
+@@ -134,6 +134,7 @@ struct grub_ntfs_attr
+   grub_uint8_t *attr_cur, *attr_nxt, *attr_end;
+   grub_uint32_t save_pos;
+   grub_uint8_t *sbuf;
++  grub_uint8_t *end;
+   struct grub_ntfs_file *mft;
+ };
+ 
diff --git a/0305-fs-ntfs-Use-a-helper-function-to-access-attributes.patch b/0305-fs-ntfs-Use-a-helper-function-to-access-attributes.patch
new file mode 100644
index 00000000..aede4b40
--- /dev/null
+++ b/0305-fs-ntfs-Use-a-helper-function-to-access-attributes.patch
@@ -0,0 +1,183 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Tue, 14 May 2024 12:39:56 +0100
+Subject: [PATCH] fs/ntfs: Use a helper function to access attributes
+
+Right now to access the next attribute the code reads the length of the
+current attribute and adds that to the current pointer. This is error
+prone as bounds checking needs to be performed all over the place. So,
+implement a helper and ensure its used across find_attr() and read_attr().
+
+This commit does *not* implement full bounds checking. It is just the
+preparation work for this to be added into the helper.
+
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ntfs.c | 69 +++++++++++++++++++++++++++++++++++++++++++----------
+ include/grub/ntfs.h |  2 ++
+ 2 files changed, 58 insertions(+), 13 deletions(-)
+
+diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
+index dbda720e1..1c678f3d0 100644
+--- a/grub-core/fs/ntfs.c
++++ b/grub-core/fs/ntfs.c
+@@ -70,6 +70,25 @@ res_attr_data_len (void *res_attr_ptr)
+   return u32at (res_attr_ptr, 0x10);
+ }
+ 
++/* Return the next attribute if it exists, otherwise return NULL. */
++static grub_uint8_t *
++next_attribute (grub_uint8_t *curr_attribute, void *end)
++{
++  grub_uint8_t *next = curr_attribute;
++
++  /*
++   * Need to verify we aren't exceeding the end of the buffer by reading the
++   * header for the current attribute
++   */
++  if (curr_attribute + GRUB_NTFS_ATTRIBUTE_HEADER_SIZE >= (grub_uint8_t *) end)
++    return NULL;
++
++  next += u16at (curr_attribute, 4);
++
++  return next;
++}
++
++
+ grub_ntfscomp_func_t grub_ntfscomp_func;
+ 
+ static grub_err_t
+@@ -151,13 +170,13 @@ find_attr (struct grub_ntfs_attr *at, grub_uint8_t attr)
+   if (at->flags & GRUB_NTFS_AF_ALST)
+     {
+     retry:
+-      while (at->attr_nxt < at->attr_end)
++      while (at->attr_nxt)
+ 	{
+ 	  at->attr_cur = at->attr_nxt;
+-	  at->attr_nxt += u16at (at->attr_cur, 4);
++	  at->attr_nxt = next_attribute (at->attr_cur, at->attr_end);
+ 	  if ((*at->attr_cur == attr) || (attr == 0))
+ 	    {
+-	      grub_uint8_t *new_pos;
++	      grub_uint8_t *new_pos, *end;
+ 
+ 	      if (at->flags & GRUB_NTFS_AF_MMFT)
+ 		{
+@@ -181,15 +200,36 @@ find_attr (struct grub_ntfs_attr *at, grub_uint8_t attr)
+ 		    return NULL;
+ 		}
+ 
++	      /*
++	       * Only time emft_bufs is defined is in this function, with this
++	       * size.
++	       */
++	      grub_size_t emft_buf_size =
++	        at->mft->data->mft_size << GRUB_NTFS_BLK_SHR;
++
++	      /*
++	       * Needs to be enough space for the successful case to even
++	       * bother.
++	       */
++	      if (first_attr_off (at->emft_buf) >= (emft_buf_size - 0x18 - 2))
++		{
++		  grub_error (GRUB_ERR_BAD_FS,
++			      "can\'t find 0x%X in attribute list",
++			      (unsigned char) *at->attr_cur);
++		  return NULL;
++		}
++
+ 	      new_pos = &at->emft_buf[first_attr_off (at->emft_buf)];
+-	      while (*new_pos != 0xFF)
++	      end = &at->emft_buf[emft_buf_size];
++
++	      while (new_pos && *new_pos != 0xFF)
+ 		{
+ 		  if ((*new_pos == *at->attr_cur)
+ 		      && (u16at (new_pos, 0xE) == u16at (at->attr_cur, 0x18)))
+ 		    {
+ 		      return new_pos;
+ 		    }
+-		  new_pos += u16at (new_pos, 4);
++		  new_pos = next_attribute (new_pos, end);
+ 		}
+ 	      grub_error (GRUB_ERR_BAD_FS,
+ 			  "can\'t find 0x%X in attribute list",
+@@ -203,7 +243,7 @@ find_attr (struct grub_ntfs_attr *at, grub_uint8_t attr)
+   mft_end = at->mft->buf + (at->mft->data->mft_size << GRUB_NTFS_BLK_SHR);
+   while (at->attr_cur < mft_end && *at->attr_cur != 0xFF)
+     {
+-      at->attr_nxt += u16at (at->attr_cur, 4);
++      at->attr_nxt = next_attribute (at->attr_cur, at->end);
+       if (*at->attr_cur == GRUB_NTFS_AT_ATTRIBUTE_LIST)
+ 	at->attr_end = at->attr_cur;
+       if ((*at->attr_cur == attr) || (attr == 0))
+@@ -250,13 +290,14 @@ find_attr (struct grub_ntfs_attr *at, grub_uint8_t attr)
+       /* From this point on pa_end is the end of the buffer */
+       at->end = pa_end;
+ 
+-      while (at->attr_nxt < at->attr_end)
++      while (at->attr_nxt)
+ 	{
+ 	  if ((*at->attr_nxt == attr) || (attr == 0))
+ 	    break;
+-	  at->attr_nxt += u16at (at->attr_nxt, 4);
++	  at->attr_nxt = next_attribute (at->attr_nxt, pa_end);
+ 	}
+-      if (at->attr_nxt >= at->attr_end)
++
++      if (at->attr_nxt >= at->attr_end || at->attr_nxt == NULL)
+ 	return NULL;
+ 
+       if ((at->flags & GRUB_NTFS_AF_MMFT) && (attr == GRUB_NTFS_AT_DATA))
+@@ -277,7 +318,8 @@ find_attr (struct grub_ntfs_attr *at, grub_uint8_t attr)
+ 				grub_cpu_to_le32 (at->mft->data->mft_start
+ 						  + 1));
+ 	  pa = at->attr_nxt + u16at (pa, 4);
+-	  while (pa < at->attr_end)
++
++	  while (pa)
+ 	    {
+ 	      if (*pa != attr)
+ 		break;
+@@ -293,7 +335,7 @@ find_attr (struct grub_ntfs_attr *at, grub_uint8_t attr)
+ 		   u32at (pa, 0x10) * (at->mft->data->mft_size << GRUB_NTFS_BLK_SHR),
+ 		   at->mft->data->mft_size << GRUB_NTFS_BLK_SHR, 0, 0, 0))
+ 		return NULL;
+-	      pa += u16at (pa, 4);
++	      pa = next_attribute (pa, pa_end);
+ 	    }
+ 	  at->attr_nxt = at->attr_cur;
+ 	  at->flags &= ~GRUB_NTFS_AF_GPOS;
+@@ -530,14 +572,15 @@ read_attr (struct grub_ntfs_attr *at, grub_uint8_t *dest, grub_disk_addr_t ofs,
+       else
+ 	vcn = ofs >> (at->mft->data->log_spc + GRUB_NTFS_BLK_SHR);
+       pa = at->attr_nxt + u16at (at->attr_nxt, 4);
+-      while (pa < at->attr_end)
++
++      while (pa)
+ 	{
+ 	  if (*pa != attr)
+ 	    break;
+ 	  if (u32at (pa, 8) > vcn)
+ 	    break;
+ 	  at->attr_nxt = pa;
+-	  pa += u16at (pa, 4);
++	  pa = next_attribute (pa, at->attr_end);
+ 	}
+     }
+   pp = find_attr (at, attr);
+diff --git a/include/grub/ntfs.h b/include/grub/ntfs.h
+index ec1c4db38..2c8078403 100644
+--- a/include/grub/ntfs.h
++++ b/include/grub/ntfs.h
+@@ -89,6 +89,8 @@ enum
+ #define GRUB_NTFS_COM_SEC		(GRUB_NTFS_COM_LEN >> GRUB_NTFS_BLK_SHR)
+ #define GRUB_NTFS_LOG_COM_SEC		(GRUB_NTFS_COM_LOG_LEN - GRUB_NTFS_BLK_SHR)
+ 
++#define GRUB_NTFS_ATTRIBUTE_HEADER_SIZE 16
++
+ enum
+   {
+     GRUB_NTFS_AF_ALST		= 1,
diff --git a/0307-fs-xfs-Fix-out-of-bounds-read.patch b/0307-fs-xfs-Fix-out-of-bounds-read.patch
new file mode 100644
index 00000000..a71ff511
--- /dev/null
+++ b/0307-fs-xfs-Fix-out-of-bounds-read.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Fri, 31 May 2024 15:14:57 +0800
+Subject: [PATCH] fs/xfs: Fix out-of-bounds read
+
+The number of records in the root key array read from disk was not being
+validated against the size of the root node. This could lead to an
+out-of-bounds read.
+
+This patch adds a check to ensure that the number of records in the root
+key array does not exceed the expected size of a root node read from
+disk. If this check detects an out-of-bounds condition the operation is
+aborted to prevent random errors due to metadata corruption.
+
+Reported-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/xfs.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index 92046f9bd..96f62c5a4 100644
+--- a/grub-core/fs/xfs.c
++++ b/grub-core/fs/xfs.c
+@@ -595,6 +595,17 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
+       do
+         {
+           grub_uint64_t i;
++	  grub_addr_t keys_end, data_end;
++
++	  if (grub_mul (sizeof (grub_uint64_t), nrec, &keys_end) ||
++	      grub_add ((grub_addr_t) keys, keys_end, &keys_end) ||
++	      grub_add ((grub_addr_t) node->data, node->data->data_size, &data_end) ||
++	      keys_end > data_end)
++	    {
++	      grub_error (GRUB_ERR_BAD_FS, "invalid number of XFS root keys");
++	      grub_free (leaf);
++	      return 0;
++	    }
+ 
+           for (i = 0; i < nrec; i++)
+             {
diff --git a/0308-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch b/0308-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch
new file mode 100644
index 00000000..39f0adaa
--- /dev/null
+++ b/0308-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sun, 12 May 2024 06:03:58 +0100
+Subject: [PATCH] fs/xfs: Ensuring failing to mount sets a grub_errno
+
+It was previously possible for grub_xfs_mount() to return NULL without
+setting grub_errno if the XFS version was invalid. This resulted in it
+being possible for grub_dl_unref() to be called twice allowing the XFS
+module to be unloaded while there were still references to it.
+
+Fixing this problem in general by ensuring a grub_errno is set if the
+fail label is reached.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/xfs.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index 96f62c5a4..a837f9824 100644
+--- a/grub-core/fs/xfs.c
++++ b/grub-core/fs/xfs.c
+@@ -327,6 +327,8 @@ static int grub_xfs_sb_valid(struct grub_xfs_data *data)
+ 	}
+       return 1;
+     }
++
++  grub_error (GRUB_ERR_BAD_FS, "unsupported XFS filesystem version");
+   return 0;
+ }
+ 
+@@ -1068,7 +1070,7 @@ grub_xfs_mount (grub_disk_t disk)
+   return data;
+  fail:
+ 
+-  if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
++  if (grub_errno == GRUB_ERR_OUT_OF_RANGE || grub_errno == GRUB_ERR_NONE)
+     grub_error (GRUB_ERR_BAD_FS, "not an XFS filesystem");
+ 
+   grub_free (data);
diff --git a/0309-kern-file-Ensure-file-data-is-set.patch b/0309-kern-file-Ensure-file-data-is-set.patch
new file mode 100644
index 00000000..260d1b08
--- /dev/null
+++ b/0309-kern-file-Ensure-file-data-is-set.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sun, 12 May 2024 03:01:40 +0100
+Subject: [PATCH] kern/file: Ensure file->data is set
+
+This is to avoid a generic issue were some filesystems would not set
+data and also not set a grub_errno. This meant it was possible for many
+filesystems to grub_dl_unref() themselves multiple times resulting in
+it being possible to unload the filesystems while there were still
+references to them, e.g., via a loopback.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/file.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
+index 75510df7c..85e832bd8 100644
+--- a/grub-core/kern/file.c
++++ b/grub-core/kern/file.c
+@@ -124,6 +124,9 @@ grub_file_open (const char *name, enum grub_file_type type)
+   if ((file->fs->fs_open) (file, file_name) != GRUB_ERR_NONE)
+     goto fail;
+ 
++  if (file->data == NULL)
++    goto fail;
++
+   file->name = grub_strdup (name);
+   grub_errno = GRUB_ERR_NONE;
+ 
diff --git a/0310-kern-file-Implement-filesystem-reference-counting.patch b/0310-kern-file-Implement-filesystem-reference-counting.patch
new file mode 100644
index 00000000..348bebed
--- /dev/null
+++ b/0310-kern-file-Implement-filesystem-reference-counting.patch
@@ -0,0 +1,440 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Tue, 11 Feb 2025 13:44:25 -0600
+Subject: [PATCH] kern/file: Implement filesystem reference counting
+
+The grub_file_open() and grub_file_close() should be the only places
+that allow a reference to a filesystem to stay open. So, add grub_dl_t
+to grub_fs_t and set this in the GRUB_MOD_INIT() for each filesystem to
+avoid issues when filesystems forget to do it themselves or do not track
+their own references, e.g. squash4.
+
+The fs_label(), fs_uuid(), fs_mtime() and fs_read() should all ref and
+unref in the same function but it is essentially redundant in GRUB
+single threaded model.
+
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/affs.c     | 1 +
+ grub-core/fs/bfs.c      | 1 +
+ grub-core/fs/btrfs.c    | 1 +
+ grub-core/fs/cbfs.c     | 1 +
+ grub-core/fs/cpio.c     | 1 +
+ grub-core/fs/cpio_be.c  | 1 +
+ grub-core/fs/ext2.c     | 1 +
+ grub-core/fs/f2fs.c     | 1 +
+ grub-core/fs/fat.c      | 1 +
+ grub-core/fs/hfs.c      | 1 +
+ grub-core/fs/hfsplus.c  | 1 +
+ grub-core/fs/iso9660.c  | 1 +
+ grub-core/fs/jfs.c      | 1 +
+ grub-core/fs/minix.c    | 1 +
+ grub-core/fs/newc.c     | 1 +
+ grub-core/fs/nilfs2.c   | 1 +
+ grub-core/fs/ntfs.c     | 1 +
+ grub-core/fs/odc.c      | 1 +
+ grub-core/fs/proc.c     | 1 +
+ grub-core/fs/reiserfs.c | 1 +
+ grub-core/fs/romfs.c    | 1 +
+ grub-core/fs/sfs.c      | 1 +
+ grub-core/fs/squash4.c  | 1 +
+ grub-core/fs/tar.c      | 1 +
+ grub-core/fs/udf.c      | 1 +
+ grub-core/fs/ufs.c      | 1 +
+ grub-core/fs/xfs.c      | 1 +
+ grub-core/fs/zfs/zfs.c  | 1 +
+ grub-core/kern/file.c   | 7 +++++++
+ include/grub/fs.h       | 4 ++++
+ 30 files changed, 39 insertions(+)
+
+diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c
+index ed606b3f1..9b0afb954 100644
+--- a/grub-core/fs/affs.c
++++ b/grub-core/fs/affs.c
+@@ -703,6 +703,7 @@ static struct grub_fs grub_affs_fs =
+ 
+ GRUB_MOD_INIT(affs)
+ {
++  grub_affs_fs.mod = mod;
+   grub_fs_register (&grub_affs_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/bfs.c b/grub-core/fs/bfs.c
+index 07cb3e3ac..f37b16895 100644
+--- a/grub-core/fs/bfs.c
++++ b/grub-core/fs/bfs.c
+@@ -1106,6 +1106,7 @@ GRUB_MOD_INIT (bfs)
+ {
+   COMPILE_TIME_ASSERT (1 << LOG_EXTENT_SIZE ==
+ 		       sizeof (struct grub_bfs_extent));
++  grub_bfs_fs.mod = mod;
+   grub_fs_register (&grub_bfs_fs);
+ }
+ 
+diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
+index ad35e7575..6593f5175 100644
+--- a/grub-core/fs/btrfs.c
++++ b/grub-core/fs/btrfs.c
+@@ -3402,6 +3402,7 @@ subvol_get_env (struct grub_env_var *var __attribute__ ((unused)),
+ 
+ GRUB_MOD_INIT (btrfs)
+ {
++  grub_btrfs_fs.mod = mod;
+   grub_fs_register (&grub_btrfs_fs);
+   cmd_info = grub_register_command("btrfs-info", grub_cmd_btrfs_info,
+ 				   "DEVICE",
+diff --git a/grub-core/fs/cbfs.c b/grub-core/fs/cbfs.c
+index 8ab7106af..2332745fe 100644
+--- a/grub-core/fs/cbfs.c
++++ b/grub-core/fs/cbfs.c
+@@ -390,6 +390,7 @@ GRUB_MOD_INIT (cbfs)
+ #if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) && !defined (GRUB_MACHINE_XEN)
+   init_cbfsdisk ();
+ #endif
++  grub_cbfs_fs.mod = mod;
+   grub_fs_register (&grub_cbfs_fs);
+ }
+ 
+diff --git a/grub-core/fs/cpio.c b/grub-core/fs/cpio.c
+index dab5f9898..1799f7ff5 100644
+--- a/grub-core/fs/cpio.c
++++ b/grub-core/fs/cpio.c
+@@ -52,6 +52,7 @@ read_number (const grub_uint16_t *arr, grub_size_t size)
+ 
+ GRUB_MOD_INIT (cpio)
+ {
++  grub_cpio_fs.mod = mod;
+   grub_fs_register (&grub_cpio_fs);
+ }
+ 
+diff --git a/grub-core/fs/cpio_be.c b/grub-core/fs/cpio_be.c
+index 846548892..7bed1b848 100644
+--- a/grub-core/fs/cpio_be.c
++++ b/grub-core/fs/cpio_be.c
+@@ -52,6 +52,7 @@ read_number (const grub_uint16_t *arr, grub_size_t size)
+ 
+ GRUB_MOD_INIT (cpio_be)
+ {
++  grub_cpio_fs.mod = mod;
+   grub_fs_register (&grub_cpio_fs);
+ }
+ 
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index 3f9f6b208..c3058f7e7 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -1131,6 +1131,7 @@ static struct grub_fs grub_ext2_fs =
+ 
+ GRUB_MOD_INIT(ext2)
+ {
++  grub_ext2_fs.mod = mod;
+   grub_fs_register (&grub_ext2_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c
+index db8a65f8d..f6d6beaa5 100644
+--- a/grub-core/fs/f2fs.c
++++ b/grub-core/fs/f2fs.c
+@@ -1353,6 +1353,7 @@ static struct grub_fs grub_f2fs_fs = {
+ 
+ GRUB_MOD_INIT (f2fs)
+ {
++  grub_f2fs_fs.mod = mod;
+   grub_fs_register (&grub_f2fs_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/fat.c b/grub-core/fs/fat.c
+index c5efed724..6e62b915d 100644
+--- a/grub-core/fs/fat.c
++++ b/grub-core/fs/fat.c
+@@ -1312,6 +1312,7 @@ GRUB_MOD_INIT(fat)
+ #endif
+ {
+   COMPILE_TIME_ASSERT (sizeof (struct grub_fat_dir_entry) == 32);
++  grub_fat_fs.mod = mod;
+   grub_fs_register (&grub_fat_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c
+index 920112b03..ce7581dd5 100644
+--- a/grub-core/fs/hfs.c
++++ b/grub-core/fs/hfs.c
+@@ -1434,6 +1434,7 @@ static struct grub_fs grub_hfs_fs =
+ 
+ GRUB_MOD_INIT(hfs)
+ {
++  grub_hfs_fs.mod = mod;
+   if (!grub_is_lockdown ())
+     grub_fs_register (&grub_hfs_fs);
+   my_mod = mod;
+diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
+index de71fd486..3f203abcc 100644
+--- a/grub-core/fs/hfsplus.c
++++ b/grub-core/fs/hfsplus.c
+@@ -1176,6 +1176,7 @@ static struct grub_fs grub_hfsplus_fs =
+ 
+ GRUB_MOD_INIT(hfsplus)
+ {
++  grub_hfsplus_fs.mod = mod;
+   grub_fs_register (&grub_hfsplus_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
+index 8e3c95c4f..c73cb9ce0 100644
+--- a/grub-core/fs/iso9660.c
++++ b/grub-core/fs/iso9660.c
+@@ -1260,6 +1260,7 @@ static struct grub_fs grub_iso9660_fs =
+ 
+ GRUB_MOD_INIT(iso9660)
+ {
++  grub_iso9660_fs.mod = mod;
+   grub_fs_register (&grub_iso9660_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
+index 70a2f4947..b0283ac00 100644
+--- a/grub-core/fs/jfs.c
++++ b/grub-core/fs/jfs.c
+@@ -1005,6 +1005,7 @@ static struct grub_fs grub_jfs_fs =
+ 
+ GRUB_MOD_INIT(jfs)
+ {
++  grub_jfs_fs.mod = mod;
+   grub_fs_register (&grub_jfs_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/minix.c b/grub-core/fs/minix.c
+index 5354951d1..b7679c3e2 100644
+--- a/grub-core/fs/minix.c
++++ b/grub-core/fs/minix.c
+@@ -734,6 +734,7 @@ GRUB_MOD_INIT(minix)
+ #endif
+ #endif
+ {
++  grub_minix_fs.mod = mod;
+   grub_fs_register (&grub_minix_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/newc.c b/grub-core/fs/newc.c
+index 4fb8b2e3d..43b7f8b64 100644
+--- a/grub-core/fs/newc.c
++++ b/grub-core/fs/newc.c
+@@ -64,6 +64,7 @@ read_number (const char *str, grub_size_t size)
+ 
+ GRUB_MOD_INIT (newc)
+ {
++  grub_cpio_fs.mod = mod;
+   grub_fs_register (&grub_cpio_fs);
+ }
+ 
+diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c
+index fc7374ead..4e1e71738 100644
+--- a/grub-core/fs/nilfs2.c
++++ b/grub-core/fs/nilfs2.c
+@@ -1231,6 +1231,7 @@ GRUB_MOD_INIT (nilfs2)
+ 				  grub_nilfs2_dat_entry));
+   COMPILE_TIME_ASSERT (1 << LOG_INODE_SIZE
+ 		       == sizeof (struct grub_nilfs2_inode));
++  grub_nilfs2_fs.mod = mod;
+   grub_fs_register (&grub_nilfs2_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
+index 64f4f2221..4e144cc3c 100644
+--- a/grub-core/fs/ntfs.c
++++ b/grub-core/fs/ntfs.c
+@@ -1541,6 +1541,7 @@ static struct grub_fs grub_ntfs_fs =
+ 
+ GRUB_MOD_INIT (ntfs)
+ {
++  grub_ntfs_fs.mod = mod;
+   grub_fs_register (&grub_ntfs_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/odc.c b/grub-core/fs/odc.c
+index 790000622..8e4e8aeac 100644
+--- a/grub-core/fs/odc.c
++++ b/grub-core/fs/odc.c
+@@ -52,6 +52,7 @@ read_number (const char *str, grub_size_t size)
+ 
+ GRUB_MOD_INIT (odc)
+ {
++  grub_cpio_fs.mod = mod;
+   grub_fs_register (&grub_cpio_fs);
+ }
+ 
+diff --git a/grub-core/fs/proc.c b/grub-core/fs/proc.c
+index 5f516502d..bcde43349 100644
+--- a/grub-core/fs/proc.c
++++ b/grub-core/fs/proc.c
+@@ -192,6 +192,7 @@ static struct grub_fs grub_procfs_fs =
+ 
+ GRUB_MOD_INIT (procfs)
+ {
++  grub_procfs_fs.mod = mod;
+   grub_disk_dev_register (&grub_procfs_dev);
+   grub_fs_register (&grub_procfs_fs);
+ }
+diff --git a/grub-core/fs/reiserfs.c b/grub-core/fs/reiserfs.c
+index 42818c376..e8b0b6383 100644
+--- a/grub-core/fs/reiserfs.c
++++ b/grub-core/fs/reiserfs.c
+@@ -1407,6 +1407,7 @@ static struct grub_fs grub_reiserfs_fs =
+ 
+ GRUB_MOD_INIT(reiserfs)
+ {
++  grub_reiserfs_fs.mod = mod;
+   grub_fs_register (&grub_reiserfs_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/romfs.c b/grub-core/fs/romfs.c
+index 1f7dcfca1..56b0b2b2f 100644
+--- a/grub-core/fs/romfs.c
++++ b/grub-core/fs/romfs.c
+@@ -475,6 +475,7 @@ static struct grub_fs grub_romfs_fs =
+ 
+ GRUB_MOD_INIT(romfs)
+ {
++  grub_romfs_fs.mod = mod;
+   grub_fs_register (&grub_romfs_fs);
+ }
+ 
+diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
+index 983e88008..f0d7cac43 100644
+--- a/grub-core/fs/sfs.c
++++ b/grub-core/fs/sfs.c
+@@ -779,6 +779,7 @@ static struct grub_fs grub_sfs_fs =
+ 
+ GRUB_MOD_INIT(sfs)
+ {
++  grub_sfs_fs.mod = mod;
+   grub_fs_register (&grub_sfs_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c
+index a30e6ebe1..6e9d63874 100644
+--- a/grub-core/fs/squash4.c
++++ b/grub-core/fs/squash4.c
+@@ -1044,6 +1044,7 @@ static struct grub_fs grub_squash_fs =
+ 
+ GRUB_MOD_INIT(squash4)
+ {
++  grub_squash_fs.mod = mod;
+   grub_fs_register (&grub_squash_fs);
+ }
+ 
+diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c
+index 386c09022..fd2ec1f74 100644
+--- a/grub-core/fs/tar.c
++++ b/grub-core/fs/tar.c
+@@ -354,6 +354,7 @@ static struct grub_fs grub_cpio_fs = {
+ 
+ GRUB_MOD_INIT (tar)
+ {
++  grub_cpio_fs.mod = mod;
+   grub_fs_register (&grub_cpio_fs);
+ }
+ 
+diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
+index b836e6107..8765c633c 100644
+--- a/grub-core/fs/udf.c
++++ b/grub-core/fs/udf.c
+@@ -1455,6 +1455,7 @@ static struct grub_fs grub_udf_fs = {
+ 
+ GRUB_MOD_INIT (udf)
+ {
++  grub_udf_fs.mod = mod;
+   grub_fs_register (&grub_udf_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c
+index 01235101b..e82d9356d 100644
+--- a/grub-core/fs/ufs.c
++++ b/grub-core/fs/ufs.c
+@@ -899,6 +899,7 @@ GRUB_MOD_INIT(ufs1)
+ #endif
+ #endif
+ {
++  grub_ufs_fs.mod = mod;
+   grub_fs_register (&grub_ufs_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index a837f9824..6c952aef1 100644
+--- a/grub-core/fs/xfs.c
++++ b/grub-core/fs/xfs.c
+@@ -1304,6 +1304,7 @@ static struct grub_fs grub_xfs_fs =
+ 
+ GRUB_MOD_INIT(xfs)
+ {
++  grub_xfs_fs.mod = mod;
+   grub_fs_register (&grub_xfs_fs);
+   my_mod = mod;
+ }
+diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
+index b5453e006..a497b1869 100644
+--- a/grub-core/fs/zfs/zfs.c
++++ b/grub-core/fs/zfs/zfs.c
+@@ -4424,6 +4424,7 @@ static struct grub_fs grub_zfs_fs = {
+ GRUB_MOD_INIT (zfs)
+ {
+   COMPILE_TIME_ASSERT (sizeof (zap_leaf_chunk_t) == ZAP_LEAF_CHUNKSIZE);
++  grub_zfs_fs.mod = mod;
+   grub_fs_register (&grub_zfs_fs);
+ #ifndef GRUB_UTIL
+   my_mod = mod;
+diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
+index 85e832bd8..ec90a26ba 100644
+--- a/grub-core/kern/file.c
++++ b/grub-core/kern/file.c
+@@ -25,6 +25,7 @@
+ #include <grub/fs.h>
+ #include <grub/device.h>
+ #include <grub/i18n.h>
++#include <grub/dl.h>
+ 
+ void (*EXPORT_VAR (grub_grubnet_fini)) (void);
+ 
+@@ -127,6 +128,9 @@ grub_file_open (const char *name, enum grub_file_type type)
+   if (file->data == NULL)
+     goto fail;
+ 
++  if (file->fs->mod)
++      grub_dl_ref (file->fs->mod);
++
+   file->name = grub_strdup (name);
+   grub_errno = GRUB_ERR_NONE;
+ 
+@@ -219,6 +223,9 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
+ grub_err_t
+ grub_file_close (grub_file_t file)
+ {
++  if (file->fs->mod)
++    grub_dl_unref (file->fs->mod);
++
+   grub_dprintf ("file", "Closing `%s' ...\n", file->name);
+   if (file->fs->fs_close)
+     (file->fs->fs_close) (file);
+diff --git a/include/grub/fs.h b/include/grub/fs.h
+index 026bc3bb8..df4c93b16 100644
+--- a/include/grub/fs.h
++++ b/include/grub/fs.h
+@@ -23,6 +23,7 @@
+ #include <grub/device.h>
+ #include <grub/symbol.h>
+ #include <grub/types.h>
++#include <grub/dl.h>
+ 
+ #include <grub/list.h>
+ /* For embedding types.  */
+@@ -57,6 +58,9 @@ struct grub_fs
+   /* My name.  */
+   const char *name;
+ 
++  /* My module */
++  grub_dl_t mod;
++
+   /* Call HOOK with each file under DIR.  */
+   grub_err_t (*fs_dir) (grub_device_t device, const char *path,
+ 		     grub_fs_dir_hook_t hook, void *hook_data);
diff --git a/0311-cli_lock-Add-build-option-to-block-command-line-inte.patch b/0311-cli_lock-Add-build-option-to-block-command-line-inte.patch
new file mode 100644
index 00000000..3c7d6414
--- /dev/null
+++ b/0311-cli_lock-Add-build-option-to-block-command-line-inte.patch
@@ -0,0 +1,366 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Wed, 24 Jan 2024 06:26:37 +0000
+Subject: [PATCH] cli_lock: Add build option to block command line interface
+
+Add functionality to disable command line interface access and editing of GRUB
+menu entries if GRUB image is built with --disable-cli.
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ docs/grub.texi                 |  6 ++++--
+ grub-core/kern/main.c          | 28 ++++++++++++++++++++++++++++
+ grub-core/kern/rescue_reader.c | 13 +++++++++++++
+ grub-core/normal/auth.c        |  3 +++
+ grub-core/normal/menu_text.c   | 31 +++++++++++++++++--------------
+ include/grub/kernel.h          |  1 +
+ include/grub/misc.h            |  2 ++
+ include/grub/util/install.h    |  8 ++++++--
+ util/grub-install-common.c     | 10 ++++++++--
+ util/grub-mkimage.c            |  9 ++++++++-
+ util/mkimage.c                 | 15 ++++++++++++++-
+ 11 files changed, 104 insertions(+), 22 deletions(-)
+
+diff --git a/docs/grub.texi b/docs/grub.texi
+index 096a3cde0..9ce9c5b82 100644
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -6520,8 +6520,10 @@ the GRUB command line, edit menu entries, and execute any menu entry.  If
+ @samp{superusers} is set, then use of the command line and editing of menu
+ entries are automatically restricted to superusers. Setting @samp{superusers}
+ to empty string effectively disables both access to CLI and editing of menu
+-entries. Note: The environment variable needs to be exported to also affect
+-the section defined by the @samp{submenu} command (@pxref{submenu}).
++entries. Building a grub image with @samp{--disable-cli} option will also
++disable access to CLI and editing of menu entries, as well as disabling rescue
++mode. Note: The environment variable needs to be exported to also affect the
++section defined by the @samp{submenu} command (@pxref{submenu}).
+ 
+ Other users may be allowed to execute specific menu entries by giving a list of
+ usernames (as above) using the @option{--users} option to the
+diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
+index 8e89763f4..0d6b8138d 100644
+--- a/grub-core/kern/main.c
++++ b/grub-core/kern/main.c
+@@ -30,11 +30,14 @@
+ #include <grub/reader.h>
+ #include <grub/parser.h>
+ #include <grub/verify.h>
++#include <grub/types.h>
+ 
+ #ifdef GRUB_MACHINE_PCBIOS
+ #include <grub/machine/memory.h>
+ #endif
+ 
++static bool cli_disabled = false;
++
+ grub_addr_t
+ grub_modules_get_end (void)
+ {
+@@ -299,6 +302,28 @@ grub_load_normal_mode (void)
+   grub_command_execute ("normal", 0, 0);
+ }
+ 
++bool
++grub_is_cli_disabled (void)
++{
++  return cli_disabled;
++}
++
++static void
++check_is_cli_disabled (void)
++{
++  struct grub_module_header *header;
++  header = 0;
++
++  FOR_MODULES (header)
++    {
++      if (header->type == OBJ_TYPE_DISABLE_CLI)
++	{
++	  cli_disabled = true;
++	  return;
++	}
++    }
++}
++
+ static void
+ reclaim_module_space (void)
+ {
+@@ -356,6 +381,9 @@ grub_main (void)
+ 
+   grub_boot_time ("After loading embedded modules.");
+ 
++  /* Check if the CLI should be disabled */
++  check_is_cli_disabled ();
++
+   /* It is better to set the root device as soon as possible,
+      for convenience.  */
+   grub_set_prefix_and_root ();
+diff --git a/grub-core/kern/rescue_reader.c b/grub-core/kern/rescue_reader.c
+index dcd7d4439..4259857ba 100644
+--- a/grub-core/kern/rescue_reader.c
++++ b/grub-core/kern/rescue_reader.c
+@@ -78,6 +78,19 @@ grub_rescue_read_line (char **line, int cont,
+ void __attribute__ ((noreturn))
+ grub_rescue_run (void)
+ {
++  /* Stall if the CLI has been disabled */
++  if (grub_is_cli_disabled ())
++    {
++      grub_printf ("Rescue mode has been disabled...\n");
++
++      do
++	{
++	  /* Do not optimize out the loop. */
++	  asm volatile ("");
++	}
++      while (1);
++    }
++
+   grub_printf ("Entering rescue mode...\n");
+ 
+   while (1)
+diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
+index 517fc623f..d94020186 100644
+--- a/grub-core/normal/auth.c
++++ b/grub-core/normal/auth.c
+@@ -209,6 +209,9 @@ grub_auth_check_authentication (const char *userlist)
+   char entered[GRUB_AUTH_MAX_PASSLEN];
+   struct grub_auth_user *user;
+ 
++  if (grub_is_cli_disabled ())
++    return GRUB_ACCESS_DENIED;
++
+   grub_memset (login, 0, sizeof (login));
+ 
+   if (is_authenticated (userlist))
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index b1321eb26..9c383e64a 100644
+--- a/grub-core/normal/menu_text.c
++++ b/grub-core/normal/menu_text.c
+@@ -178,21 +178,24 @@ command-line or ESC to discard edits and return to the GRUB menu."),
+ 
+       grub_free (msg_translated);
+ 
+-      if (nested)
++      if (!grub_is_cli_disabled ())
+ 	{
+-	  ret += grub_print_message_indented_real
+-	    (_("Press enter to boot the selected OS, "
+-	       "`e' to edit the commands before booting "
+-	       "or `c' for a command-line. ESC to return previous menu."),
+-	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
+-	}
+-      else
+-	{
+-	  ret += grub_print_message_indented_real
+-	    (_("Press enter to boot the selected OS, "
+-	       "`e' to edit the commands before booting "
+-	       "or `c' for a command-line."),
+-	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
++	  if (nested)
++	    {
++	      ret += grub_print_message_indented_real
++		(_("Press enter to boot the selected OS, "
++		   "`e' to edit the commands before booting "
++		   "or `c' for a command-line. ESC to return previous menu."),
++		 STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
++	    }
++	  else
++	    {
++	      ret += grub_print_message_indented_real
++		(_("Press enter to boot the selected OS, "
++		   "`e' to edit the commands before booting "
++		   "or `c' for a command-line."),
++		 STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
++	    }
+ 	}
+     }
+   return ret;
+diff --git a/include/grub/kernel.h b/include/grub/kernel.h
+index 98edc0863..f98a780da 100644
+--- a/include/grub/kernel.h
++++ b/include/grub/kernel.h
+@@ -33,6 +33,7 @@ enum
+   OBJ_TYPE_DISABLE_SHIM_LOCK,
+   OBJ_TYPE_GPG_PUBKEY,
+   OBJ_TYPE_X509_PUBKEY,
++  OBJ_TYPE_DISABLE_CLI
+ };
+ 
+ /* The module header.  */
+diff --git a/include/grub/misc.h b/include/grub/misc.h
+index 6b1e084af..d6e9bae8e 100644
+--- a/include/grub/misc.h
++++ b/include/grub/misc.h
+@@ -442,6 +442,8 @@ grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
+ 					  grub_uint64_t d,
+ 					  grub_uint64_t *r);
+ 
++extern bool EXPORT_FUNC(grub_is_cli_disabled) (void);
++
+ /* Must match softdiv group in gentpl.py.  */
+ #if !defined(GRUB_MACHINE_EMU) && (defined(__arm__) || defined(__ia64__) || \
+     (defined(__riscv) && (__riscv_xlen == 32)))
+diff --git a/include/grub/util/install.h b/include/grub/util/install.h
+index 59eabb9bb..dbf3c216d 100644
+--- a/include/grub/util/install.h
++++ b/include/grub/util/install.h
+@@ -72,6 +72,8 @@
+   { "appended-signature-size", GRUB_INSTALL_OPTIONS_APPENDED_SIGNATURE_SIZE,\
+     "SIZE", 0, N_("Add a note segment reserving SIZE bytes for an appended signature"), \
+     1},                                                                 \
++  { "disable-cli", GRUB_INSTALL_OPTIONS_DISABLE_CLI, 0, 0,		\
++    N_("disabled command line interface access"), 0 },			\
+   { "verbose", 'v', 0, 0,						\
+     N_("print verbose messages."), 1 }
+ 
+@@ -135,7 +137,8 @@ enum grub_install_options {
+   GRUB_INSTALL_OPTIONS_DTB,
+   GRUB_INSTALL_OPTIONS_SBAT,
+   GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK,
+-  GRUB_INSTALL_OPTIONS_APPENDED_SIGNATURE_SIZE
++  GRUB_INSTALL_OPTIONS_APPENDED_SIGNATURE_SIZE,
++  GRUB_INSTALL_OPTIONS_DISABLE_CLI
+ };
+ 
+ extern char *grub_install_source_directory;
+@@ -198,7 +201,8 @@ grub_install_generate_image (const char *dir, const char *prefix,
+ 			     const struct grub_install_image_target_desc *image_target,
+ 			     int note, size_t appsig_size,
+ 			     grub_compression_t comp, const char *dtb_file,
+-			     const char *sbat_path, const int disable_shim_lock);
++			     const char *sbat_path, const int disable_shim_lock,
++			     const int disable_cli);
+ 
+ const struct grub_install_image_target_desc *
+ grub_install_get_image_target (const char *arg);
+diff --git a/util/grub-install-common.c b/util/grub-install-common.c
+index 67afc2eed..42aec141e 100644
+--- a/util/grub-install-common.c
++++ b/util/grub-install-common.c
+@@ -469,6 +469,7 @@ static char **x509keys;
+ static size_t nx509keys;
+ static grub_compression_t compression;
+ static size_t appsig_size;
++static int disable_cli;
+ 
+ int
+ grub_install_parse (int key, char *arg)
+@@ -514,6 +515,9 @@ grub_install_parse (int key, char *arg)
+ 			  * (nx509keys + 1));
+       x509keys[nx509keys++] = xstrdup (arg);
+       return 1;
++    case GRUB_INSTALL_OPTIONS_DISABLE_CLI:
++      disable_cli = 1;
++      return 1;
+ 
+     case GRUB_INSTALL_OPTIONS_VERBOSITY:
+       verbosity++;
+@@ -708,11 +712,13 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
+   grub_util_info ("grub-mkimage --directory '%s' --prefix '%s' --output '%s'"
+ 		  " --format '%s' --compression '%s'"
+ 		  " --appended-signture-size %zu %s%s%s\n",
++		  " --format '%s' --compression '%s'%s%s%s%s\n",
+ 		  dir, prefix, outname,
+ 		  mkimage_target, compnames[compression],
+ 		  appsig_size,
+ 		  note ? " --note" : "",
+-		  disable_shim_lock ? " --disable-shim-lock" : "", s);
++		  disable_shim_lock ? " --disable-shim-lock" : "",
++		  disable_cli ? " --disable-cli" : "", s);
+   free (s);
+ 
+   tgt = grub_install_get_image_target (mkimage_target);
+@@ -725,7 +731,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
+ 			       x509keys, nx509keys,
+ 			       config_path, tgt,
+ 			       note, appsig_size, compression, dtb, sbat,
+-			       disable_shim_lock);
++			       disable_shim_lock, disable_cli);
+   while (dc--)
+     grub_install_pop_module ();
+ }
+diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
+index e1f111278..13bdc6cf0 100644
+--- a/util/grub-mkimage.c
++++ b/util/grub-mkimage.c
+@@ -84,6 +84,7 @@ static struct argp_option options[] = {
+   {"compression",  'C', "(xz|none|auto)", 0, N_("choose the compression to use for core image"), 0},
+   {"sbat", 's', N_("FILE"), 0, N_("SBAT metadata"), 0},
+   {"disable-shim-lock", GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK, 0, 0, N_("disable shim_lock verifier"), 0},
++  {"disable-cli", GRUB_INSTALL_OPTIONS_DISABLE_CLI, 0, 0, N_("disable command line interface access"), 0},
+   {"verbose",     'v', 0,      0, N_("print verbose messages."), 0},
+   {"appended-signature-size", 'S', N_("SIZE"), 0, N_("Add a note segment reserving SIZE bytes for an appended signature"), 0},
+   { 0, 0, 0, 0, 0, 0 }
+@@ -133,6 +134,7 @@ struct arguments
+   int note;
+   int disable_shim_lock;
+   size_t appsig_size;
++  int disable_cli;
+   const struct grub_install_image_target_desc *image_target;
+   grub_compression_t comp;
+ };
+@@ -259,6 +261,10 @@ argp_parser (int key, char *arg, struct argp_state *state)
+       arguments->disable_shim_lock = 1;
+       break;
+ 
++    case GRUB_INSTALL_OPTIONS_DISABLE_CLI:
++      arguments->disable_cli = 1;
++      break;
++
+     case 'v':
+       verbosity++;
+       break;
+@@ -347,7 +353,8 @@ main (int argc, char *argv[])
+ 			       arguments.image_target, arguments.note,
+ 			       arguments.appsig_size, arguments.comp,
+ 			       arguments.dtb, arguments.sbat,
+-			       arguments.disable_shim_lock);
++			       arguments.disable_shim_lock,
++			       arguments.disable_cli);
+ 
+   if (grub_util_file_sync (fp) < 0)
+     grub_util_error (_("cannot sync `%s': %s"), arguments.output ? : "stdout",
+diff --git a/util/mkimage.c b/util/mkimage.c
+index 425d920ff..f31fdefa8 100644
+--- a/util/mkimage.c
++++ b/util/mkimage.c
+@@ -888,7 +888,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
+ 			     const struct grub_install_image_target_desc *image_target,
+ 			     int note, size_t appsig_size, grub_compression_t comp,
+ 			     const char *dtb_path, const char *sbat_path,
+-			     int disable_shim_lock)
++			     int disable_shim_lock, int disable_cli)
+ {
+   char *kernel_img, *core_img;
+   size_t total_module_size, core_size;
+@@ -963,6 +963,9 @@ grub_install_generate_image (const char *dir, const char *prefix,
+   if (disable_shim_lock)
+     total_module_size += sizeof (struct grub_module_header);
+ 
++  if (disable_cli)
++    total_module_size += sizeof (struct grub_module_header);
++
+   if (config_path)
+     {
+       config_size = ALIGN_ADDR (grub_util_get_image_size (config_path) + 1);
+@@ -1129,6 +1132,16 @@ grub_install_generate_image (const char *dir, const char *prefix,
+       offset += sizeof (*header);
+     }
+ 
++  if (disable_cli)
++    {
++      struct grub_module_header *header;
++
++      header = (struct grub_module_header *) (kernel_img + offset);
++      header->type = grub_host_to_target32 (OBJ_TYPE_DISABLE_CLI);
++      header->size = grub_host_to_target32 (sizeof (*header));
++      offset += sizeof (*header);
++    }
++
+   if (config_path)
+     {
+       struct grub_module_header *header;
diff --git a/0312-disk-cryptodisk-Require-authentication-after-TPM-unl.patch b/0312-disk-cryptodisk-Require-authentication-after-TPM-unl.patch
new file mode 100644
index 00000000..2c2396ad
--- /dev/null
+++ b/0312-disk-cryptodisk-Require-authentication-after-TPM-unl.patch
@@ -0,0 +1,337 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Tue, 11 Feb 2025 15:08:06 -0600
+Subject: [PATCH] disk/cryptodisk: Require authentication after TPM unlock for
+ CLI access
+
+The GRUB may use TPM to verify the integrity of boot components and the
+result can determine whether a previously sealed key can be released. If
+everything checks out, showing nothing has been tampered with, the key
+is released and GRUB unlocks the encrypted root partition for the next
+stage of booting.
+
+However, the liberal Command Line Interface (CLI) can be misused by
+anyone in this case to access files in the encrypted partition one way
+or another. Despite efforts to keep the CLI secure by preventing utility
+command output from leaking file content, many techniques in the wild
+could still be used to exploit the CLI, enabling attacks or learning
+methods to attack. It's nearly impossible to account for all scenarios
+where a hack could be applied.
+
+Therefore, to mitigate potential misuse of the CLI after the root device
+has been successfully unlocked via TPM, the user should be required to
+authenticate using the LUKS password. This added layer of security
+ensures that only authorized users can access the CLI reducing the risk
+of exploitation or unauthorized access to the encrypted partition.
+
+Fixes: CVE-2024-49504
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ docs/grub.texi                | 29 +++++++++++++++
+ grub-core/disk/cryptodisk.c   | 87 ++++++++++++++++++++++++++++++++++++++++++-
+ grub-core/kern/main.c         | 12 ++++++
+ grub-core/normal/auth.c       | 30 +++++++++++++++
+ grub-core/normal/main.c       |  4 ++
+ grub-core/normal/menu_entry.c |  4 ++
+ include/grub/auth.h           |  1 +
+ include/grub/cryptodisk.h     |  3 ++
+ include/grub/misc.h           |  2 +
+ 9 files changed, 171 insertions(+), 1 deletion(-)
+
+diff --git a/docs/grub.texi b/docs/grub.texi
+index 9ce9c5b82..2d6d73a78 100644
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -6882,6 +6882,35 @@ sign-file SHA256 grub.key certificate.der core.elf.unsigned core.elf.signed
+ As with UEFI secure boot, it is necessary to build in the required modules,
+ or sign them separately.
+ 
++@subsection Command line and menuentry editor protection
++
++The TPM key protector provides full disk encryption support on servers or
++virtual machine images, meanwhile keeping the boot process unattended. This
++prevents service disruptions by eliminating the need for manual password input
++during startup, improving system uptime and continuity. It is achieved by TPM,
++which verifies the integrity of boot components by checking cryptographic
++hashes against securely stored values, to confirm the disks are unlocked in a
++trusted state.
++
++However, for users to access the system interactively, some form of
++authentication is still required, as the disks are not unlocked by an
++authorized user. This raised concerns about using an unprotected
++@samp{command-line interface} (@pxref{Command-line interface}), as anyone could
++execute commands to access decrypted data. To address this issue, the LUKS
++password is used to ensure that only authorized users are granted access to the
++interface. Additionally, the @samp{menu entry editor} (@pxref{Menu entry
++editor}) is also safeguarded by the LUKS password, as modifying a boot entry is
++effectively the same as altering the @file{grub.cfg} file read from encrypted
++files.
++
++It is worth mentioning that the built-in password support, as described in
++@samp{Authentication and Authorization in GRUB} (@pxref{Authentication and
++authorisation}), can also be used to protect the command-line interface from
++unauthorized access. However, it is not recommended to rely on this approach as
++it is an optional step. Setting it up requires additional manual intervention,
++which increases the risk of password leakage during the process. Moreover, the
++superuser list must be well maintained, and the password used cannot be
++synchronized with LUKS key rotation.
+ 
+ @node Platform limitations
+ @chapter Platform limitations
+diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
+index 98e176a13..06a42b2d7 100644
+--- a/grub-core/disk/cryptodisk.c
++++ b/grub-core/disk/cryptodisk.c
+@@ -1144,7 +1144,9 @@ grub_cryptodisk_scan_device_real (const char *name,
+     ret = grub_cryptodisk_insert (dev, name, source);
+     if (ret != GRUB_ERR_NONE)
+       goto error;
+-
++#ifndef GRUB_UTIL
++    grub_cli_set_auth_needed ();
++#endif
+     goto cleanup;
+   }
+   grub_error (GRUB_ERR_BAD_MODULE, "no cryptodisk module can handle this device");
+@@ -1576,6 +1578,89 @@ luks_script_get (grub_size_t *sz)
+   return ret;
+ }
+ 
++#ifdef GRUB_MACHINE_EFI
++grub_err_t
++grub_cryptodisk_challenge_password (void)
++{
++  grub_cryptodisk_t cr_dev;
++
++  for (cr_dev = cryptodisk_list; cr_dev != NULL; cr_dev = cr_dev->next)
++    {
++      grub_cryptodisk_dev_t cr;
++      grub_disk_t source = NULL;
++      grub_err_t ret = GRUB_ERR_NONE;
++      grub_cryptodisk_t dev = NULL;
++      char *part = NULL;
++      struct grub_cryptomount_args cargs = {0};
++
++      cargs.check_boot = 0;
++      cargs.search_uuid = cr_dev->uuid;
++
++      source = grub_disk_open (cr_dev->source);
++
++      if (source == NULL)
++	{
++	  ret = grub_errno;
++	  goto error_out;
++	}
++
++      FOR_CRYPTODISK_DEVS (cr)
++      {
++	dev = cr->scan (source, &cargs);
++	if (grub_errno)
++	  {
++	    ret = grub_errno;
++	    goto error_out;
++	  }
++	if (dev == NULL)
++	  continue;
++	break;
++      }
++
++      if (dev == NULL)
++	{
++	  ret = grub_error (GRUB_ERR_BAD_MODULE, "no cryptodisk module can handle this device");
++	  goto error_out;
++	}
++
++      part = grub_partition_get_name (source->partition);
++      grub_printf_ (N_("Enter passphrase for %s%s%s (%s): "), source->name,
++		    source->partition != NULL ? "," : "",
++		    part != NULL ? part : N_("UNKNOWN"), cr_dev->uuid);
++      grub_free (part);
++
++      cargs.key_data = grub_malloc (GRUB_CRYPTODISK_MAX_PASSPHRASE);
++      if (cargs.key_data == NULL)
++	{
++	  ret = grub_errno;
++	  goto error_out;
++	}
++
++      if (!grub_password_get ((char *) cargs.key_data, GRUB_CRYPTODISK_MAX_PASSPHRASE))
++	{
++	  ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "passphrase not supplied");
++	  goto error_out;
++	}
++      cargs.key_len = grub_strlen ((char *) cargs.key_data);
++      ret = cr->recover_key (source, dev, &cargs);
++
++ error_out:
++      grub_disk_close (source);
++      if (dev != NULL)
++	cryptodisk_close (dev);
++      if (cargs.key_data)
++	{
++	  grub_memset (cargs.key_data, 0, cargs.key_len);
++	  grub_free (cargs.key_data);
++	}
++
++      return ret;
++    }
++
++  return GRUB_ERR_NONE;
++}
++#endif /* GRUB_MACHINE_EFI */
++
+ struct grub_procfs_entry luks_script =
+ {
+   .name = "luks_script",
+diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
+index 0d6b8138d..2e6b79ee3 100644
+--- a/grub-core/kern/main.c
++++ b/grub-core/kern/main.c
+@@ -37,6 +37,7 @@
+ #endif
+ 
+ static bool cli_disabled = false;
++static bool cli_need_auth = false;
+ 
+ grub_addr_t
+ grub_modules_get_end (void)
+@@ -308,6 +309,17 @@ grub_is_cli_disabled (void)
+   return cli_disabled;
+ }
+ 
++bool
++grub_is_cli_need_auth (void)
++{
++  return cli_need_auth;
++}
++
++void grub_cli_set_auth_needed (void)
++{
++  cli_need_auth = true;
++}
++
+ static void
+ check_is_cli_disabled (void)
+ {
+diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
+index d94020186..71b361bc0 100644
+--- a/grub-core/normal/auth.c
++++ b/grub-core/normal/auth.c
+@@ -25,6 +25,10 @@
+ #include <grub/time.h>
+ #include <grub/i18n.h>
+ 
++#ifdef GRUB_MACHINE_EFI
++#include <grub/cryptodisk.h>
++#endif
++
+ struct grub_auth_user
+ {
+   struct grub_auth_user *next;
+@@ -200,6 +204,32 @@ grub_username_get (char buf[], unsigned buf_size)
+   return (key != GRUB_TERM_ESC);
+ }
+ 
++grub_err_t
++grub_auth_check_cli_access (void)
++{
++  if (grub_is_cli_need_auth () == true)
++    {
++#ifdef GRUB_MACHINE_EFI
++      static bool authenticated = false;
++
++      if (authenticated == false)
++	{
++	  grub_err_t ret;
++
++	  ret = grub_cryptodisk_challenge_password ();
++	  if (ret == GRUB_ERR_NONE)
++	    authenticated = true;
++	  return ret;
++	}
++      return GRUB_ERR_NONE;
++#else
++      return GRUB_ACCESS_DENIED;
++#endif
++    }
++
++  return GRUB_ERR_NONE;
++}
++
+ grub_err_t
+ grub_auth_check_authentication (const char *userlist)
+ {
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index 26872ce94..86ffb388d 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -557,9 +557,13 @@ grub_cmdline_run (int nested, int force_auth)
+     }
+   while (err && force_auth);
+ 
++  if (err == GRUB_ERR_NONE)
++    err = grub_auth_check_cli_access ();
++
+   if (err)
+     {
+       grub_print_error ();
++      grub_wait_after_message ();
+       grub_errno = GRUB_ERR_NONE;
+       return;
+     }
+diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
+index ade56be2b..8b0d17e3f 100644
+--- a/grub-core/normal/menu_entry.c
++++ b/grub-core/normal/menu_entry.c
+@@ -1255,9 +1255,13 @@ grub_menu_entry_run (grub_menu_entry_t entry)
+ 
+   err = grub_auth_check_authentication (NULL);
+ 
++  if (err == GRUB_ERR_NONE)
++    err = grub_auth_check_cli_access ();
++
+   if (err)
+     {
+       grub_print_error ();
++      grub_wait_after_message ();
+       grub_errno = GRUB_ERR_NONE;
+       return;
+     }
+diff --git a/include/grub/auth.h b/include/grub/auth.h
+index 747334451..21d5190f0 100644
+--- a/include/grub/auth.h
++++ b/include/grub/auth.h
+@@ -33,5 +33,6 @@ grub_err_t grub_auth_unregister_authentication (const char *user);
+ grub_err_t grub_auth_authenticate (const char *user);
+ grub_err_t grub_auth_deauthenticate (const char *user);
+ grub_err_t grub_auth_check_authentication (const char *userlist);
++grub_err_t grub_auth_check_cli_access (void);
+ 
+ #endif /* ! GRUB_AUTH_HEADER */
+diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h
+index d94df68b6..d2572f8b0 100644
+--- a/include/grub/cryptodisk.h
++++ b/include/grub/cryptodisk.h
+@@ -187,4 +187,7 @@ grub_util_get_geli_uuid (const char *dev);
+ grub_cryptodisk_t grub_cryptodisk_get_by_uuid (const char *uuid);
+ grub_cryptodisk_t grub_cryptodisk_get_by_source_disk (grub_disk_t disk);
+ 
++#ifdef GRUB_MACHINE_EFI
++grub_err_t grub_cryptodisk_challenge_password (void);
++#endif
+ #endif
+diff --git a/include/grub/misc.h b/include/grub/misc.h
+index d6e9bae8e..0429339ef 100644
+--- a/include/grub/misc.h
++++ b/include/grub/misc.h
+@@ -443,6 +443,8 @@ grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
+ 					  grub_uint64_t *r);
+ 
+ extern bool EXPORT_FUNC(grub_is_cli_disabled) (void);
++extern bool EXPORT_FUNC(grub_is_cli_need_auth) (void);
++extern void EXPORT_FUNC(grub_cli_set_auth_needed) (void);
+ 
+ /* Must match softdiv group in gentpl.py.  */
+ #if !defined(GRUB_MACHINE_EMU) && (defined(__arm__) || defined(__ia64__) || \
diff --git a/0313-disk-loopback-Reference-tracking-for-the-loopback.patch b/0313-disk-loopback-Reference-tracking-for-the-loopback.patch
new file mode 100644
index 00000000..5f6cd3af
--- /dev/null
+++ b/0313-disk-loopback-Reference-tracking-for-the-loopback.patch
@@ -0,0 +1,108 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Tue, 11 Feb 2025 15:22:28 -0600
+Subject: [PATCH] disk/loopback: Reference tracking for the loopback
+
+It was possible to delete a loopback while there were still references
+to it. This led to an exploitable use-after-free.
+
+Fixed by implementing a reference counting in the grub_loopback struct.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/disk/loopback.c | 17 +++++++++++++++++
+ include/grub/err.h        |  3 ++-
+ include/grub/loopback.h   |  1 +
+ 3 files changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
+index 11a5e0cbd..f39281323 100644
+--- a/grub-core/disk/loopback.c
++++ b/grub-core/disk/loopback.c
+@@ -25,6 +25,7 @@
+ #include <grub/mm.h>
+ #include <grub/extcmd.h>
+ #include <grub/i18n.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -57,6 +58,8 @@ delete_loopback (const char *name)
+   if (! dev)
+     return grub_error (GRUB_ERR_BAD_DEVICE, "device not found");
+ 
++  if (dev->refcnt > 0)
++    return grub_error (GRUB_ERR_STILL_REFERENCED, "device still referenced");
+   /* Remove the device from the list.  */
+   *prev = dev->next;
+ 
+@@ -113,6 +116,7 @@ grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
+ 
+   newdev->file = file;
+   newdev->id = last_id++;
++  newdev->refcnt = 0;
+ 
+   /* Add the new entry to the list.  */
+   newdev->next = loopback_list;
+@@ -154,6 +158,9 @@ grub_loopback_open (const char *name, grub_disk_t disk)
+   if (! dev)
+     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
+ 
++  if (grub_add (dev->refcnt, 1, &dev->refcnt))
++    grub_fatal ("Reference count overflow");
++
+   /* Use the filesize for the disk size, round up to a complete sector.  */
+   if (dev->file->size != GRUB_FILE_SIZE_UNKNOWN)
+     disk->total_sectors = ((dev->file->size + GRUB_DISK_SECTOR_SIZE - 1)
+@@ -171,6 +178,15 @@ grub_loopback_open (const char *name, grub_disk_t disk)
+   return 0;
+ }
+ 
++static void
++grub_loopback_close (grub_disk_t disk)
++{
++  struct grub_loopback *dev = disk->data;
++
++  if (grub_sub (dev->refcnt, 1, &dev->refcnt))
++    grub_fatal ("Reference count underflow");
++}
++
+ static grub_err_t
+ grub_loopback_read (grub_disk_t disk, grub_disk_addr_t sector,
+ 		    grub_size_t size, char *buf)
+@@ -213,6 +229,7 @@ static struct grub_disk_dev grub_loopback_dev =
+     .id = GRUB_DISK_DEVICE_LOOPBACK_ID,
+     .disk_iterate = grub_loopback_iterate,
+     .disk_open = grub_loopback_open,
++    .disk_close = grub_loopback_close,
+     .disk_read = grub_loopback_read,
+     .disk_write = grub_loopback_write,
+     .next = 0
+diff --git a/include/grub/err.h b/include/grub/err.h
+index 3c587b9b8..29f1a73c5 100644
+--- a/include/grub/err.h
++++ b/include/grub/err.h
+@@ -73,7 +73,8 @@ typedef enum
+     GRUB_ERR_NET_NO_DOMAIN,
+     GRUB_ERR_EOF,
+     GRUB_ERR_BAD_SIGNATURE,
+-    GRUB_ERR_BAD_FIRMWARE
++    GRUB_ERR_BAD_FIRMWARE,
++    GRUB_ERR_STILL_REFERENCED
+   }
+ grub_err_t;
+ 
+diff --git a/include/grub/loopback.h b/include/grub/loopback.h
+index 3b9a9e32e..915ef65fc 100644
+--- a/include/grub/loopback.h
++++ b/include/grub/loopback.h
+@@ -25,6 +25,7 @@ struct grub_loopback
+   grub_file_t file;
+   struct grub_loopback *next;
+   unsigned long id;
++  grub_uint64_t refcnt;
+ };
+ 
+ #endif /* ! GRUB_LOOPBACK_HEADER */
diff --git a/0314-kern-disk-Limit-recursion-depth.patch b/0314-kern-disk-Limit-recursion-depth.patch
new file mode 100644
index 00000000..eba37f97
--- /dev/null
+++ b/0314-kern-disk-Limit-recursion-depth.patch
@@ -0,0 +1,120 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sun, 12 May 2024 04:09:24 +0100
+Subject: [PATCH] kern/disk: Limit recursion depth
+
+The grub_disk_read() may trigger other disk reads, e.g. via loopbacks.
+This may lead to very deep recursion which can corrupt the heap. So, fix
+the issue by limiting reads depth.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/disk.c | 27 ++++++++++++++++++++-------
+ include/grub/err.h    |  3 ++-
+ 2 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c
+index 355b6579d..5747ad85c 100644
+--- a/grub-core/kern/disk.c
++++ b/grub-core/kern/disk.c
+@@ -28,6 +28,10 @@
+ 
+ #define	GRUB_CACHE_TIMEOUT	2
+ 
++/* Disk reads may trigger other disk reads. So, limit recursion depth. */
++#define MAX_READ_RECURSION_DEPTH	16
++static unsigned int read_recursion_depth = 0;
++
+ /* The last time the disk was used.  */
+ static grub_uint64_t grub_last_time = 0;
+ 
+@@ -421,6 +425,8 @@ grub_err_t
+ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
+ 		grub_off_t offset, grub_size_t size, void *buf)
+ {
++  grub_err_t err = GRUB_ERR_NONE;
++
+   /* First of all, check if the region is within the disk.  */
+   if (grub_disk_adjust_range (disk, &sector, &offset, size) != GRUB_ERR_NONE)
+     {
+@@ -431,12 +437,17 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
+       return grub_errno;
+     }
+ 
++  if (++read_recursion_depth >= MAX_READ_RECURSION_DEPTH)
++    {
++      grub_error (GRUB_ERR_RECURSION_DEPTH, "grub_disk_read(): Maximum recursion depth exceeded");
++      goto error;
++    }
++
+   /* First read until first cache boundary.   */
+   if (offset || (sector & (GRUB_DISK_CACHE_SIZE - 1)))
+     {
+       grub_disk_addr_t start_sector;
+       grub_size_t pos;
+-      grub_err_t err;
+       grub_size_t len;
+ 
+       start_sector = sector & ~((grub_disk_addr_t) GRUB_DISK_CACHE_SIZE - 1);
+@@ -448,7 +459,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
+       err = grub_disk_read_small (disk, start_sector,
+ 				  offset + pos, len, buf);
+       if (err)
+-	return err;
++	goto error;
+       buf = (char *) buf + len;
+       size -= len;
+       offset += len;
+@@ -461,7 +472,6 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
+     {
+       char *data = NULL;
+       grub_disk_addr_t agglomerate;
+-      grub_err_t err;
+ 
+       /* agglomerate read until we find a first cached entry.  */
+       for (agglomerate = 0; agglomerate
+@@ -497,7 +507,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
+ 							- disk->log_sector_size),
+ 					buf);
+ 	  if (err)
+-	    return err;
++	    goto error;
+ 
+ 	  for (i = 0; i < agglomerate; i ++)
+ 	    grub_disk_cache_store (disk->dev->id, disk->id,
+@@ -531,13 +541,16 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
+   /* And now read the last part.  */
+   if (size)
+     {
+-      grub_err_t err;
+       err = grub_disk_read_small (disk, sector, 0, size, buf);
+       if (err)
+-	return err;
++	goto error;
+     }
+ 
+-  return grub_errno;
++  err = grub_errno;
++
++ error:
++  read_recursion_depth--;
++  return err;
+ }
+ 
+ grub_uint64_t
+diff --git a/include/grub/err.h b/include/grub/err.h
+index 29f1a73c5..7530f58b2 100644
+--- a/include/grub/err.h
++++ b/include/grub/err.h
+@@ -74,7 +74,8 @@ typedef enum
+     GRUB_ERR_EOF,
+     GRUB_ERR_BAD_SIGNATURE,
+     GRUB_ERR_BAD_FIRMWARE,
+-    GRUB_ERR_STILL_REFERENCED
++    GRUB_ERR_STILL_REFERENCED,
++    GRUB_ERR_RECURSION_DEPTH
+   }
+ grub_err_t;
+ 
diff --git a/0315-kern-partition-Limit-recursion-in-part_iterate.patch b/0315-kern-partition-Limit-recursion-in-part_iterate.patch
new file mode 100644
index 00000000..f51ff967
--- /dev/null
+++ b/0315-kern-partition-Limit-recursion-in-part_iterate.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sat, 16 Nov 2024 21:24:19 +0000
+Subject: [PATCH] kern/partition: Limit recursion in part_iterate()
+
+The part_iterate() is used by grub_partition_iterate() as a callback in
+the partition iterate functions. However, part_iterate() may also call
+the partition iterate functions which may lead to recursion. Fix potential
+issue by limiting the recursion depth.
+
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/partition.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/partition.c b/grub-core/kern/partition.c
+index edad9f9e4..704512a20 100644
+--- a/grub-core/kern/partition.c
++++ b/grub-core/kern/partition.c
+@@ -28,6 +28,9 @@
+ 
+ grub_partition_map_t grub_partition_map_list;
+ 
++#define MAX_RECURSION_DEPTH	32
++static unsigned int recursion_depth = 0;
++
+ /*
+  * Checks that disk->partition contains part.  This function assumes that the
+  * start of part is relative to the start of disk->partition.  Returns 1 if
+@@ -208,7 +211,12 @@ part_iterate (grub_disk_t dsk, const grub_partition_t partition, void *data)
+       FOR_PARTITION_MAPS(partmap)
+       {
+ 	grub_err_t err;
+-	err = partmap->iterate (dsk, part_iterate, ctx);
++	recursion_depth++;
++	if (recursion_depth <= MAX_RECURSION_DEPTH)
++	  err = partmap->iterate (dsk, part_iterate, ctx);
++	else
++	  err = grub_error (GRUB_ERR_RECURSION_DEPTH, "maximum recursion depth exceeded");
++	recursion_depth--;
+ 	if (err)
+ 	  grub_errno = GRUB_ERR_NONE;
+ 	if (ctx->ret)
diff --git a/0316-script-execute-Limit-the-recursion-depth.patch b/0316-script-execute-Limit-the-recursion-depth.patch
new file mode 100644
index 00000000..6bf1d092
--- /dev/null
+++ b/0316-script-execute-Limit-the-recursion-depth.patch
@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Thu, 18 Apr 2024 19:04:13 +0100
+Subject: [PATCH] script/execute: Limit the recursion depth
+
+If unbounded recursion is allowed it becomes possible to collide the
+stack with the heap. As UEFI firmware often lacks guard pages this
+becomes an exploitable issue as it is possible in some cases to do
+a controlled overwrite of a section of this heap region with
+arbitrary data.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/script/execute.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
+index c19b4bf70..7ed3a1a03 100644
+--- a/grub-core/script/execute.c
++++ b/grub-core/script/execute.c
+@@ -36,10 +36,18 @@
+    is sizeof (int) * 3, and one extra for a possible -ve sign.  */
+ #define ERRNO_DIGITS_MAX  (sizeof (int) * 3 + 1)
+ 
++/*
++ * A limit on recursion, to avoid colliding with the heap. UEFI defines a baseline
++ * stack size of 128 KiB. So, assuming at most 1-2 KiB per iteration this should
++ * keep us safe.
++ */
++#define MAX_RECURSION_DEPTH 64
++
+ static unsigned long is_continue;
+ static unsigned long active_loops;
+ static unsigned long active_breaks;
+ static unsigned long function_return;
++static unsigned long recursion_depth;
+ 
+ #define GRUB_SCRIPT_SCOPE_MALLOCED      1
+ #define GRUB_SCRIPT_SCOPE_ARGS_MALLOCED 2
+@@ -850,7 +858,13 @@ grub_script_execute_cmd (struct grub_script_cmd *cmd)
+   if (cmd == 0)
+     return 0;
+ 
++  recursion_depth++;
++
++  if (recursion_depth >= MAX_RECURSION_DEPTH)
++    return grub_error (GRUB_ERR_RECURSION_DEPTH, N_("maximum recursion depth exceeded"));
++
+   ret = cmd->exec (cmd);
++  recursion_depth--;
+ 
+   grub_snprintf (errnobuf, sizeof (errnobuf), "%d", ret);
+   grub_env_set ("?", errnobuf);
diff --git a/0317-net-Unregister-net_default_ip-and-net_default_mac-va.patch b/0317-net-Unregister-net_default_ip-and-net_default_mac-va.patch
new file mode 100644
index 00000000..c3f5636c
--- /dev/null
+++ b/0317-net-Unregister-net_default_ip-and-net_default_mac-va.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Tue, 11 Feb 2025 15:27:10 -0600
+Subject: [PATCH] net: Unregister net_default_ip and net_default_mac variables
+ hooks on unload
+
+The net module is a dependency of normal. So, it shouldn't be possible
+to unload the net. Though unregister variables hooks as a precaution.
+It also gets in line with unregistering the other net module hooks.
+
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/net/net.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/grub-core/net/net.c b/grub-core/net/net.c
+index fdec64d55..9959a2ae8 100644
+--- a/grub-core/net/net.c
++++ b/grub-core/net/net.c
+@@ -2221,6 +2221,8 @@ GRUB_MOD_FINI(net)
+ 
+   grub_register_variable_hook ("net_default_server", 0, 0);
+   grub_register_variable_hook ("pxe_default_server", 0, 0);
++  grub_register_variable_hook ("net_default_ip", 0, 0);
++  grub_register_variable_hook ("net_default_mac", 0, 0);
+ 
+   grub_bootp_fini ();
+   grub_dns_fini ();
diff --git a/0318-net-Remove-variables-hooks-when-interface-is-unregis.patch b/0318-net-Remove-variables-hooks-when-interface-is-unregis.patch
new file mode 100644
index 00000000..c7b25c19
--- /dev/null
+++ b/0318-net-Remove-variables-hooks-when-interface-is-unregis.patch
@@ -0,0 +1,84 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Tue, 11 Feb 2025 15:42:44 -0600
+Subject: [PATCH] net: Remove variables hooks when interface is unregisted
+
+The grub_net_network_level_interface_unregister(), previously
+implemented in a header, did not remove the variables hooks that
+were registered in grub_net_network_level_interface_register().
+Fix this by implementing the same logic used to register the
+variables and move the function into the grub-core/net/net.c.
+
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/net/net.c | 33 +++++++++++++++++++++++++++++++++
+ include/grub/net.h  | 11 +----------
+ 2 files changed, 34 insertions(+), 10 deletions(-)
+
+diff --git a/grub-core/net/net.c b/grub-core/net/net.c
+index 9959a2ae8..22d5cc3ba 100644
+--- a/grub-core/net/net.c
++++ b/grub-core/net/net.c
+@@ -1066,6 +1066,39 @@ grub_net_add_ipv6_local (struct grub_net_network_level_interface *inter,
+   return 0;
+ }
+ 
++void
++grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter)
++{
++  char *name;
++
++    {
++      char buf[GRUB_NET_MAX_STR_HWADDR_LEN];
++
++      grub_net_hwaddr_to_str (&inter->hwaddress, buf);
++      name = grub_xasprintf ("net_%s_mac", inter->name);
++      if (name != NULL)
++        grub_register_variable_hook (name, NULL, NULL);
++      grub_free (name);
++    }
++
++    {
++      char buf[GRUB_NET_MAX_STR_ADDR_LEN];
++
++      grub_net_addr_to_str (&inter->address, buf);
++      name = grub_xasprintf ("net_%s_ip", inter->name);
++      if (name != NULL)
++        grub_register_variable_hook (name, NULL, NULL);
++      grub_free (name);
++    }
++
++    inter->card->num_ifaces--;
++    *inter->prev = inter->next;
++    if (inter->next)
++      inter->next->prev = inter->prev;
++    inter->next = 0;
++    inter->prev = 0;
++}
++
+ grub_err_t
+ grub_net_add_ipv4_local (struct grub_net_network_level_interface *inter,
+ 			 int mask)
+diff --git a/include/grub/net.h b/include/grub/net.h
+index 868c9a2ef..273afbddf 100644
+--- a/include/grub/net.h
++++ b/include/grub/net.h
+@@ -625,16 +625,7 @@ void grub_bootp_fini (void);
+ void grub_dns_init (void);
+ void grub_dns_fini (void);
+ 
+-static inline void
+-grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter)
+-{
+-  inter->card->num_ifaces--;
+-  *inter->prev = inter->next;
+-  if (inter->next)
+-    inter->next->prev = inter->prev;
+-  inter->next = 0;
+-  inter->prev = 0;
+-}
++void grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter);
+ 
+ void
+ grub_net_tcp_retransmit (void);
diff --git a/0319-net-Fix-OOB-write-in-grub_net_search_config_file.patch b/0319-net-Fix-OOB-write-in-grub_net_search_config_file.patch
new file mode 100644
index 00000000..d0830c83
--- /dev/null
+++ b/0319-net-Fix-OOB-write-in-grub_net_search_config_file.patch
@@ -0,0 +1,79 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Tue, 11 Feb 2025 16:38:44 -0600
+Subject: [PATCH] net: Fix OOB write in grub_net_search_config_file()
+
+The function included a call to grub_strcpy() which copied data from an
+environment variable to a buffer allocated in grub_cmd_normal(). The
+grub_cmd_normal() didn't consider the length of the environment variable.
+So, the copy operation could exceed the allocation and lead to an OOB
+write. Fix the issue by replacing grub_strcpy() with grub_strlcpy() and
+pass the underlying buffers size to the grub_net_search_config_file().
+
+Fixes: CVE-2025-0624
+
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/net/net.c     | 7 ++++---
+ grub-core/normal/main.c | 2 +-
+ include/grub/net.h      | 2 +-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/net/net.c b/grub-core/net/net.c
+index 22d5cc3ba..6c8dfcba2 100644
+--- a/grub-core/net/net.c
++++ b/grub-core/net/net.c
+@@ -2023,14 +2023,15 @@ grub_config_search_through (char *config, char *suffix,
+ }
+ 
+ grub_err_t
+-grub_net_search_config_file (char *config)
++grub_net_search_config_file (char *config, grub_size_t config_buf_len)
+ {
+-  grub_size_t config_len;
++  grub_size_t config_len, suffix_len;
+   char *suffix;
+ 
+   config_len = grub_strlen (config);
+   config[config_len] = '-';
+   suffix = config + config_len + 1;
++  suffix_len = config_buf_len - (config_len + 1);
+ 
+   struct grub_net_network_level_interface *inf;
+   FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
+@@ -2056,7 +2057,7 @@ grub_net_search_config_file (char *config)
+ 
+       if (client_uuid)
+         {
+-          grub_strcpy (suffix, client_uuid);
++          grub_strlcpy (suffix, client_uuid, suffix_len);
+           if (grub_config_search_through (config, suffix, 1, 0) == 0)
+             return GRUB_ERR_NONE;
+         }
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index 86ffb388d..cad840e06 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -360,7 +360,7 @@ grub_try_normal_prefix (const char *prefix)
+          return err;
+ 
+        grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
+-       err = grub_net_search_config_file (config);
++       err = grub_net_search_config_file (config, config_len);
+       }
+ 
+     if (err != GRUB_ERR_NONE)
+diff --git a/include/grub/net.h b/include/grub/net.h
+index 273afbddf..d280acd72 100644
+--- a/include/grub/net.h
++++ b/include/grub/net.h
+@@ -655,7 +655,7 @@ void
+ grub_net_remove_dns_server (const struct grub_net_network_level_address *s);
+ 
+ grub_err_t
+-grub_net_search_config_file (char *config);
++grub_net_search_config_file (char *config, grub_size_t config_buf_len);
+ 
+ extern char *grub_net_default_server;
+ 
diff --git a/0320-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch b/0320-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch
new file mode 100644
index 00000000..91b857d8
--- /dev/null
+++ b/0320-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch
@@ -0,0 +1,115 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Thu, 18 Apr 2024 17:32:34 +0100
+Subject: [PATCH] net/tftp: Fix stack buffer overflow in tftp_open()
+
+An overly long filename can be passed to tftp_open() which would cause
+grub_normalize_filename() to write out of bounds.
+
+Fixed by adding an extra argument to grub_normalize_filename() for the
+space available, making it act closer to a strlcpy(). As several fixed
+strings are strcpy()'d after into the same buffer, their total length is
+checked to see if they exceed the remaining space in the buffer. If so,
+return an error.
+
+On the occasion simplify code a bit by removing unneeded rrqlen zeroing.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/net/tftp.c | 38 ++++++++++++++++++++++++--------------
+ 1 file changed, 24 insertions(+), 14 deletions(-)
+
+diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
+index f300a9d40..3d96e50f4 100644
+--- a/grub-core/net/tftp.c
++++ b/grub-core/net/tftp.c
+@@ -266,17 +266,19 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
+  * forward slashes to a single forward slash.
+  */
+ static void
+-grub_normalize_filename (char *normalized, const char *filename)
++grub_normalize_filename (char *normalized, const char *filename, int c)
+ {
+   char *dest = normalized;
+   const char *src = filename;
+ 
+-  while (*src != '\0')
++  while (*src != '\0' && c > 0)
+     {
+       if (src[0] == '/' && src[1] == '/')
+         src++;
+-      else
++      else {
++        c--;
+         *dest++ = *src++;
++      }
+     }
+   *dest = '\0';
+ }
+@@ -287,7 +289,7 @@ tftp_open (struct grub_file *file, const char *filename)
+   struct tftphdr *tftph;
+   char *rrq;
+   int i;
+-  int rrqlen;
++  int rrqlen, rrqsize;
+   int hdrlen;
+   grub_uint8_t open_data[1500];
+   struct grub_net_buff nb;
+@@ -315,37 +317,45 @@ tftp_open (struct grub_file *file, const char *filename)
+ 
+   tftph = (struct tftphdr *) nb.data;
+ 
+-  rrq = (char *) tftph->u.rrq;
+-  rrqlen = 0;
+-
+   tftph->opcode = grub_cpu_to_be16_compile_time (TFTP_RRQ);
+ 
++  rrq = (char *) tftph->u.rrq;
++  rrqsize = sizeof (tftph->u.rrq);
++
+   /*
+    * Copy and normalize the filename to work-around issues on some TFTP
+    * servers when file names are being matched for remapping.
+    */
+-  grub_normalize_filename (rrq, filename);
+-  rrqlen += grub_strlen (rrq) + 1;
++  grub_normalize_filename (rrq, filename, rrqsize);
++
++  rrqlen = grub_strlen (rrq) + 1;
+   rrq += grub_strlen (rrq) + 1;
+ 
+-  grub_strcpy (rrq, "octet");
++  /* Verify there is enough space for the remaining components. */
+   rrqlen += grub_strlen ("octet") + 1;
++  rrqlen += grub_strlen ("blksize") + 1;
++  rrqlen += grub_strlen ("1024") + 1;
++  rrqlen += grub_strlen ("tsize") + 1;
++  rrqlen += grub_strlen ("0") + 1;
++
++  if (rrqlen >= rrqsize) {
++    grub_free (data);
++    return grub_error (GRUB_ERR_BAD_FILENAME, N_("filename too long"));
++  }
++
++  grub_strcpy (rrq, "octet");
+   rrq += grub_strlen ("octet") + 1;
+ 
+   grub_strcpy (rrq, "blksize");
+-  rrqlen += grub_strlen ("blksize") + 1;
+   rrq += grub_strlen ("blksize") + 1;
+ 
+   grub_strcpy (rrq, "1024");
+-  rrqlen += grub_strlen ("1024") + 1;
+   rrq += grub_strlen ("1024") + 1;
+ 
+   grub_strcpy (rrq, "tsize");
+-  rrqlen += grub_strlen ("tsize") + 1;
+   rrq += grub_strlen ("tsize") + 1;
+ 
+   grub_strcpy (rrq, "0");
+-  rrqlen += grub_strlen ("0") + 1;
+   rrq += grub_strlen ("0") + 1;
+   hdrlen = sizeof (tftph->opcode) + rrqlen;
+ 
diff --git a/0321-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch b/0321-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch
new file mode 100644
index 00000000..848d527f
--- /dev/null
+++ b/0321-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens <dja@axtens.net>
+Date: Fri, 8 Mar 2024 22:47:20 +1100
+Subject: [PATCH] video/readers/jpeg: Do not permit duplicate SOF0 markers in
+ JPEG
+
+Otherwise a subsequent header could change the height and width
+allowing future OOB writes.
+
+Fixes: CVE-2024-45774
+
+Reported-by: Nils Langius <nils@langius.de>
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/video/readers/jpeg.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
+index ae634fd41..631a89356 100644
+--- a/grub-core/video/readers/jpeg.c
++++ b/grub-core/video/readers/jpeg.c
+@@ -339,6 +339,10 @@ grub_jpeg_decode_sof (struct grub_jpeg_data *data)
+   if (grub_errno != GRUB_ERR_NONE)
+     return grub_errno;
+ 
++  if (data->image_height != 0 || data->image_width != 0)
++    return grub_error (GRUB_ERR_BAD_FILE_TYPE,
++		       "jpeg: cannot have duplicate SOF0 markers");
++
+   if (grub_jpeg_get_byte (data) != 8)
+     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
+ 		       "jpeg: only 8-bit precision is supported");
diff --git a/0322-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch b/0322-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch
new file mode 100644
index 00000000..1fee4bf0
--- /dev/null
+++ b/0322-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch
@@ -0,0 +1,138 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Tue, 11 Feb 2025 16:41:57 -0600
+Subject: [PATCH] kern/dl: Fix for an integer overflow in grub_dl_ref()
+
+It was possible to overflow the value of mod->ref_count, a signed
+integer, by repeatedly invoking insmod on an already loaded module.
+This led to a use-after-free. As once ref_count was overflowed it became
+possible to unload the module while there was still references to it.
+
+This resolves the issue by using grub_add() to check if the ref_count
+will overflow and then stops further increments. Further changes were
+also made to grub_dl_unref() to check for the underflow condition and
+the reference count was changed to an unsigned 64-bit integer.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/minicmd.c |  2 +-
+ grub-core/kern/dl.c          | 17 ++++++++++++-----
+ include/grub/dl.h            |  8 ++++----
+ util/misc.c                  |  4 ++--
+ 4 files changed, 19 insertions(+), 12 deletions(-)
+
+diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
+index 2bd3ac76f..2001043cf 100644
+--- a/grub-core/commands/minicmd.c
++++ b/grub-core/commands/minicmd.c
+@@ -167,7 +167,7 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
+   {
+     grub_dl_dep_t dep;
+ 
+-    grub_printf ("%s\t%d\t\t", mod->name, mod->ref_count);
++    grub_printf ("%s\t%" PRIuGRUB_UINT64_T "\t\t", mod->name, mod->ref_count);
+     for (dep = mod->dep; dep; dep = dep->next)
+       {
+ 	if (dep != mod->dep)
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index 2eaef7150..fe7c3b940 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -32,6 +32,7 @@
+ #include <grub/env.h>
+ #include <grub/cache.h>
+ #include <grub/i18n.h>
++#include <grub/safemath.h>
+ #include <grub/efi/sb.h>
+ 
+ /* Platforms where modules are in a readonly area of memory.  */
+@@ -613,7 +614,7 @@ grub_dl_resolve_dependencies (grub_dl_t mod, Elf_Ehdr *e)
+   return GRUB_ERR_NONE;
+ }
+ 
+-int
++grub_uint64_t
+ grub_dl_ref (grub_dl_t mod)
+ {
+   grub_dl_dep_t dep;
+@@ -624,10 +625,13 @@ grub_dl_ref (grub_dl_t mod)
+   for (dep = mod->dep; dep; dep = dep->next)
+     grub_dl_ref (dep->mod);
+ 
+-  return ++mod->ref_count;
++  if (grub_add (mod->ref_count, 1, &mod->ref_count))
++    grub_fatal ("Module reference count overflow");
++
++  return mod->ref_count;
+ }
+ 
+-int
++grub_uint64_t
+ grub_dl_unref (grub_dl_t mod)
+ {
+   grub_dl_dep_t dep;
+@@ -638,10 +642,13 @@ grub_dl_unref (grub_dl_t mod)
+   for (dep = mod->dep; dep; dep = dep->next)
+     grub_dl_unref (dep->mod);
+ 
+-  return --mod->ref_count;
++  if (grub_sub (mod->ref_count, 1, &mod->ref_count))
++    grub_fatal ("Module reference count underflow");
++
++  return mod->ref_count;
+ }
+ 
+-int
++grub_uint64_t
+ grub_dl_ref_count (grub_dl_t mod)
+ {
+   if (mod == NULL)
+diff --git a/include/grub/dl.h b/include/grub/dl.h
+index 1e1262a28..055bb564e 100644
+--- a/include/grub/dl.h
++++ b/include/grub/dl.h
+@@ -177,7 +177,7 @@ typedef struct grub_dl_dep *grub_dl_dep_t;
+ struct grub_dl
+ {
+   char *name;
+-  int ref_count;
++  grub_uint64_t ref_count;
+   int persistent;
+   grub_dl_dep_t dep;
+   grub_dl_segment_t segment;
+@@ -206,9 +206,9 @@ grub_dl_t EXPORT_FUNC(grub_dl_load) (const char *name);
+ grub_dl_t grub_dl_load_core (void *addr, grub_size_t size);
+ grub_dl_t EXPORT_FUNC(grub_dl_load_core_noinit) (void *addr, grub_size_t size);
+ int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);
+-extern int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
+-extern int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
+-extern int EXPORT_FUNC(grub_dl_ref_count) (grub_dl_t mod);
++extern grub_uint64_t EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
++extern grub_uint64_t EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
++extern grub_uint64_t EXPORT_FUNC(grub_dl_ref_count) (grub_dl_t mod);
+ 
+ extern grub_dl_t EXPORT_VAR(grub_dl_head);
+ 
+diff --git a/util/misc.c b/util/misc.c
+index d545212d9..0f928e5b4 100644
+--- a/util/misc.c
++++ b/util/misc.c
+@@ -190,14 +190,14 @@ grub_xputs_real (const char *str)
+ 
+ void (*grub_xputs) (const char *str) = grub_xputs_real;
+ 
+-int
++grub_uint64_t
+ grub_dl_ref (grub_dl_t mod)
+ {
+   (void) mod;
+   return 0;
+ }
+ 
+-int
++grub_uint64_t
+ grub_dl_unref (grub_dl_t mod)
+ {
+   (void) mod;
diff --git a/0323-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch b/0323-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch
new file mode 100644
index 00000000..213ef199
--- /dev/null
+++ b/0323-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Tue, 11 Feb 2025 17:01:26 -0600
+Subject: [PATCH] kern/dl: Check for the SHF_INFO_LINK flag in 
+ grub_dl_relocate_symbols()
+
+The grub_dl_relocate_symbols() iterates through the sections in
+an ELF looking for relocation sections. According to the spec [1]
+the SHF_INFO_LINK flag should be set if the sh_info field is meant
+to be a section index.
+
+[1] https://refspecs.linuxbase.org/elf/gabi4+/ch4.sheader.html
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/dl.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index fe7c3b940..cb49bdc4b 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -681,6 +681,9 @@ grub_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
+ 	grub_dl_segment_t seg;
+ 	grub_err_t err;
+ 
++  if (!(s->sh_flags & SHF_INFO_LINK))
++    continue;
++
+ 	seg = grub_dl_find_segment(mod, s->sh_info);
+         if (!seg)
+ 	  continue;
diff --git a/0324-commands-extcmd-Missing-check-for-failed-allocation.patch b/0324-commands-extcmd-Missing-check-for-failed-allocation.patch
new file mode 100644
index 00000000..44e8c915
--- /dev/null
+++ b/0324-commands-extcmd-Missing-check-for-failed-allocation.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Fri, 22 Nov 2024 06:27:55 +0000
+Subject: [PATCH] commands/extcmd: Missing check for failed allocation
+
+The grub_extcmd_dispatcher() calls grub_arg_list_alloc() to allocate
+a grub_arg_list struct but it does not verify the allocation was successful.
+In case of failed allocation the NULL state pointer can be accessed in
+parse_option() through grub_arg_parse() which may lead to a security issue.
+
+Fixes: CVE-2024-45775
+
+Reported-by: Nils Langius <nils@langius.de>
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Reviewed-by: Alec Brown <alec.r.brown@oracle.com>
+---
+ grub-core/commands/extcmd.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/grub-core/commands/extcmd.c b/grub-core/commands/extcmd.c
+index 90a5ca24a..c236be13a 100644
+--- a/grub-core/commands/extcmd.c
++++ b/grub-core/commands/extcmd.c
+@@ -49,6 +49,9 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
+     }
+ 
+   state = grub_arg_list_alloc (ext, argc, args);
++  if (state == NULL)
++    return grub_errno;
++
+   if (grub_arg_parse (ext, argc, args, state, &new_args, &new_argc))
+     {
+       context.state = state;
diff --git a/0325-commands-ls-Fix-NULL-dereference.patch b/0325-commands-ls-Fix-NULL-dereference.patch
new file mode 100644
index 00000000..c58177b7
--- /dev/null
+++ b/0325-commands-ls-Fix-NULL-dereference.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Sun, 12 May 2024 11:08:23 +0100
+Subject: [PATCH] commands/ls: Fix NULL dereference
+
+The grub_strrchr() may return NULL when the dirname do not contain "/".
+This can happen on broken filesystems.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/ls.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
+index 6a1c7f5d3..f660946a2 100644
+--- a/grub-core/commands/ls.c
++++ b/grub-core/commands/ls.c
+@@ -241,7 +241,11 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
+ 
+ 	  grub_file_close (file);
+ 
+-	  p = grub_strrchr (dirname, '/') + 1;
++	  p = grub_strrchr (dirname, '/');
++	  if (p == NULL)
++	    goto fail;
++	  ++p;
++
+ 	  ctx.dirname = grub_strndup (dirname, p - dirname);
+ 	  if (ctx.dirname == NULL)
+ 	    goto fail;
diff --git a/0326-commands-pgp-Unregister-the-check_signatures-hooks-o.patch b/0326-commands-pgp-Unregister-the-check_signatures-hooks-o.patch
new file mode 100644
index 00000000..8305f909
--- /dev/null
+++ b/0326-commands-pgp-Unregister-the-check_signatures-hooks-o.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Fri, 1 Nov 2024 19:24:29 +0000
+Subject: [PATCH] commands/pgp: Unregister the "check_signatures" hooks on
+ module unload
+
+If the hooks are not removed they can be called after the module has
+been unloaded leading to an use-after-free.
+
+Fixes: CVE-2025-0622
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/pgp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
+index 847a5046a..fa3ef5c75 100644
+--- a/grub-core/commands/pgp.c
++++ b/grub-core/commands/pgp.c
+@@ -982,6 +982,8 @@ GRUB_MOD_INIT(pgp)
+ 
+ GRUB_MOD_FINI(pgp)
+ {
++  grub_register_variable_hook ("check_signatures", NULL, NULL);
++  grub_env_unset ("check_signatures");
+   grub_verifier_unregister (&grub_pubkey_verifier);
+   grub_unregister_extcmd (cmd);
+   grub_unregister_extcmd (cmd_trust);
diff --git a/0327-normal-Remove-variables-hooks-on-module-unload.patch b/0327-normal-Remove-variables-hooks-on-module-unload.patch
new file mode 100644
index 00000000..d730194a
--- /dev/null
+++ b/0327-normal-Remove-variables-hooks-on-module-unload.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Fri, 1 Nov 2024 23:46:55 +0000
+Subject: [PATCH] normal: Remove variables hooks on module unload
+
+The normal module does not entirely cleanup after itself in
+its GRUB_MOD_FINI() leaving a few variables hooks in place.
+It is not possible to unload normal module now but fix the
+issues for completeness.
+
+On the occasion replace 0s with NULLs for "pager" variable
+hooks unregister.
+
+Fixes: CVE-2025-0622
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/normal/main.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index cad840e06..dd20e5129 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -690,7 +690,9 @@ GRUB_MOD_FINI(normal)
+   grub_xputs = grub_xputs_saved;
+ 
+   grub_set_history (0);
+-  grub_register_variable_hook ("pager", 0, 0);
++  grub_register_variable_hook ("pager", NULL, NULL);
++  grub_register_variable_hook ("color_normal", NULL, NULL);
++  grub_register_variable_hook ("color_highlight", NULL, NULL);
+   grub_fs_autoload_hook = 0;
+   grub_unregister_command (cmd_clear);
+ }
diff --git a/0328-gettext-Remove-variables-hooks-on-module-unload.patch b/0328-gettext-Remove-variables-hooks-on-module-unload.patch
new file mode 100644
index 00000000..9cc952ee
--- /dev/null
+++ b/0328-gettext-Remove-variables-hooks-on-module-unload.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Fri, 1 Nov 2024 23:52:06 +0000
+Subject: [PATCH] gettext: Remove variables hooks on module unload
+
+The gettext module does not entirely cleanup after itself in
+its GRUB_MOD_FINI() leaving a few variables hooks in place.
+It is not possible to unload gettext module because normal
+module depends on it. Though fix the issues for completeness.
+
+Fixes: CVE-2025-0622
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/gettext/gettext.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
+index 631af7a94..465143cb6 100644
+--- a/grub-core/gettext/gettext.c
++++ b/grub-core/gettext/gettext.c
+@@ -542,6 +542,10 @@ GRUB_MOD_INIT (gettext)
+ 
+ GRUB_MOD_FINI (gettext)
+ {
++  grub_register_variable_hook ("locale_dir", NULL, NULL);
++  grub_register_variable_hook ("secondary_locale_dir", NULL, NULL);
++  grub_register_variable_hook ("lang", NULL, NULL);
++
+   grub_gettext_delete_list (&main_context);
+   grub_gettext_delete_list (&secondary_context);
+ 
diff --git a/0329-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch b/0329-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch
new file mode 100644
index 00000000..d8db5c15
--- /dev/null
+++ b/0329-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Fri, 22 Nov 2024 06:27:56 +0000
+Subject: [PATCH] gettext: Integer overflow leads to heap OOB write or read
+
+Calculation of ctx->grub_gettext_msg_list size in grub_mofile_open() may
+overflow leading to subsequent OOB write or read. This patch fixes the
+issue by replacing grub_zalloc() and explicit multiplication with
+grub_calloc() which does the same thing in safe manner.
+
+Fixes: CVE-2024-45776
+
+Reported-by: Nils Langius <nils@langius.de>
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Reviewed-by: Alec Brown <alec.r.brown@oracle.com>
+---
+ grub-core/gettext/gettext.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
+index 465143cb6..c17040269 100644
+--- a/grub-core/gettext/gettext.c
++++ b/grub-core/gettext/gettext.c
+@@ -323,8 +323,8 @@ grub_mofile_open (struct grub_gettext_context *ctx,
+   for (ctx->grub_gettext_max_log = 0; ctx->grub_gettext_max >> ctx->grub_gettext_max_log;
+        ctx->grub_gettext_max_log++);
+ 
+-  ctx->grub_gettext_msg_list = grub_zalloc (ctx->grub_gettext_max
+-					    * sizeof (ctx->grub_gettext_msg_list[0]));
++  ctx->grub_gettext_msg_list = grub_calloc (ctx->grub_gettext_max,
++					    sizeof (ctx->grub_gettext_msg_list[0]));
+   if (!ctx->grub_gettext_msg_list)
+     {
+       grub_file_close (fd);
diff --git a/0330-gettext-Integer-overflow-leads-to-heap-OOB-write.patch b/0330-gettext-Integer-overflow-leads-to-heap-OOB-write.patch
new file mode 100644
index 00000000..5b22d585
--- /dev/null
+++ b/0330-gettext-Integer-overflow-leads-to-heap-OOB-write.patch
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Fri, 22 Nov 2024 06:27:57 +0000
+Subject: [PATCH] gettext: Integer overflow leads to heap OOB write
+
+The size calculation of the translation buffer in
+grub_gettext_getstr_from_position() may overflow
+to 0 leading to heap OOB write. This patch fixes
+the issue by using grub_add() and checking for
+an overflow.
+
+Fixes: CVE-2024-45777
+
+Reported-by: Nils Langius <nils@langius.de>
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Reviewed-by: Alec Brown <alec.r.brown@oracle.com>
+---
+ grub-core/gettext/gettext.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
+index c17040269..fffe3a054 100644
+--- a/grub-core/gettext/gettext.c
++++ b/grub-core/gettext/gettext.c
+@@ -26,6 +26,7 @@
+ #include <grub/file.h>
+ #include <grub/kernel.h>
+ #include <grub/i18n.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -99,6 +100,7 @@ grub_gettext_getstr_from_position (struct grub_gettext_context *ctx,
+   char *translation;
+   struct string_descriptor desc;
+   grub_err_t err;
++  grub_size_t alloc_sz;
+ 
+   internal_position = (off + position * sizeof (desc));
+ 
+@@ -109,7 +111,10 @@ grub_gettext_getstr_from_position (struct grub_gettext_context *ctx,
+   length = grub_cpu_to_le32 (desc.length);
+   offset = grub_cpu_to_le32 (desc.offset);
+ 
+-  translation = grub_malloc (length + 1);
++  if (grub_add (length, 1, &alloc_sz))
++    return NULL;
++
++  translation = grub_malloc (alloc_sz);
+   if (!translation)
+     return NULL;
+ 
diff --git a/0331-commands-read-Fix-an-integer-overflow-when-supplying.patch b/0331-commands-read-Fix-an-integer-overflow-when-supplying.patch
new file mode 100644
index 00000000..33ea08dd
--- /dev/null
+++ b/0331-commands-read-Fix-an-integer-overflow-when-supplying.patch
@@ -0,0 +1,69 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jonathan Bar Or <jonathanbaror@gmail.com>
+Date: Thu, 23 Jan 2025 19:17:05 +0100
+Subject: [PATCH] commands/read: Fix an integer overflow when supplying more
+ than 2^31 characters
+
+The grub_getline() function currently has a signed integer variable "i"
+that can be overflown when user supplies more than 2^31 characters.
+It results in a memory corruption of the allocated line buffer as well
+as supplying large negative values to grub_realloc().
+
+Fixes: CVE-2025-0690
+
+Reported-by: Jonathan Bar Or <jonathanbaror@gmail.com>
+Signed-off-by: Jonathan Bar Or <jonathanbaror@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/read.c | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/commands/read.c b/grub-core/commands/read.c
+index 597c90706..8d72e45c9 100644
+--- a/grub-core/commands/read.c
++++ b/grub-core/commands/read.c
+@@ -25,6 +25,7 @@
+ #include <grub/types.h>
+ #include <grub/extcmd.h>
+ #include <grub/i18n.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -37,13 +38,14 @@ static const struct grub_arg_option options[] =
+ static char *
+ grub_getline (int silent)
+ {
+-  int i;
++  grub_size_t i;
+   char *line;
+   char *tmp;
+   int c;
++  grub_size_t alloc_size;
+ 
+   i = 0;
+-  line = grub_malloc (1 + i + sizeof('\0'));
++  line = grub_malloc (1 + sizeof('\0'));
+   if (! line)
+     return NULL;
+ 
+@@ -59,8 +61,17 @@ grub_getline (int silent)
+       line[i] = (char) c;
+       if (!silent)
+ 	grub_printf ("%c", c);
+-      i++;
+-      tmp = grub_realloc (line, 1 + i + sizeof('\0'));
++      if (grub_add (i, 1, &i))
++        {
++          grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
++          return NULL;
++        }
++      if (grub_add (i, 1 + sizeof('\0'), &alloc_size))
++        {
++          grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
++          return NULL;
++        }
++      tmp = grub_realloc (line, alloc_size);
+       if (! tmp)
+ 	{
+ 	  grub_free (line);
diff --git a/0332-commands-test-Stack-overflow-due-to-unlimited-recurs.patch b/0332-commands-test-Stack-overflow-due-to-unlimited-recurs.patch
new file mode 100644
index 00000000..3dc101b1
--- /dev/null
+++ b/0332-commands-test-Stack-overflow-due-to-unlimited-recurs.patch
@@ -0,0 +1,83 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Mon, 16 Dec 2024 20:22:41 +0000
+Subject: [PATCH] commands/test: Stack overflow due to unlimited recursion
+ depth
+
+The test_parse() evaluates test expression recursively. Due to lack of
+recursion depth check a specially crafted expression may cause a stack
+overflow. The recursion is only triggered by the parentheses usage and
+it can be unlimited. However, sensible expressions are unlikely to
+contain more than a few parentheses. So, this patch limits the recursion
+depth to 100, which should be sufficient.
+
+Reported-by: Nils Langius <nils@langius.de>
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/test.c | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/commands/test.c b/grub-core/commands/test.c
+index 62d3fb398..b585c3d70 100644
+--- a/grub-core/commands/test.c
++++ b/grub-core/commands/test.c
+@@ -29,6 +29,9 @@
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
++/* Set a limit on recursion to avoid stack overflow. */
++#define MAX_TEST_RECURSION_DEPTH	100
++
+ /* A simple implementation for signed numbers. */
+ static int
+ grub_strtosl (char *arg, const char ** const end, int base)
+@@ -150,7 +153,7 @@ get_fileinfo (char *path, struct test_parse_ctx *ctx)
+ 
+ /* Parse a test expression starting from *argn. */
+ static int
+-test_parse (char **args, int *argn, int argc)
++test_parse (char **args, int *argn, int argc, int *depth)
+ {
+   struct test_parse_ctx ctx = {
+     .and = 1,
+@@ -387,13 +390,24 @@ test_parse (char **args, int *argn, int argc)
+       if (grub_strcmp (args[*argn], ")") == 0)
+ 	{
+ 	  (*argn)++;
++	  if (*depth > 0)
++	    (*depth)--;
++
+ 	  return ctx.or || ctx.and;
+ 	}
+       /* Recursively invoke if parenthesis. */
+       if (grub_strcmp (args[*argn], "(") == 0)
+ 	{
+ 	  (*argn)++;
+-	  update_val (test_parse (args, argn, argc), &ctx);
++
++	  if (++(*depth) > MAX_TEST_RECURSION_DEPTH)
++	    {
++	      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("max recursion depth exceeded"));
++	      depth--;
++	      return ctx.or || ctx.and;
++	    }
++
++	  update_val (test_parse (args, argn, argc, depth), &ctx);
+ 	  continue;
+ 	}
+ 
+@@ -428,11 +442,12 @@ grub_cmd_test (grub_command_t cmd __attribute__ ((unused)),
+ 	       int argc, char **args)
+ {
+   int argn = 0;
++  int depth = 0;
+ 
+   if (argc >= 1 && grub_strcmp (args[argc - 1], "]") == 0)
+     argc--;
+ 
+-  return test_parse (args, &argn, argc) ? GRUB_ERR_NONE
++  return test_parse (args, &argn, argc, &depth) ? GRUB_ERR_NONE
+     : grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
+ }
+ 
diff --git a/0333-commands-minicmd-Block-the-dump-command-in-lockdown-.patch b/0333-commands-minicmd-Block-the-dump-command-in-lockdown-.patch
new file mode 100644
index 00000000..a9991461
--- /dev/null
+++ b/0333-commands-minicmd-Block-the-dump-command-in-lockdown-.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Thu, 18 Apr 2024 20:29:39 +0100
+Subject: [PATCH] commands/minicmd: Block the dump command in lockdown mode
+
+The dump enables a user to read memory which should not be possible
+in lockdown mode.
+
+Fixes: CVE-2025-1118
+
+Reported-by: B Horn <b@horn.uk>
+Reported-by: Jonathan Bar Or <jonathanbaror@gmail.com>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/minicmd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
+index 2001043cf..9efb7718c 100644
+--- a/grub-core/commands/minicmd.c
++++ b/grub-core/commands/minicmd.c
+@@ -215,8 +215,8 @@ GRUB_MOD_INIT(minicmd)
+     grub_register_command ("help", grub_mini_cmd_help,
+ 			   0, N_("Show this message."));
+   cmd_dump =
+-    grub_register_command ("dump", grub_mini_cmd_dump,
+-			   N_("ADDR [SIZE]"), N_("Show memory contents."));
++    grub_register_command_lockdown ("dump", grub_mini_cmd_dump,
++				    N_("ADDR [SIZE]"), N_("Show memory contents."));
+   cmd_rmmod =
+     grub_register_command ("rmmod", grub_mini_cmd_rmmod,
+ 			   N_("MODULE"), N_("Remove a module."));
diff --git a/0334-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch b/0334-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch
new file mode 100644
index 00000000..e787d6f7
--- /dev/null
+++ b/0334-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Tue, 11 Feb 2025 17:12:29 -0600
+Subject: [PATCH] commands/memrw: Disable memory reading in lockdown mode
+
+With the rest of module being blocked in lockdown mode it does not make
+a lot of sense to leave memory reading enabled. This also goes in par
+with disabling the dump command.
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/memrw.c | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
+index 39cf3a06d..9d8a54a4b 100644
+--- a/grub-core/commands/memrw.c
++++ b/grub-core/commands/memrw.c
+@@ -126,17 +126,20 @@ GRUB_MOD_INIT(memrw)
+     return;
+ 
+   cmd_read_byte =
+-    grub_register_extcmd ("read_byte", grub_cmd_read, 0,
+-			  N_("ADDR"), N_("Read 8-bit value from ADDR."),
+-			  options);
++    grub_register_extcmd_lockdown ("read_byte", grub_cmd_read, 0,
++                                   N_("ADDR"),
++                                   N_("Read 8-bit value from ADDR."),
++                                   options);
+   cmd_read_word =
+-    grub_register_extcmd ("read_word", grub_cmd_read, 0,
+-			  N_("ADDR"), N_("Read 16-bit value from ADDR."),
+-			  options);
++    grub_register_extcmd_lockdown ("read_word", grub_cmd_read, 0,
++                                   N_("ADDR"),
++                                   N_("Read 16-bit value from ADDR."),
++                                   options);
+   cmd_read_dword =
+-    grub_register_extcmd ("read_dword", grub_cmd_read, 0,
+-			  N_("ADDR"), N_("Read 32-bit value from ADDR."),
+-			  options);
++    grub_register_extcmd_lockdown ("read_dword", grub_cmd_read, 0,
++                                   N_("ADDR"),
++                                   N_("Read 32-bit value from ADDR."),
++                                   options);
+   cmd_write_byte =
+     grub_register_command_lockdown ("write_byte", grub_cmd_write,
+                                     N_("ADDR VALUE [MASK]"),
diff --git a/0335-commands-hexdump-Disable-memory-reading-in-lockdown-.patch b/0335-commands-hexdump-Disable-memory-reading-in-lockdown-.patch
new file mode 100644
index 00000000..ae523f80
--- /dev/null
+++ b/0335-commands-hexdump-Disable-memory-reading-in-lockdown-.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: B Horn <b@horn.uk>
+Date: Fri, 19 Apr 2024 22:31:45 +0100
+Subject: [PATCH] commands/hexdump: Disable memory reading in lockdown mode
+
+Reported-by: B Horn <b@horn.uk>
+Signed-off-by: B Horn <b@horn.uk>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/hexdump.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/hexdump.c b/grub-core/commands/hexdump.c
+index eaa12465b..d6f61d98a 100644
+--- a/grub-core/commands/hexdump.c
++++ b/grub-core/commands/hexdump.c
+@@ -24,6 +24,7 @@
+ #include <grub/lib/hexdump.h>
+ #include <grub/extcmd.h>
+ #include <grub/i18n.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -51,7 +52,11 @@ grub_cmd_hexdump (grub_extcmd_context_t ctxt, int argc, char **args)
+   length = (state[1].set) ? grub_strtoul (state[1].arg, 0, 0) : 256;
+ 
+   if (!grub_strcmp (args[0], "(mem)"))
+-    hexdump (skip, (char *) (grub_addr_t) skip, length);
++    {
++      if (grub_is_lockdown() == GRUB_LOCKDOWN_ENABLED)
++        return grub_error (GRUB_ERR_ACCESS_DENIED, N_("memory reading is disabled in lockdown mode"));
++      hexdump (skip, (char *) (grub_addr_t) skip, length);
++    }
+   else if ((args[0][0] == '(') && (args[0][namelen - 1] == ')'))
+     {
+       grub_disk_t disk;
diff --git a/0336-fs-bfs-Disable-under-lockdown.patch b/0336-fs-bfs-Disable-under-lockdown.patch
new file mode 100644
index 00000000..c8364628
--- /dev/null
+++ b/0336-fs-bfs-Disable-under-lockdown.patch
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens <dja@axtens.net>
+Date: Sat, 23 Mar 2024 15:59:43 +1100
+Subject: [PATCH] fs/bfs: Disable under lockdown
+
+The BFS is not fuzz-clean. Don't allow it to be loaded under lockdown.
+This will also disable the AFS.
+
+Fixes: CVE-2024-45778
+Fixes: CVE-2024-45779
+
+Reported-by: Nils Langius <nils@langius.de>
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/bfs.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/fs/bfs.c b/grub-core/fs/bfs.c
+index f37b16895..c92fd7916 100644
+--- a/grub-core/fs/bfs.c
++++ b/grub-core/fs/bfs.c
+@@ -30,6 +30,7 @@
+ #include <grub/types.h>
+ #include <grub/i18n.h>
+ #include <grub/fshelp.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -1106,8 +1107,11 @@ GRUB_MOD_INIT (bfs)
+ {
+   COMPILE_TIME_ASSERT (1 << LOG_EXTENT_SIZE ==
+ 		       sizeof (struct grub_bfs_extent));
+-  grub_bfs_fs.mod = mod;
+-  grub_fs_register (&grub_bfs_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_bfs_fs.mod = mod;
++      grub_fs_register (&grub_bfs_fs);
++    }
+ }
+ 
+ #ifdef MODE_AFS
+@@ -1116,5 +1120,6 @@ GRUB_MOD_FINI (afs)
+ GRUB_MOD_FINI (bfs)
+ #endif
+ {
+-  grub_fs_unregister (&grub_bfs_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_bfs_fs);
+ }
diff --git a/0337-fs-Disable-many-filesystems-under-lockdown.patch b/0337-fs-Disable-many-filesystems-under-lockdown.patch
new file mode 100644
index 00000000..edd6c407
--- /dev/null
+++ b/0337-fs-Disable-many-filesystems-under-lockdown.patch
@@ -0,0 +1,391 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens <dja@axtens.net>
+Date: Sat, 23 Mar 2024 16:20:45 +1100
+Subject: [PATCH] fs: Disable many filesystems under lockdown
+
+The idea is to permit the following: btrfs, cpio, exfat, ext, f2fs, fat,
+hfsplus, iso9660, squash4, tar, xfs and zfs.
+
+The JFS, ReiserFS, romfs, UDF and UFS security vulnerabilities were
+reported by Jonathan Bar Or <jonathanbaror@gmail.com>.
+
+Fixes: CVE-2025-0677
+Fixes: CVE-2025-0684
+Fixes: CVE-2025-0685
+Fixes: CVE-2025-0686
+Fixes: CVE-2025-0689
+
+Suggested-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/affs.c     | 11 ++++++++---
+ grub-core/fs/cbfs.c     | 11 ++++++++---
+ grub-core/fs/jfs.c      | 11 ++++++++---
+ grub-core/fs/minix.c    | 11 ++++++++---
+ grub-core/fs/nilfs2.c   | 11 ++++++++---
+ grub-core/fs/ntfs.c     | 11 ++++++++---
+ grub-core/fs/reiserfs.c | 11 ++++++++---
+ grub-core/fs/romfs.c    | 11 ++++++++---
+ grub-core/fs/sfs.c      | 11 ++++++++---
+ grub-core/fs/udf.c      | 11 ++++++++---
+ grub-core/fs/ufs.c      | 11 ++++++++---
+ 11 files changed, 88 insertions(+), 33 deletions(-)
+
+diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c
+index 9b0afb954..520a001c7 100644
+--- a/grub-core/fs/affs.c
++++ b/grub-core/fs/affs.c
+@@ -26,6 +26,7 @@
+ #include <grub/types.h>
+ #include <grub/fshelp.h>
+ #include <grub/charset.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -703,12 +704,16 @@ static struct grub_fs grub_affs_fs =
+ 
+ GRUB_MOD_INIT(affs)
+ {
+-  grub_affs_fs.mod = mod;
+-  grub_fs_register (&grub_affs_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_affs_fs.mod = mod;
++      grub_fs_register (&grub_affs_fs);
++    }
+   my_mod = mod;
+ }
+ 
+ GRUB_MOD_FINI(affs)
+ {
+-  grub_fs_unregister (&grub_affs_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_affs_fs);
+ }
+diff --git a/grub-core/fs/cbfs.c b/grub-core/fs/cbfs.c
+index 2332745fe..b62c8777c 100644
+--- a/grub-core/fs/cbfs.c
++++ b/grub-core/fs/cbfs.c
+@@ -26,6 +26,7 @@
+ #include <grub/dl.h>
+ #include <grub/i18n.h>
+ #include <grub/cbfs_core.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -390,13 +391,17 @@ GRUB_MOD_INIT (cbfs)
+ #if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) && !defined (GRUB_MACHINE_XEN)
+   init_cbfsdisk ();
+ #endif
+-  grub_cbfs_fs.mod = mod;
+-  grub_fs_register (&grub_cbfs_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_cbfs_fs.mod = mod;
++      grub_fs_register (&grub_cbfs_fs);
++    }
+ }
+ 
+ GRUB_MOD_FINI (cbfs)
+ {
+-  grub_fs_unregister (&grub_cbfs_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_cbfs_fs);
+ #if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) && !defined (GRUB_MACHINE_XEN)
+   fini_cbfsdisk ();
+ #endif
+diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
+index b0283ac00..ab175c7f1 100644
+--- a/grub-core/fs/jfs.c
++++ b/grub-core/fs/jfs.c
+@@ -26,6 +26,7 @@
+ #include <grub/types.h>
+ #include <grub/charset.h>
+ #include <grub/i18n.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -1005,12 +1006,16 @@ static struct grub_fs grub_jfs_fs =
+ 
+ GRUB_MOD_INIT(jfs)
+ {
+-  grub_jfs_fs.mod = mod;
+-  grub_fs_register (&grub_jfs_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_jfs_fs.mod = mod;
++      grub_fs_register (&grub_jfs_fs);
++    }
+   my_mod = mod;
+ }
+ 
+ GRUB_MOD_FINI(jfs)
+ {
+-  grub_fs_unregister (&grub_jfs_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_jfs_fs);
+ }
+diff --git a/grub-core/fs/minix.c b/grub-core/fs/minix.c
+index b7679c3e2..4440fcca8 100644
+--- a/grub-core/fs/minix.c
++++ b/grub-core/fs/minix.c
+@@ -25,6 +25,7 @@
+ #include <grub/dl.h>
+ #include <grub/types.h>
+ #include <grub/i18n.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -734,8 +735,11 @@ GRUB_MOD_INIT(minix)
+ #endif
+ #endif
+ {
+-  grub_minix_fs.mod = mod;
+-  grub_fs_register (&grub_minix_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_minix_fs.mod = mod;
++      grub_fs_register (&grub_minix_fs);
++    }
+   my_mod = mod;
+ }
+ 
+@@ -757,5 +761,6 @@ GRUB_MOD_FINI(minix)
+ #endif
+ #endif
+ {
+-  grub_fs_unregister (&grub_minix_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_minix_fs);
+ }
+diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c
+index 4e1e71738..26e6077ff 100644
+--- a/grub-core/fs/nilfs2.c
++++ b/grub-core/fs/nilfs2.c
+@@ -34,6 +34,7 @@
+ #include <grub/dl.h>
+ #include <grub/types.h>
+ #include <grub/fshelp.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -1231,12 +1232,16 @@ GRUB_MOD_INIT (nilfs2)
+ 				  grub_nilfs2_dat_entry));
+   COMPILE_TIME_ASSERT (1 << LOG_INODE_SIZE
+ 		       == sizeof (struct grub_nilfs2_inode));
+-  grub_nilfs2_fs.mod = mod;
+-  grub_fs_register (&grub_nilfs2_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_nilfs2_fs.mod = mod;
++      grub_fs_register (&grub_nilfs2_fs);
++    }
+   my_mod = mod;
+ }
+ 
+ GRUB_MOD_FINI (nilfs2)
+ {
+-  grub_fs_unregister (&grub_nilfs2_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_nilfs2_fs);
+ }
+diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
+index 4e144cc3c..e00349b1d 100644
+--- a/grub-core/fs/ntfs.c
++++ b/grub-core/fs/ntfs.c
+@@ -27,6 +27,7 @@
+ #include <grub/fshelp.h>
+ #include <grub/ntfs.h>
+ #include <grub/charset.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -1541,12 +1542,16 @@ static struct grub_fs grub_ntfs_fs =
+ 
+ GRUB_MOD_INIT (ntfs)
+ {
+-  grub_ntfs_fs.mod = mod;
+-  grub_fs_register (&grub_ntfs_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_ntfs_fs.mod = mod;
++      grub_fs_register (&grub_ntfs_fs);
++    }
+   my_mod = mod;
+ }
+ 
+ GRUB_MOD_FINI (ntfs)
+ {
+-  grub_fs_unregister (&grub_ntfs_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_ntfs_fs);
+ }
+diff --git a/grub-core/fs/reiserfs.c b/grub-core/fs/reiserfs.c
+index e8b0b6383..ca47e0a43 100644
+--- a/grub-core/fs/reiserfs.c
++++ b/grub-core/fs/reiserfs.c
+@@ -39,6 +39,7 @@
+ #include <grub/types.h>
+ #include <grub/fshelp.h>
+ #include <grub/i18n.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -1407,12 +1408,16 @@ static struct grub_fs grub_reiserfs_fs =
+ 
+ GRUB_MOD_INIT(reiserfs)
+ {
+-  grub_reiserfs_fs.mod = mod;
+-  grub_fs_register (&grub_reiserfs_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_reiserfs_fs.mod = mod;
++      grub_fs_register (&grub_reiserfs_fs);
++    }
+   my_mod = mod;
+ }
+ 
+ GRUB_MOD_FINI(reiserfs)
+ {
+-  grub_fs_unregister (&grub_reiserfs_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_reiserfs_fs);
+ }
+diff --git a/grub-core/fs/romfs.c b/grub-core/fs/romfs.c
+index 56b0b2b2f..eafab03b2 100644
+--- a/grub-core/fs/romfs.c
++++ b/grub-core/fs/romfs.c
+@@ -23,6 +23,7 @@
+ #include <grub/disk.h>
+ #include <grub/fs.h>
+ #include <grub/fshelp.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -475,11 +476,15 @@ static struct grub_fs grub_romfs_fs =
+ 
+ GRUB_MOD_INIT(romfs)
+ {
+-  grub_romfs_fs.mod = mod;
+-  grub_fs_register (&grub_romfs_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_romfs_fs.mod = mod;
++      grub_fs_register (&grub_romfs_fs);
++    }
+ }
+ 
+ GRUB_MOD_FINI(romfs)
+ {
+-  grub_fs_unregister (&grub_romfs_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_romfs_fs);
+ }
+diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
+index f0d7cac43..88705b3a2 100644
+--- a/grub-core/fs/sfs.c
++++ b/grub-core/fs/sfs.c
+@@ -26,6 +26,7 @@
+ #include <grub/types.h>
+ #include <grub/fshelp.h>
+ #include <grub/charset.h>
++#include <grub/lockdown.h>
+ #include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+@@ -779,12 +780,16 @@ static struct grub_fs grub_sfs_fs =
+ 
+ GRUB_MOD_INIT(sfs)
+ {
+-  grub_sfs_fs.mod = mod;
+-  grub_fs_register (&grub_sfs_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_sfs_fs.mod = mod;
++      grub_fs_register (&grub_sfs_fs);
++    }
+   my_mod = mod;
+ }
+ 
+ GRUB_MOD_FINI(sfs)
+ {
+-  grub_fs_unregister (&grub_sfs_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_sfs_fs);
+ }
+diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
+index 8765c633c..3d5ee5af5 100644
+--- a/grub-core/fs/udf.c
++++ b/grub-core/fs/udf.c
+@@ -27,6 +27,7 @@
+ #include <grub/fshelp.h>
+ #include <grub/charset.h>
+ #include <grub/datetime.h>
++#include <grub/lockdown.h>
+ #include <grub/udf.h>
+ #include <grub/safemath.h>
+ 
+@@ -1455,12 +1456,16 @@ static struct grub_fs grub_udf_fs = {
+ 
+ GRUB_MOD_INIT (udf)
+ {
+-  grub_udf_fs.mod = mod;
+-  grub_fs_register (&grub_udf_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_udf_fs.mod = mod;
++      grub_fs_register (&grub_udf_fs);
++    }
+   my_mod = mod;
+ }
+ 
+ GRUB_MOD_FINI (udf)
+ {
+-  grub_fs_unregister (&grub_udf_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_udf_fs);
+ }
+diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c
+index e82d9356d..8b5adbd48 100644
+--- a/grub-core/fs/ufs.c
++++ b/grub-core/fs/ufs.c
+@@ -25,6 +25,7 @@
+ #include <grub/dl.h>
+ #include <grub/types.h>
+ #include <grub/i18n.h>
++#include <grub/lockdown.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -899,8 +900,11 @@ GRUB_MOD_INIT(ufs1)
+ #endif
+ #endif
+ {
+-  grub_ufs_fs.mod = mod;
+-  grub_fs_register (&grub_ufs_fs);
++  if (!grub_is_lockdown ())
++    {
++      grub_ufs_fs.mod = mod;
++      grub_fs_register (&grub_ufs_fs);
++    }
+   my_mod = mod;
+ }
+ 
+@@ -914,6 +918,7 @@ GRUB_MOD_FINI(ufs1)
+ #endif
+ #endif
+ {
+-  grub_fs_unregister (&grub_ufs_fs);
++  if (!grub_is_lockdown ())
++    grub_fs_unregister (&grub_ufs_fs);
+ }
+ 
diff --git a/0338-disk-Use-safe-math-macros-to-prevent-overflows.patch b/0338-disk-Use-safe-math-macros-to-prevent-overflows.patch
new file mode 100644
index 00000000..db3d9371
--- /dev/null
+++ b/0338-disk-Use-safe-math-macros-to-prevent-overflows.patch
@@ -0,0 +1,543 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Tue, 11 Feb 2025 17:59:04 -0600
+Subject: [PATCH] disk: Use safe math macros to prevent overflows
+
+Replace direct arithmetic operations with macros from include/grub/safemath.h
+to prevent potential overflow issues when calculating the memory sizes.
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/disk/cryptodisk.c      | 36 ++++++++++++++++++------
+ grub-core/disk/diskfilter.c      |  9 ++++--
+ grub-core/disk/ieee1275/obdisk.c | 43 ++++++++++++++++++++++++----
+ grub-core/disk/ieee1275/ofdisk.c | 60 ++++++++++++++++++++++++++++++++++------
+ grub-core/disk/ldm.c             | 36 ++++++++++++++++++++----
+ grub-core/disk/luks2.c           |  7 ++++-
+ grub-core/disk/memdisk.c         |  7 ++++-
+ grub-core/disk/plainmount.c      |  9 ++++--
+ 8 files changed, 172 insertions(+), 35 deletions(-)
+
+diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
+index 06a42b2d7..872776010 100644
+--- a/grub-core/disk/cryptodisk.c
++++ b/grub-core/disk/cryptodisk.c
+@@ -26,6 +26,7 @@
+ #include <grub/file.h>
+ #include <grub/procfs.h>
+ #include <grub/partition.h>
++#include <grub/safemath.h>
+ 
+ #ifdef GRUB_UTIL
+ #include <grub/emu/hostdisk.h>
+@@ -1475,7 +1476,7 @@ static char *
+ luks_script_get (grub_size_t *sz)
+ {
+   grub_cryptodisk_t i;
+-  grub_size_t size = 0;
++  grub_size_t size = 0, mul;
+   char *ptr, *ret;
+ 
+   *sz = 0;
+@@ -1484,10 +1485,6 @@ luks_script_get (grub_size_t *sz)
+     if (grub_strcmp (i->modname, "luks") == 0 ||
+ 	grub_strcmp (i->modname, "luks2") == 0)
+       {
+-	size += grub_strlen (i->modname);
+-	size += sizeof ("_mount");
+-	size += grub_strlen (i->uuid);
+-	size += grub_strlen (i->cipher->cipher->name);
+ 	/*
+ 	 * Add space in the line for (in order) spaces, cipher mode, cipher IV
+ 	 * mode, sector offset, sector size and the trailing newline. This is
+@@ -1495,14 +1492,35 @@ luks_script_get (grub_size_t *sz)
+ 	 * in an earlier version of this code that are unaccounted for. It is
+ 	 * left in the calculations in case it is needed. At worst, its short-
+ 	 * lived wasted space.
++	 *
++	 * 60 = 5 + 5 + 8 + 20 + 6 + 1 + 15
+ 	 */
+-	size += 5 + 5 + 8 + 20 + 6 + 1 + 15;
++	if (grub_add (size, grub_strlen (i->modname), &size) ||
++	    grub_add (size, sizeof ("_mount") + 60, &size) ||
++	    grub_add (size, grub_strlen (i->uuid), &size) ||
++	    grub_add (size, grub_strlen (i->cipher->cipher->name), &size) ||
++	    grub_mul (i->keysize, 2, &mul) ||
++	    grub_add (size, mul, &size))
++	  {
++	    grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while obtaining size of luks script");
++	    return 0;
++	  }
+ 	if (i->essiv_hash)
+-	  size += grub_strlen (i->essiv_hash->name);
+-	size += i->keysize * 2;
++	  {
++	    if (grub_add (size, grub_strlen (i->essiv_hash->name), &size))
++	      {
++		grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while obtaining size of luks script");
++		return 0;
++	      }
++	  }
+       }
++  if (grub_add (size, 1, &size))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while obtaining size of luks script");
++      return 0;
++    }
+ 
+-  ret = grub_malloc (size + 1);
++  ret = grub_malloc (size);
+   if (!ret)
+     return 0;
+ 
+diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
+index c35ce8915..fef0b815a 100644
+--- a/grub-core/disk/diskfilter.c
++++ b/grub-core/disk/diskfilter.c
+@@ -24,6 +24,7 @@
+ #include <grub/misc.h>
+ #include <grub/diskfilter.h>
+ #include <grub/partition.h>
++#include <grub/safemath.h>
+ #ifdef GRUB_UTIL
+ #include <grub/i18n.h>
+ #include <grub/util/misc.h>
+@@ -1041,7 +1042,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
+ {
+   struct grub_diskfilter_vg *array;
+   int i;
+-  grub_size_t j;
++  grub_size_t j, sz;
+   grub_uint64_t totsize;
+   struct grub_diskfilter_pv *pv;
+   grub_err_t err;
+@@ -1142,7 +1143,11 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
+     }
+   array->lvs->vg = array;
+ 
+-  array->lvs->idname = grub_malloc (sizeof ("mduuid/") + 2 * uuidlen);
++  if (grub_mul (uuidlen, 2, &sz) ||
++      grub_add (sz, sizeof ("mduuid/"), &sz))
++    goto fail;
++
++  array->lvs->idname = grub_malloc (sz);
+   if (!array->lvs->idname)
+     goto fail;
+ 
+diff --git a/grub-core/disk/ieee1275/obdisk.c b/grub-core/disk/ieee1275/obdisk.c
+index cd923b90f..9d4c42665 100644
+--- a/grub-core/disk/ieee1275/obdisk.c
++++ b/grub-core/disk/ieee1275/obdisk.c
+@@ -26,6 +26,7 @@
+ #include <grub/mm.h>
+ #include <grub/scsicmd.h>
+ #include <grub/time.h>
++#include <grub/safemath.h>
+ #include <grub/ieee1275/ieee1275.h>
+ #include <grub/ieee1275/obdisk.h>
+ 
+@@ -128,9 +129,17 @@ count_commas (const char *src)
+ static char *
+ decode_grub_devname (const char *name)
+ {
+-  char *devpath = grub_malloc (grub_strlen (name) + 1);
++  char *devpath;
+   char *p, c;
++  grub_size_t sz;
+ 
++  if (grub_add (grub_strlen (name), 1, &sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining size of device name"));
++      return NULL;
++    }
++
++  devpath = grub_malloc (sz);
+   if (devpath == NULL)
+     return NULL;
+ 
+@@ -156,12 +165,20 @@ static char *
+ encode_grub_devname (const char *path)
+ {
+   char *encoding, *optr;
++  grub_size_t sz;
+ 
+   if (path == NULL)
+     return NULL;
+ 
+-  encoding = grub_malloc (sizeof (IEEE1275_DEV) + count_commas (path) +
+-                          grub_strlen (path) + 1);
++  if (grub_add (sizeof (IEEE1275_DEV) + 1, count_commas (path), &sz) ||
++      grub_add (sz, grub_strlen (path), &sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining encoding size"));
++      grub_print_error ();
++      return NULL;
++    }
++
++  encoding = grub_malloc (sz);
+ 
+   if (encoding == NULL)
+     {
+@@ -396,6 +413,14 @@ canonicalise_disk (const char *devname)
+ 
+       real_unit_str_len = grub_strlen (op->name) + sizeof (IEEE1275_DISK_ALIAS)
+                           + grub_strlen (real_unit_address);
++      if (grub_add (grub_strlen (op->name), sizeof (IEEE1275_DISK_ALIAS), &real_unit_str_len) ||
++	  grub_add (real_unit_str_len, grub_strlen (real_unit_address), &real_unit_str_len))
++	{
++	  grub_free (parent);
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining size of canonical name"));
++	  grub_print_error ();
++	  return NULL;
++	}
+ 
+       real_canon = grub_malloc (real_unit_str_len);
+ 
+@@ -413,6 +438,7 @@ canonicalise_disk (const char *devname)
+ static struct disk_dev *
+ add_canon_disk (const char *cname)
+ {
++  grub_size_t sz;
+   struct disk_dev *dev;
+ 
+   dev = grub_zalloc (sizeof (struct disk_dev));
+@@ -428,13 +454,18 @@ add_canon_disk (const char *cname)
+        * arguments and allows a client program to open
+        * the entire (raw) disk. Any disk label is ignored.
+        */
+-      dev->raw_name = grub_malloc (grub_strlen (cname) + sizeof (":nolabel"));
++      if (grub_add (grub_strlen (cname), sizeof (":nolabel"), &sz))
++	{
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while appending :nolabel to end of canonical name");
++	  goto failed;
++	}
++
++      dev->raw_name = grub_malloc (sz);
+ 
+       if (dev->raw_name == NULL)
+         goto failed;
+ 
+-      grub_snprintf (dev->raw_name, grub_strlen (cname) + sizeof (":nolabel"),
+-                     "%s:nolabel", cname);
++      grub_snprintf (dev->raw_name, sz, "%s:nolabel", cname);
+     }
+ 
+   /*
+diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
+index 57624fde5..6c628635f 100644
+--- a/grub-core/disk/ieee1275/ofdisk.c
++++ b/grub-core/disk/ieee1275/ofdisk.c
+@@ -25,6 +25,7 @@
+ #include <grub/i18n.h>
+ #include <grub/time.h>
+ #include <grub/env.h>
++#include <grub/safemath.h>
+ 
+ static char *last_devpath;
+ static grub_ieee1275_ihandle_t last_ihandle;
+@@ -81,6 +82,7 @@ ofdisk_hash_add_real (char *devpath)
+   struct ofdisk_hash_ent **head = &ofdisk_hash[ofdisk_hash_fn(devpath)];
+   const char *iptr;
+   char *optr;
++  grub_size_t sz;
+ 
+   p = grub_zalloc (sizeof (*p));
+   if (!p)
+@@ -88,8 +90,14 @@ ofdisk_hash_add_real (char *devpath)
+ 
+   p->devpath = devpath;
+ 
+-  p->grub_devpath = grub_malloc (sizeof ("ieee1275/")
+-				 + 2 * grub_strlen (p->devpath));
++  if (grub_mul (grub_strlen (p->devpath), 2, &sz) ||
++      grub_add (sz, sizeof ("ieee1275/"), &sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining size of device path"));
++      return NULL;
++    }
++
++  p->grub_devpath = grub_malloc (sz);
+ 
+   if (!p->grub_devpath)
+     {
+@@ -99,7 +107,13 @@ ofdisk_hash_add_real (char *devpath)
+ 
+   if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
+     {
+-      p->open_path = grub_malloc (grub_strlen (p->devpath) + 3);
++      if (grub_add (grub_strlen (p->devpath), 3, &sz))
++	{
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining size of an open path"));
++	  return NULL;
++	}
++
++      p->open_path = grub_malloc (sz);
+       if (!p->open_path)
+ 	{
+ 	  grub_free (p->grub_devpath);
+@@ -225,7 +239,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
+       args;
+       char *buf, *bufptr;
+       unsigned i;
+-
++      grub_size_t sz;
+ 
+       RETRY_IEEE1275_OFDISK_OPEN(alias->path, &ihandle)
+       if (! ihandle)
+@@ -246,7 +260,14 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
+ 	  return;
+ 	}
+ 
+-      buf = grub_malloc (grub_strlen (alias->path) + 32);
++      if (grub_add (grub_strlen (alias->path), 32, &sz))
++	{
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while creating buffer for vscsi");
++	  grub_ieee1275_close (ihandle);
++	  return;
++	}
++
++      buf = grub_malloc (sz);
+       if (!buf)
+ 	return;
+       bufptr = grub_stpcpy (buf, alias->path);
+@@ -290,9 +311,15 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
+       grub_uint64_t *table;
+       grub_uint16_t table_size;
+       grub_ieee1275_ihandle_t ihandle;
++      grub_size_t sz;
+ 
+-      buf = grub_malloc (grub_strlen (alias->path) +
+-                         sizeof ("/disk@7766554433221100"));
++      if (grub_add (grub_strlen (alias->path), sizeof ("/disk@7766554433221100"), &sz))
++	{
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while creating buffer for sas_ioa");
++	  return;
++	}
++
++      buf = grub_malloc (sz);
+       if (!buf)
+         return;
+       bufptr = grub_stpcpy (buf, alias->path);
+@@ -432,9 +459,17 @@ grub_ofdisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
+ static char *
+ compute_dev_path (const char *name)
+ {
+-  char *devpath = grub_malloc (grub_strlen (name) + 3);
++  char *devpath;
+   char *p, c;
++  grub_size_t sz;
+ 
++  if (grub_add (grub_strlen (name), 3, &sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining size of device path"));
++      return NULL;
++    }
++
++  devpath = grub_malloc (sz);
+   if (!devpath)
+     return NULL;
+ 
+@@ -657,6 +692,7 @@ insert_bootpath (void)
+   char *bootpath;
+   grub_ssize_t bootpath_size;
+   char *type;
++  grub_size_t sz;
+ 
+   if (grub_ieee1275_get_property_length (grub_ieee1275_chosen, "bootpath",
+ 					 &bootpath_size)
+@@ -667,7 +703,13 @@ insert_bootpath (void)
+       return;
+     }
+ 
+-  bootpath = (char *) grub_malloc ((grub_size_t) bootpath_size + 64);
++  if (grub_add (bootpath_size, 64, &sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining bootpath size"));
++      return;
++    }
++
++  bootpath = (char *) grub_malloc (sz);
+   if (! bootpath)
+     {
+       grub_print_error ();
+diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
+index 34bfe6bd1..4101b15d8 100644
+--- a/grub-core/disk/ldm.c
++++ b/grub-core/disk/ldm.c
+@@ -220,6 +220,7 @@ make_vg (grub_disk_t disk,
+       struct grub_ldm_vblk vblk[GRUB_DISK_SECTOR_SIZE
+ 				/ sizeof (struct grub_ldm_vblk)];
+       unsigned i;
++      grub_size_t sz;
+       err = grub_disk_read (disk, cursec, 0,
+ 			    sizeof(vblk), &vblk);
+       if (err)
+@@ -251,7 +252,13 @@ make_vg (grub_disk_t disk,
+ 	      grub_free (pv);
+ 	      goto fail2;
+ 	    }
+-	  pv->internal_id = grub_malloc (ptr[0] + 2);
++	  if (grub_add (ptr[0], 2, &sz))
++	    {
++	      grub_free (pv);
++	      goto fail2;
++	    }
++
++	  pv->internal_id = grub_malloc (sz);
+ 	  if (!pv->internal_id)
+ 	    {
+ 	      grub_free (pv);
+@@ -276,7 +283,15 @@ make_vg (grub_disk_t disk,
+ 	      goto fail2;
+ 	    }
+ 	  pv->id.uuidlen = *ptr;
+-	  pv->id.uuid = grub_malloc (pv->id.uuidlen + 1);
++
++	  if (grub_add (pv->id.uuidlen, 1, &sz))
++	    {
++	      grub_free (pv->internal_id);
++	      grub_free (pv);
++	      goto fail2;
++	    }
++
++	  pv->id.uuid = grub_malloc (sz);
+ 	  grub_memcpy (pv->id.uuid, ptr + 1, pv->id.uuidlen);
+ 	  pv->id.uuid[pv->id.uuidlen] = 0;
+ 
+@@ -343,7 +358,13 @@ make_vg (grub_disk_t disk,
+ 	      grub_free (lv);
+ 	      goto fail2;
+ 	    }
+-	  lv->internal_id = grub_malloc ((grub_size_t) ptr[0] + 2);
++	  if (grub_add (ptr[0], 2, &sz))
++	    {
++	      grub_free (lv->segments);
++	      grub_free (lv);
++	      goto fail2;
++	    }
++	  lv->internal_id = grub_malloc (sz);
+ 	  if (!lv->internal_id)
+ 	    {
+ 	      grub_free (lv);
+@@ -455,6 +476,7 @@ make_vg (grub_disk_t disk,
+       struct grub_ldm_vblk vblk[GRUB_DISK_SECTOR_SIZE
+ 				/ sizeof (struct grub_ldm_vblk)];
+       unsigned i;
++      grub_size_t sz;
+       err = grub_disk_read (disk, cursec, 0,
+ 			    sizeof(vblk), &vblk);
+       if (err)
+@@ -490,7 +512,12 @@ make_vg (grub_disk_t disk,
+ 	      grub_free (comp);
+ 	      goto fail2;
+ 	    }
+-	  comp->internal_id = grub_malloc ((grub_size_t) ptr[0] + 2);
++	  if (grub_add (ptr[0], 2, &sz))
++	    {
++	      grub_free (comp);
++	      goto fail2;
++	    }
++	  comp->internal_id = grub_malloc (sz);
+ 	  if (!comp->internal_id)
+ 	    {
+ 	      grub_free (comp);
+@@ -640,7 +667,6 @@ make_vg (grub_disk_t disk,
+ 	  if (lv->segments->node_alloc == lv->segments->node_count)
+ 	    {
+ 	      void *t;
+-	      grub_size_t sz;
+ 
+ 	      if (grub_mul (lv->segments->node_alloc, 2, &lv->segments->node_alloc) ||
+ 		  grub_mul (lv->segments->node_alloc, sizeof (*lv->segments->nodes), &sz))
+diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
+index d5106402f..8036d76ff 100644
+--- a/grub-core/disk/luks2.c
++++ b/grub-core/disk/luks2.c
+@@ -26,6 +26,7 @@
+ #include <grub/crypto.h>
+ #include <grub/partition.h>
+ #include <grub/i18n.h>
++#include <grub/safemath.h>
+ 
+ #include <base64.h>
+ #include <json.h>
+@@ -569,6 +570,7 @@ luks2_recover_key (grub_disk_t source,
+   gcry_err_code_t gcry_ret;
+   grub_json_t *json = NULL, keyslots;
+   grub_err_t ret;
++  grub_size_t sz;
+ 
+   if (cargs->key_data == NULL || cargs->key_len == 0)
+     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no key data");
+@@ -577,7 +579,10 @@ luks2_recover_key (grub_disk_t source,
+   if (ret)
+     return ret;
+ 
+-  json_header = grub_zalloc (grub_be_to_cpu64 (header.hdr_size) - sizeof (header));
++  if (grub_sub (grub_be_to_cpu64 (header.hdr_size), sizeof (header), &sz))
++    return grub_error (GRUB_ERR_OUT_OF_RANGE, "underflow detected while calculating json header size");
++
++  json_header = grub_zalloc (sz);
+   if (!json_header)
+       return GRUB_ERR_OUT_OF_MEMORY;
+ 
+diff --git a/grub-core/disk/memdisk.c b/grub-core/disk/memdisk.c
+index 613779cf3..36de3bfab 100644
+--- a/grub-core/disk/memdisk.c
++++ b/grub-core/disk/memdisk.c
+@@ -23,6 +23,7 @@
+ #include <grub/misc.h>
+ #include <grub/mm.h>
+ #include <grub/types.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -96,7 +97,11 @@ GRUB_MOD_INIT(memdisk)
+ 
+ 	grub_dprintf ("memdisk", "Found memdisk image at %p\n", memdisk_orig_addr);
+ 
+-	memdisk_size = header->size - sizeof (struct grub_module_header);
++	if (grub_sub (header->size, sizeof (struct grub_module_header), &memdisk_size))
++	  {
++	    grub_error (GRUB_ERR_OUT_OF_RANGE, "underflow detected while obtaining memdisk size");
++	    return;
++	  }
+ 	memdisk_addr = grub_malloc (memdisk_size);
+ 
+ 	grub_dprintf ("memdisk", "Copying memdisk image to dynamic memory\n");
+diff --git a/grub-core/disk/plainmount.c b/grub-core/disk/plainmount.c
+index 47e64805f..21ec4072c 100644
+--- a/grub-core/disk/plainmount.c
++++ b/grub-core/disk/plainmount.c
+@@ -24,6 +24,7 @@
+ #include <grub/extcmd.h>
+ #include <grub/partition.h>
+ #include <grub/file.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -126,7 +127,7 @@ plainmount_configure_password (grub_cryptodisk_t dev, const char *hash,
+   grub_uint8_t *derived_hash, *dh;
+   char *p;
+   unsigned int round, i, len, size;
+-  grub_size_t alloc_size;
++  grub_size_t alloc_size, sz;
+   grub_err_t err = GRUB_ERR_NONE;
+ 
+   /* Support none (plain) hash */
+@@ -145,7 +146,11 @@ plainmount_configure_password (grub_cryptodisk_t dev, const char *hash,
+    * Allocate buffer for the password and for an added prefix character
+    * for each hash round ('alloc_size' may not be a multiple of 'len').
+    */
+-  p = grub_zalloc (alloc_size + (alloc_size / len) + 1);
++  if (grub_add (alloc_size, (alloc_size / len), &sz) ||
++      grub_add (sz, 1, &sz))
++    return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while allocating size of password buffer"));
++
++  p = grub_zalloc (sz);
+   derived_hash = grub_zalloc (GRUB_CRYPTODISK_MAX_KEYLEN * 2);
+   if (p == NULL || derived_hash == NULL)
+     {
diff --git a/0339-disk-Prevent-overflows-when-allocating-memory-for-ar.patch b/0339-disk-Prevent-overflows-when-allocating-memory-for-ar.patch
new file mode 100644
index 00000000..15a916f2
--- /dev/null
+++ b/0339-disk-Prevent-overflows-when-allocating-memory-for-ar.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Wed, 12 Feb 2025 10:26:44 -0600
+Subject: [PATCH] disk: Prevent overflows when allocating memory for  arrays
+
+Use grub_calloc() when allocating memory for arrays to ensure proper
+overflow checks are in place.
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/disk/lvm.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
+index 794248540..a395b200d 100644
+--- a/grub-core/disk/lvm.c
++++ b/grub-core/disk/lvm.c
+@@ -671,8 +671,7 @@ grub_lvm_detect (grub_disk_t disk,
+ 			  goto lvs_segment_fail;
+ 			}
+ 
+-		      seg->nodes = grub_zalloc (sizeof (seg->nodes[0])
+-						* seg->node_count);
++		      seg->nodes = grub_calloc (seg->node_count, sizeof (seg->nodes[0]));
+ 
+ 		      p = grub_strstr (p, "mirrors = [");
+ 		      if (p == NULL)
+@@ -760,8 +759,7 @@ grub_lvm_detect (grub_disk_t disk,
+ 			    }
+ 			}
+ 
+-		      seg->nodes = grub_zalloc (sizeof (seg->nodes[0])
+-						* seg->node_count);
++		      seg->nodes = grub_calloc (seg->node_count, sizeof (seg->nodes[0]));
+ 
+ 		      p = grub_strstr (p, "raids = [");
+ 		      if (p == NULL)
diff --git a/0340-disk-Check-if-returned-pointer-for-allocated-memory-.patch b/0340-disk-Check-if-returned-pointer-for-allocated-memory-.patch
new file mode 100644
index 00000000..efb631e9
--- /dev/null
+++ b/0340-disk-Check-if-returned-pointer-for-allocated-memory-.patch
@@ -0,0 +1,152 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Wed, 22 Jan 2025 02:55:11 +0000
+Subject: [PATCH] disk: Check if returned pointer for allocated memory is NULL
+
+When using grub_malloc(), grub_zalloc() or grub_calloc(), these functions can
+fail if we are out of memory. After allocating memory we should check if these
+functions returned NULL and handle this error if they did.
+
+On the occasion make a NULL check in ATA code more obvious.
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/disk/ata.c             |  4 ++--
+ grub-core/disk/ieee1275/obdisk.c |  6 ++++++
+ grub-core/disk/ldm.c             |  6 ++++++
+ grub-core/disk/lvm.c             | 14 ++++++++++++++
+ grub-core/disk/memdisk.c         |  2 ++
+ 5 files changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/disk/ata.c b/grub-core/disk/ata.c
+index 7b6ac7bfc..a2433e29e 100644
+--- a/grub-core/disk/ata.c
++++ b/grub-core/disk/ata.c
+@@ -112,10 +112,10 @@ grub_ata_identify (struct grub_ata *dev)
+     return grub_atapi_identify (dev);
+ 
+   info64 = grub_malloc (GRUB_DISK_SECTOR_SIZE);
++  if (info64 == NULL)
++    return grub_errno;
+   info32 = (grub_uint32_t *) info64;
+   info16 = (grub_uint16_t *) info64;
+-  if (! info16)
+-    return grub_errno;
+ 
+   grub_memset (&parms, 0, sizeof (parms));
+   parms.buffer = info16;
+diff --git a/grub-core/disk/ieee1275/obdisk.c b/grub-core/disk/ieee1275/obdisk.c
+index 9d4c42665..fcc39e0a2 100644
+--- a/grub-core/disk/ieee1275/obdisk.c
++++ b/grub-core/disk/ieee1275/obdisk.c
+@@ -423,6 +423,12 @@ canonicalise_disk (const char *devname)
+ 	}
+ 
+       real_canon = grub_malloc (real_unit_str_len);
++      if (real_canon == NULL)
++	{
++	  grub_free (parent);
++	  grub_print_error ();
++	  return NULL;
++	}
+ 
+       grub_snprintf (real_canon, real_unit_str_len, "%s/disk@%s",
+                      op->name, real_unit_address);
+diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
+index 4101b15d8..048e29cd0 100644
+--- a/grub-core/disk/ldm.c
++++ b/grub-core/disk/ldm.c
+@@ -292,6 +292,12 @@ make_vg (grub_disk_t disk,
+ 	    }
+ 
+ 	  pv->id.uuid = grub_malloc (sz);
++	  if (pv->id.uuid == NULL)
++	    {
++	      grub_free (pv->internal_id);
++	      grub_free (pv);
++	      goto fail2;
++	    }
+ 	  grub_memcpy (pv->id.uuid, ptr + 1, pv->id.uuidlen);
+ 	  pv->id.uuid[pv->id.uuidlen] = 0;
+ 
+diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
+index a395b200d..b2dff76d1 100644
+--- a/grub-core/disk/lvm.c
++++ b/grub-core/disk/lvm.c
+@@ -370,6 +370,8 @@ grub_lvm_detect (grub_disk_t disk,
+ 		break;
+ 
+ 	      pv = grub_zalloc (sizeof (*pv));
++	      if (pv == NULL)
++		goto fail4;
+ 	      q = p;
+ 	      while (*q != ' ' && q < mda_end)
+ 		q++;
+@@ -379,6 +381,8 @@ grub_lvm_detect (grub_disk_t disk,
+ 
+ 	      s = q - p;
+ 	      pv->name = grub_malloc (s + 1);
++	      if (pv->name == NULL)
++		goto pvs_fail_noname;
+ 	      grub_memcpy (pv->name, p, s);
+ 	      pv->name[s] = '\0';
+ 
+@@ -451,6 +455,8 @@ grub_lvm_detect (grub_disk_t disk,
+ 		break;
+ 
+ 	      lv = grub_zalloc (sizeof (*lv));
++	      if (lv == NULL)
++		goto fail4;
+ 
+ 	      q = p;
+ 	      while (*q != ' ' && q < mda_end)
+@@ -545,6 +551,8 @@ grub_lvm_detect (grub_disk_t disk,
+ 		  goto lvs_fail;
+ 		}
+ 	      lv->segments = grub_calloc (lv->segment_count, sizeof (*seg));
++	      if (lv->segments == NULL)
++		goto lvs_fail;
+ 	      seg = lv->segments;
+ 
+ 	      for (i = 0; i < lv->segment_count; i++)
+@@ -612,6 +620,8 @@ grub_lvm_detect (grub_disk_t disk,
+ 
+ 		      seg->nodes = grub_calloc (seg->node_count,
+ 						sizeof (*stripe));
++		      if (seg->nodes == NULL)
++			goto lvs_segment_fail;
+ 		      stripe = seg->nodes;
+ 
+ 		      p = grub_strstr (p, "stripes = [");
+@@ -672,6 +682,8 @@ grub_lvm_detect (grub_disk_t disk,
+ 			}
+ 
+ 		      seg->nodes = grub_calloc (seg->node_count, sizeof (seg->nodes[0]));
++		      if (seg->nodes == NULL)
++			goto lvs_segment_fail;
+ 
+ 		      p = grub_strstr (p, "mirrors = [");
+ 		      if (p == NULL)
+@@ -760,6 +772,8 @@ grub_lvm_detect (grub_disk_t disk,
+ 			}
+ 
+ 		      seg->nodes = grub_calloc (seg->node_count, sizeof (seg->nodes[0]));
++		      if (seg->nodes == NULL)
++			goto lvs_segment_fail;
+ 
+ 		      p = grub_strstr (p, "raids = [");
+ 		      if (p == NULL)
+diff --git a/grub-core/disk/memdisk.c b/grub-core/disk/memdisk.c
+index 36de3bfab..2d7afaea3 100644
+--- a/grub-core/disk/memdisk.c
++++ b/grub-core/disk/memdisk.c
+@@ -103,6 +103,8 @@ GRUB_MOD_INIT(memdisk)
+ 	    return;
+ 	  }
+ 	memdisk_addr = grub_malloc (memdisk_size);
++	if (memdisk_addr == NULL)
++	  return;
+ 
+ 	grub_dprintf ("memdisk", "Copying memdisk image to dynamic memory\n");
+ 	grub_memmove (memdisk_addr, memdisk_orig_addr, memdisk_size);
diff --git a/0341-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch b/0341-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch
new file mode 100644
index 00000000..2836631a
--- /dev/null
+++ b/0341-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Wed, 22 Jan 2025 02:55:12 +0000
+Subject: [PATCH] disk/ieee1275/ofdisk: Call grub_ieee1275_close() when
+ grub_malloc() fails
+
+In the dev_iterate() function a handle is opened but isn't closed when
+grub_malloc() returns NULL. We should fix this by closing it on error.
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/disk/ieee1275/ofdisk.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
+index 6c628635f..71237b256 100644
+--- a/grub-core/disk/ieee1275/ofdisk.c
++++ b/grub-core/disk/ieee1275/ofdisk.c
+@@ -269,7 +269,10 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
+ 
+       buf = grub_malloc (sz);
+       if (!buf)
+-	return;
++	{
++	  grub_ieee1275_close (ihandle);
++	  return;
++	}
+       bufptr = grub_stpcpy (buf, alias->path);
+ 
+       for (i = 0; i < args.nentries; i++)
diff --git a/0342-fs-Use-safe-math-macros-to-prevent-overflows.patch b/0342-fs-Use-safe-math-macros-to-prevent-overflows.patch
new file mode 100644
index 00000000..43eb12c7
--- /dev/null
+++ b/0342-fs-Use-safe-math-macros-to-prevent-overflows.patch
@@ -0,0 +1,353 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Wed, 12 Feb 2025 10:33:31 -0600
+Subject: [PATCH] fs: Use safe math macros to prevent overflows
+
+Replace direct arithmetic operations with macros from include/grub/safemath.h
+to prevent potential overflow issues when calculating the memory sizes.
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/archelp.c     |  9 ++++++++-
+ grub-core/fs/btrfs.c       | 34 ++++++++++++++++++++++++++++------
+ grub-core/fs/cpio_common.c | 16 ++++++++++++++--
+ grub-core/fs/f2fs.c        | 17 +++++++++++++++--
+ grub-core/fs/ntfscomp.c    |  9 ++++++++-
+ grub-core/fs/squash4.c     | 12 +++++++++---
+ grub-core/fs/xfs.c         | 17 +++++++++++++++--
+ 7 files changed, 97 insertions(+), 17 deletions(-)
+
+diff --git a/grub-core/fs/archelp.c b/grub-core/fs/archelp.c
+index c1dcc6285..0816b28de 100644
+--- a/grub-core/fs/archelp.c
++++ b/grub-core/fs/archelp.c
+@@ -21,6 +21,7 @@
+ #include <grub/fs.h>
+ #include <grub/disk.h>
+ #include <grub/dl.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -68,6 +69,7 @@ handle_symlink (struct grub_archelp_data *data,
+   char *rest;
+   char *linktarget;
+   grub_size_t linktarget_len;
++  grub_size_t sz;
+ 
+   *restart = 0;
+ 
+@@ -98,7 +100,12 @@ handle_symlink (struct grub_archelp_data *data,
+   if (linktarget[0] == '\0')
+     return GRUB_ERR_NONE;
+   linktarget_len = grub_strlen (linktarget);
+-  target = grub_malloc (linktarget_len + grub_strlen (*name) + 2);
++
++  if (grub_add (linktarget_len, grub_strlen (*name), &sz) ||
++      grub_add (sz, 2, &sz))
++    return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("link target length overflow"));
++
++  target = grub_malloc (sz);
+   if (!target)
+     return grub_errno;
+ 
+diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
+index 6593f5175..3e4924b65 100644
+--- a/grub-core/fs/btrfs.c
++++ b/grub-core/fs/btrfs.c
+@@ -2031,6 +2031,7 @@ find_path (struct grub_btrfs_data *data,
+   char *origpath = NULL;
+   unsigned symlinks_max = 32;
+   const char *relpath = grub_env_get ("btrfs_relative_path");
++  grub_size_t sz;
+ 
+   follow_default = 0;
+   origpath = grub_strdup (path);
+@@ -2157,9 +2158,15 @@ find_path (struct grub_btrfs_data *data,
+       struct grub_btrfs_dir_item *cdirel;
+       if (elemsize > allocated)
+ 	{
+-	  allocated = 2 * elemsize;
++	  if (grub_mul (2, elemsize, &allocated) ||
++	      grub_add (allocated, 1, &sz))
++	    {
++	      grub_free (path_alloc);
++	      grub_free (origpath);
++	      return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("directory item size overflow"));
++	    }
+ 	  grub_free (direl);
+-	  direl = grub_malloc (allocated + 1);
++	  direl = grub_malloc (sz);
+ 	  if (!direl)
+ 	    {
+ 	      grub_free (path_alloc);
+@@ -2223,8 +2230,16 @@ find_path (struct grub_btrfs_data *data,
+ 	      grub_free (origpath);
+ 	      return err;
+ 	    }
+-	  tmp = grub_malloc (grub_le_to_cpu64 (inode.size)
+-			     + grub_strlen (path) + 1);
++
++	  if (grub_add (grub_le_to_cpu64 (inode.size), grub_strlen (path), &sz) ||
++	      grub_add (sz, 1, &sz))
++	    {
++	      grub_free (direl);
++	      grub_free (path_alloc);
++	      grub_free (origpath);
++	      return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("buffer size overflow"));
++	    }
++	  tmp = grub_malloc (sz);
+ 	  if (!tmp)
+ 	    {
+ 	      grub_free (direl);
+@@ -2371,6 +2386,7 @@ grub_btrfs_dir (grub_device_t device, const char *path,
+   grub_uint8_t type;
+   grub_size_t est_size = 0;
+   char *new_path = NULL;
++  grub_size_t sz;
+ 
+   if (!data)
+     return grub_errno;
+@@ -2420,9 +2436,15 @@ grub_btrfs_dir (grub_device_t device, const char *path,
+ 	}
+       if (elemsize > allocated)
+ 	{
+-	  allocated = 2 * elemsize;
++	  if (grub_mul (2, elemsize, &allocated) ||
++	      grub_add (allocated, 1, &sz))
++	    {
++	      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("directory element size overflow"));
++	      r = -grub_errno;
++	      break;
++	    }
+ 	  grub_free (direl);
+-	  direl = grub_malloc (allocated + 1);
++	  direl = grub_malloc (sz);
+ 	  if (!direl)
+ 	    {
+ 	      r = -grub_errno;
+diff --git a/grub-core/fs/cpio_common.c b/grub-core/fs/cpio_common.c
+index 5d41b6fdb..6ba58b354 100644
+--- a/grub-core/fs/cpio_common.c
++++ b/grub-core/fs/cpio_common.c
+@@ -24,6 +24,7 @@
+ #include <grub/dl.h>
+ #include <grub/i18n.h>
+ #include <grub/archelp.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -48,6 +49,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+   struct head hd;
+   grub_size_t namesize;
+   grub_uint32_t modeval;
++  grub_size_t sz;
+ 
+   data->hofs = data->next_hofs;
+ 
+@@ -76,7 +78,10 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+ 
+   *mode = modeval;
+ 
+-  *name = grub_malloc (namesize + 1);
++  if (grub_add (namesize, 1, &sz))
++    return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("file name size overflow"));
++
++  *name = grub_malloc (sz);
+   if (*name == NULL)
+     return grub_errno;
+ 
+@@ -110,10 +115,17 @@ grub_cpio_get_link_target (struct grub_archelp_data *data)
+ {
+   char *ret;
+   grub_err_t err;
++  grub_size_t sz;
+ 
+   if (data->size == 0)
+     return grub_strdup ("");
+-  ret = grub_malloc (data->size + 1);
++
++  if (grub_add (data->size, 1, &sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("target data size overflow"));
++      return NULL;
++    }
++  ret = grub_malloc (sz);
+   if (!ret)
+     return NULL;
+ 
+diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c
+index f6d6beaa5..72b4aa1e6 100644
+--- a/grub-core/fs/f2fs.c
++++ b/grub-core/fs/f2fs.c
+@@ -28,6 +28,7 @@
+ #include <grub/types.h>
+ #include <grub/charset.h>
+ #include <grub/fshelp.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -958,6 +959,7 @@ grub_f2fs_read_symlink (grub_fshelp_node_t node)
+   char *symlink;
+   struct grub_fshelp_node *diro = node;
+   grub_uint64_t filesize;
++  grub_size_t sz;
+ 
+   if (!diro->inode_read)
+     {
+@@ -968,7 +970,12 @@ grub_f2fs_read_symlink (grub_fshelp_node_t node)
+ 
+   filesize = grub_f2fs_file_size(&diro->inode.i);
+ 
+-  symlink = grub_malloc (filesize + 1);
++  if (grub_add (filesize, 1, &sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("symlink size overflow"));
++      return 0;
++    }
++  symlink = grub_malloc (sz);
+   if (!symlink)
+     return 0;
+ 
+@@ -997,6 +1004,7 @@ grub_f2fs_check_dentries (struct grub_f2fs_dir_iter_ctx *ctx)
+       enum FILE_TYPE ftype;
+       int name_len;
+       int ret;
++      int sz;
+ 
+       if (grub_f2fs_test_bit_le (i, ctx->bitmap) == 0)
+         {
+@@ -1010,7 +1018,12 @@ grub_f2fs_check_dentries (struct grub_f2fs_dir_iter_ctx *ctx)
+       if (name_len >= F2FS_NAME_LEN)
+         return 0;
+ 
+-      filename = grub_malloc (name_len + 1);
++      if (grub_add (name_len, 1, &sz))
++	{
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, N_("directory entry name length overflow"));
++	  return 0;
++	}
++      filename = grub_malloc (sz);
+       if (!filename)
+         return 0;
+ 
+diff --git a/grub-core/fs/ntfscomp.c b/grub-core/fs/ntfscomp.c
+index a009f2c2d..f168a318e 100644
+--- a/grub-core/fs/ntfscomp.c
++++ b/grub-core/fs/ntfscomp.c
+@@ -22,6 +22,7 @@
+ #include <grub/disk.h>
+ #include <grub/dl.h>
+ #include <grub/ntfs.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -310,6 +311,7 @@ ntfscomp (grub_uint8_t *dest, grub_disk_addr_t ofs,
+ {
+   grub_err_t ret;
+   grub_disk_addr_t vcn;
++  int log_sz;
+ 
+   if (ctx->attr->sbuf)
+     {
+@@ -349,7 +351,12 @@ ntfscomp (grub_uint8_t *dest, grub_disk_addr_t ofs,
+     }
+ 
+   ctx->comp.comp_head = ctx->comp.comp_tail = 0;
+-  ctx->comp.cbuf = grub_malloc (1 << (ctx->comp.log_spc + GRUB_NTFS_BLK_SHR));
++  if (grub_add (ctx->comp.log_spc, GRUB_NTFS_BLK_SHR, &log_sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("compression buffer size overflow"));
++      return 0;
++    }
++  ctx->comp.cbuf = grub_malloc (1 << log_sz);
+   if (!ctx->comp.cbuf)
+     return 0;
+ 
+diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c
+index 6e9d63874..f91ff3bfa 100644
+--- a/grub-core/fs/squash4.c
++++ b/grub-core/fs/squash4.c
+@@ -460,11 +460,11 @@ grub_squash_read_symlink (grub_fshelp_node_t node)
+ {
+   char *ret;
+   grub_err_t err;
+-  grub_size_t sz;
++  grub_uint32_t sz;
+ 
+   if (grub_add (grub_le_to_cpu32 (node->ino.symlink.namelen), 1, &sz))
+     {
+-      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("symlink name length overflow"));
+       return NULL;
+     }
+ 
+@@ -580,6 +580,7 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir,
+ 	  struct grub_squash_dirent di;
+ 	  struct grub_squash_inode ino;
+ 	  grub_size_t sz;
++	  grub_uint16_t nlen;
+ 
+ 	  err = read_chunk (dir->data, &di, sizeof (di),
+ 			    grub_le_to_cpu64 (dir->data->sb.diroffset)
+@@ -595,7 +596,12 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir,
+ 	  if (err)
+ 	    return 0;
+ 
+-	  buf = grub_malloc (grub_le_to_cpu16 (di.namelen) + 2);
++	  if (grub_add (grub_le_to_cpu16 (di.namelen), 2, &nlen))
++	    {
++	      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("name length overflow"));
++	      return 0;
++	    }
++	  buf = grub_malloc (nlen);
+ 	  if (!buf)
+ 	    return 0;
+ 	  err = read_chunk (dir->data, buf,
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index 6c952aef1..c60db7361 100644
+--- a/grub-core/fs/xfs.c
++++ b/grub-core/fs/xfs.c
+@@ -718,6 +718,7 @@ static char *
+ grub_xfs_read_symlink (grub_fshelp_node_t node)
+ {
+   grub_ssize_t size = grub_be_to_cpu64 (node->inode.size);
++  grub_size_t sz;
+ 
+   if (size < 0)
+     {
+@@ -739,7 +740,12 @@ grub_xfs_read_symlink (grub_fshelp_node_t node)
+ 	if (node->data->hascrc)
+ 	  off = 56;
+ 
+-	symlink = grub_malloc (size + 1);
++	if (grub_add (size, 1, &sz))
++	  {
++	    grub_error (GRUB_ERR_OUT_OF_RANGE, N_("symlink size overflow"));
++	    return 0;
++	  }
++	symlink = grub_malloc (sz);
+ 	if (!symlink)
+ 	  return 0;
+ 
+@@ -789,8 +795,15 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename,
+ {
+   struct grub_fshelp_node *fdiro;
+   grub_err_t err;
++  grub_size_t sz;
+ 
+-  fdiro = grub_malloc (grub_xfs_fshelp_size(ctx->diro->data) + 1);
++  if (grub_add (grub_xfs_fshelp_size(ctx->diro->data), 1, &sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("directory data size overflow"));
++      grub_print_error ();
++      return 0;
++    }
++  fdiro = grub_malloc (sz);
+   if (!fdiro)
+     {
+       grub_print_error ();
diff --git a/0343-fs-Prevent-overflows-when-allocating-memory-for-arra.patch b/0343-fs-Prevent-overflows-when-allocating-memory-for-arra.patch
new file mode 100644
index 00000000..936c2f87
--- /dev/null
+++ b/0343-fs-Prevent-overflows-when-allocating-memory-for-arra.patch
@@ -0,0 +1,82 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Tue, 21 Jan 2025 19:02:37 +0000
+Subject: [PATCH] fs: Prevent overflows when allocating memory for arrays
+
+Use grub_calloc() when allocating memory for arrays to ensure proper
+overflow checks are in place.
+
+The HFS+ and squash4 security vulnerabilities were reported by
+Jonathan Bar Or <jonathanbaror@gmail.com>.
+
+Fixes: CVE-2025-0678
+Fixes: CVE-2025-1125
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/btrfs.c       | 4 ++--
+ grub-core/fs/hfspluscomp.c | 9 +++++++--
+ grub-core/fs/squash4.c     | 8 ++++----
+ 3 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
+index 3e4924b65..3228e1788 100644
+--- a/grub-core/fs/btrfs.c
++++ b/grub-core/fs/btrfs.c
+@@ -1409,8 +1409,8 @@ grub_btrfs_mount (grub_device_t dev)
+     }
+ 
+   data->n_devices_allocated = 16;
+-  data->devices_attached = grub_malloc (sizeof (data->devices_attached[0])
+-					* data->n_devices_allocated);
++  data->devices_attached = grub_calloc (data->n_devices_allocated,
++					sizeof (data->devices_attached[0]));
+   if (!data->devices_attached)
+     {
+       grub_free (data);
+diff --git a/grub-core/fs/hfspluscomp.c b/grub-core/fs/hfspluscomp.c
+index 48ae438d8..a80954ee6 100644
+--- a/grub-core/fs/hfspluscomp.c
++++ b/grub-core/fs/hfspluscomp.c
+@@ -244,14 +244,19 @@ hfsplus_open_compressed_real (struct grub_hfsplus_file *node)
+ 	  return 0;
+ 	}
+       node->compress_index_size = grub_le_to_cpu32 (index_size);
+-      node->compress_index = grub_malloc (node->compress_index_size
+-					  * sizeof (node->compress_index[0]));
++      node->compress_index = grub_calloc (node->compress_index_size,
++					  sizeof (node->compress_index[0]));
+       if (!node->compress_index)
+ 	{
+ 	  node->compressed = 0;
+ 	  grub_free (attr_node);
+ 	  return grub_errno;
+ 	}
++
++      /*
++       * The node->compress_index_size * sizeof (node->compress_index[0]) is safe here
++       * due to relevant checks done in grub_calloc() above.
++       */
+       if (grub_hfsplus_read_file (node, 0, 0,
+ 				  0x104 + sizeof (index_size),
+ 				  node->compress_index_size
+diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c
+index f91ff3bfa..cf2bca822 100644
+--- a/grub-core/fs/squash4.c
++++ b/grub-core/fs/squash4.c
+@@ -822,10 +822,10 @@ direct_read (struct grub_squash_data *data,
+ 	  break;
+ 	}
+       total_blocks = ((total_size + data->blksz - 1) >> data->log2_blksz);
+-      ino->block_sizes = grub_malloc (total_blocks
+-				      * sizeof (ino->block_sizes[0]));
+-      ino->cumulated_block_sizes = grub_malloc (total_blocks
+-						* sizeof (ino->cumulated_block_sizes[0]));
++      ino->block_sizes = grub_calloc (total_blocks,
++				      sizeof (ino->block_sizes[0]));
++      ino->cumulated_block_sizes = grub_calloc (total_blocks,
++						sizeof (ino->cumulated_block_sizes[0]));
+       if (!ino->block_sizes || !ino->cumulated_block_sizes)
+ 	{
+ 	  grub_free (ino->block_sizes);
diff --git a/0344-fs-Prevent-overflows-when-assigning-returned-values-.patch b/0344-fs-Prevent-overflows-when-assigning-returned-values-.patch
new file mode 100644
index 00000000..97f8098f
--- /dev/null
+++ b/0344-fs-Prevent-overflows-when-assigning-returned-values-.patch
@@ -0,0 +1,105 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Tue, 21 Jan 2025 19:02:38 +0000
+Subject: [PATCH] fs: Prevent overflows when assigning returned values from
+ read_number()
+
+The direct assignment of the unsigned long long value returned by
+read_number() can potentially lead to an overflow on a 32-bit systems.
+The fix replaces the direct assignments with calls to grub_cast()
+which detects the overflows and safely assigns the values if no
+overflow is detected.
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/cpio_common.c | 18 ++++++++++++++----
+ grub-core/fs/tar.c         | 23 ++++++++++++++++-------
+ 2 files changed, 30 insertions(+), 11 deletions(-)
+
+diff --git a/grub-core/fs/cpio_common.c b/grub-core/fs/cpio_common.c
+index 6ba58b354..45ac119a8 100644
+--- a/grub-core/fs/cpio_common.c
++++ b/grub-core/fs/cpio_common.c
+@@ -62,11 +62,21 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+ #endif
+       )
+     return grub_error (GRUB_ERR_BAD_FS, "invalid cpio archive");
+-  data->size = read_number (hd.filesize, ARRAY_SIZE (hd.filesize));
++
++  if (grub_cast (read_number (hd.filesize, ARRAY_SIZE (hd.filesize)), &data->size))
++    return grub_error (GRUB_ERR_BAD_FS, N_("data size overflow"));
++
+   if (mtime)
+-    *mtime = read_number (hd.mtime, ARRAY_SIZE (hd.mtime));
+-  modeval = read_number (hd.mode, ARRAY_SIZE (hd.mode));
+-  namesize = read_number (hd.namesize, ARRAY_SIZE (hd.namesize));
++    {
++      if (grub_cast (read_number (hd.mtime, ARRAY_SIZE (hd.mtime)), mtime))
++	return grub_error (GRUB_ERR_BAD_FS, N_("mtime overflow"));
++    }
++
++  if (grub_cast (read_number (hd.mode, ARRAY_SIZE (hd.mode)), &modeval))
++    return grub_error (GRUB_ERR_BAD_FS, N_("mode overflow"));
++
++  if (grub_cast (read_number (hd.namesize, ARRAY_SIZE (hd.namesize)), &namesize))
++    return grub_error (GRUB_ERR_BAD_FS, N_("namesize overflow"));
+ 
+   /* Don't allow negative numbers.  */
+   if (namesize >= 0x80000000)
+diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c
+index fd2ec1f74..1eaa5349f 100644
+--- a/grub-core/fs/tar.c
++++ b/grub-core/fs/tar.c
+@@ -99,9 +99,10 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+       if (hd.typeflag == 'L')
+ 	{
+ 	  grub_err_t err;
+-	  grub_size_t namesize = read_number (hd.size, sizeof (hd.size));
++	  grub_size_t namesize;
+ 
+-	  if (grub_add (namesize, 1, &sz))
++	  if (grub_cast (read_number (hd.size, sizeof (hd.size)), &namesize) ||
++	      grub_add (namesize, 1, &sz))
+ 	    return grub_error (GRUB_ERR_BAD_FS, N_("name size overflow"));
+ 
+ 	  *name = grub_malloc (sz);
+@@ -123,9 +124,10 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+       if (hd.typeflag == 'K')
+ 	{
+ 	  grub_err_t err;
+-	  grub_size_t linksize = read_number (hd.size, sizeof (hd.size));
++	  grub_size_t linksize;
+ 
+-	  if (grub_add (linksize, 1, &sz))
++	  if (grub_cast (read_number (hd.size, sizeof (hd.size)), &linksize) ||
++	      grub_add (linksize, 1, &sz))
+ 	    return grub_error (GRUB_ERR_BAD_FS, N_("link size overflow"));
+ 
+ 	  if (data->linkname_alloc < sz)
+@@ -174,15 +176,22 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
+ 	  (*name)[extra_size + sizeof (hd.name)] = 0;
+ 	}
+ 
+-      data->size = read_number (hd.size, sizeof (hd.size));
++      if (grub_cast (read_number (hd.size, sizeof (hd.size)), &data->size))
++	return grub_error (GRUB_ERR_BAD_FS, N_("data size overflow"));
++
+       data->dofs = data->hofs + GRUB_DISK_SECTOR_SIZE;
+       data->next_hofs = data->dofs + ((data->size + GRUB_DISK_SECTOR_SIZE - 1) &
+ 			   ~(GRUB_DISK_SECTOR_SIZE - 1));
+       if (mtime)
+-	*mtime = read_number (hd.mtime, sizeof (hd.mtime));
++	{
++	  if (grub_cast (read_number (hd.mtime, sizeof (hd.mtime)), mtime))
++	    return grub_error (GRUB_ERR_BAD_FS, N_("mtime overflow"));
++	}
+       if (mode)
+ 	{
+-	  *mode = read_number (hd.mode, sizeof (hd.mode));
++	  if (grub_cast (read_number (hd.mode, sizeof (hd.mode)), mode))
++	    return grub_error (GRUB_ERR_BAD_FS, N_("mode overflow"));
++
+ 	  switch (hd.typeflag)
+ 	    {
+ 	      /* Hardlink.  */
diff --git a/0345-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch b/0345-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch
new file mode 100644
index 00000000..427877de
--- /dev/null
+++ b/0345-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch
@@ -0,0 +1,138 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Wed, 22 Jan 2025 07:17:02 +0000
+Subject: [PATCH] fs/zfs: Use safe math macros to prevent overflows
+
+Replace direct arithmetic operations with macros from include/grub/safemath.h
+to prevent potential overflow issues when calculating the memory sizes.
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/zfs/zfs.c | 50 ++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 44 insertions(+), 6 deletions(-)
+
+diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
+index a497b1869..2f303d655 100644
+--- a/grub-core/fs/zfs/zfs.c
++++ b/grub-core/fs/zfs/zfs.c
+@@ -2387,6 +2387,7 @@ fzap_iterate (dnode_end_t * zap_dnode, zap_phys_t * zap,
+ 					    zap_dnode->endian) << DNODE_SHIFT);
+   grub_err_t err;
+   grub_zfs_endian_t endian;
++  grub_size_t sz;
+ 
+   if (zap_verify (zap, zap_dnode->endian))
+     return 0;
+@@ -2448,8 +2449,14 @@ fzap_iterate (dnode_end_t * zap_dnode, zap_phys_t * zap,
+ 	  if (le->le_type != ZAP_CHUNK_ENTRY)
+ 	    continue;
+ 
+-	  buf = grub_malloc (grub_zfs_to_cpu16 (le->le_name_length, endian)
+-			     * name_elem_length + 1);
++	  if (grub_mul (grub_zfs_to_cpu16 (le->le_name_length, endian), name_elem_length, &sz) ||
++	      grub_add (sz, 1, &sz))
++	    {
++	      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("buffer size overflow"));
++	      grub_free (l);
++	      return grub_errno;
++	    }
++	  buf = grub_malloc (sz);
+ 	  if (zap_leaf_array_get (l, endian, blksft,
+ 				  grub_zfs_to_cpu16 (le->le_name_chunk,
+ 						     endian),
+@@ -2872,6 +2879,7 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn,
+ 	  && ((grub_zfs_to_cpu64(((znode_phys_t *) DN_BONUS (&dnode_path->dn.dn))->zp_mode, dnode_path->dn.endian) >> 12) & 0xf) == 0xa)
+ 	{
+ 	  char *sym_value;
++	  grub_size_t sz;
+ 	  grub_size_t sym_sz;
+ 	  int free_symval = 0;
+ 	  char *oldpath = path, *oldpathbuf = path_buf;
+@@ -2923,7 +2931,18 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn,
+ 		  break;
+ 	      free_symval = 1;
+ 	    }
+-	  path = path_buf = grub_malloc (sym_sz + grub_strlen (oldpath) + 1);
++
++	  if (grub_add (sym_sz, grub_strlen (oldpath), &sz) ||
++	      grub_add (sz, 1, &sz))
++	    {
++	      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("path buffer size overflow"));
++	      grub_free (oldpathbuf);
++	      if (free_symval)
++		grub_free (sym_value);
++	      err = grub_errno;
++	      break;
++	    }
++	  path = path_buf = grub_malloc (sz);
+ 	  if (!path_buf)
+ 	    {
+ 	      grub_free (oldpathbuf);
+@@ -2960,6 +2979,7 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn,
+ 	{
+ 	  void *sahdrp;
+ 	  int hdrsize;
++	  grub_size_t sz;
+ 
+ 	  if (dnode_path->dn.dn.dn_bonuslen != 0)
+ 	    {
+@@ -2993,7 +3013,15 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn,
+ 							 + SA_SIZE_OFFSET),
+ 				   dnode_path->dn.endian);
+ 	      char *oldpath = path, *oldpathbuf = path_buf;
+-	      path = path_buf = grub_malloc (sym_sz + grub_strlen (oldpath) + 1);
++	      if (grub_add (sym_sz, grub_strlen (oldpath), &sz) ||
++		  grub_add (sz, 1, &sz))
++		{
++		  grub_error (GRUB_ERR_OUT_OF_RANGE, N_("path buffer size overflow"));
++		  grub_free (oldpathbuf);
++		  err = grub_errno;
++		  break;
++		}
++	      path = path_buf = grub_malloc (sz);
+ 	      if (!path_buf)
+ 		{
+ 		  grub_free (oldpathbuf);
+@@ -3568,6 +3596,7 @@ grub_zfs_nvlist_lookup_nvlist_array (const char *nvlist, const char *name,
+   unsigned i;
+   grub_size_t nelm;
+   int elemsize = 0;
++  int sz;
+ 
+   found = nvlist_find_value (nvlist, name, DATA_TYPE_NVLIST_ARRAY, &nvpair,
+ 			     &size, &nelm);
+@@ -3602,7 +3631,12 @@ grub_zfs_nvlist_lookup_nvlist_array (const char *nvlist, const char *name,
+       return 0;
+     }
+ 
+-  ret = grub_zalloc (elemsize + sizeof (grub_uint32_t));
++  if (grub_add (elemsize, sizeof (grub_uint32_t), &sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("elemsize overflow"));
++      return 0;
++    }
++  ret = grub_zalloc (sz);
+   if (!ret)
+     return 0;
+   grub_memcpy (ret, nvlist, sizeof (grub_uint32_t));
+@@ -4193,6 +4227,7 @@ iterate_zap_snap (const char *name, grub_uint64_t val,
+   struct grub_dirhook_info info;
+   char *name2;
+   int ret;
++  grub_size_t sz;
+ 
+   dnode_end_t mdn;
+ 
+@@ -4213,7 +4248,10 @@ iterate_zap_snap (const char *name, grub_uint64_t val,
+       return 0;
+     }
+ 
+-  name2 = grub_malloc (grub_strlen (name) + 2);
++  if (grub_add (grub_strlen (name), 2, &sz))
++    return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("name length overflow"));
++
++  name2 = grub_malloc (sz);
+   name2[0] = '@';
+   grub_memcpy (name2 + 1, name, grub_strlen (name) + 1);
+   ret = ctx->hook (name2, &info, ctx->hook_data);
diff --git a/0346-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch b/0346-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch
new file mode 100644
index 00000000..64c0e286
--- /dev/null
+++ b/0346-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Wed, 22 Jan 2025 07:17:03 +0000
+Subject: [PATCH] fs/zfs: Prevent overflows when allocating memory for arrays
+
+Use grub_calloc() when allocating memory for arrays to ensure proper
+overflow checks are in place.
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/zfs/zfs.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
+index 2f303d655..9ab7bf319 100644
+--- a/grub-core/fs/zfs/zfs.c
++++ b/grub-core/fs/zfs/zfs.c
+@@ -723,8 +723,8 @@ fill_vdev_info_real (struct grub_zfs_data *data,
+ 	{
+ 	  fill->n_children = nelm;
+ 
+-	  fill->children = grub_zalloc (fill->n_children
+-					* sizeof (fill->children[0]));
++	  fill->children = grub_calloc (fill->n_children,
++					sizeof (fill->children[0]));
+ 	}
+ 
+       for (i = 0; i < nelm; i++)
+@@ -3712,8 +3712,8 @@ zfs_mount (grub_device_t dev)
+ #endif
+ 
+   data->n_devices_allocated = 16;
+-  data->devices_attached = grub_malloc (sizeof (data->devices_attached[0])
+-					* data->n_devices_allocated);
++  data->devices_attached = grub_calloc (data->n_devices_allocated,
++					sizeof (data->devices_attached[0]));
+   data->n_devices_attached = 0;
+   err = scan_disk (dev, data, 1, &inserted);
+   if (err)
diff --git a/0347-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch b/0347-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch
new file mode 100644
index 00000000..7870587f
--- /dev/null
+++ b/0347-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch
@@ -0,0 +1,88 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Wed, 22 Jan 2025 07:17:01 +0000
+Subject: [PATCH] fs/zfs: Check if returned pointer for allocated memory is
+ NULL
+
+When using grub_malloc() or grub_zalloc(), these functions can fail if
+we are out of memory. After allocating memory we should check if these
+functions returned NULL and handle this error if they did.
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/zfs/zfs.c | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
+index 9ab7bf319..6e6d1c921 100644
+--- a/grub-core/fs/zfs/zfs.c
++++ b/grub-core/fs/zfs/zfs.c
+@@ -614,6 +614,8 @@ zfs_fetch_nvlist (struct grub_zfs_device_desc *diskdesc, char **nvlist)
+     return grub_error (GRUB_ERR_BUG, "member drive unknown");
+ 
+   *nvlist = grub_malloc (VDEV_PHYS_SIZE);
++  if (!*nvlist)
++    return grub_errno;
+ 
+   /* Read in the vdev name-value pair list (112K). */
+   err = grub_disk_read (diskdesc->dev->disk, diskdesc->vdev_phys_sector, 0,
+@@ -725,6 +727,11 @@ fill_vdev_info_real (struct grub_zfs_data *data,
+ 
+ 	  fill->children = grub_calloc (fill->n_children,
+ 					sizeof (fill->children[0]));
++	  if (!fill->children)
++	    {
++	      grub_free (type);
++	      return grub_errno;
++	    }
+ 	}
+ 
+       for (i = 0; i < nelm; i++)
+@@ -2457,6 +2464,11 @@ fzap_iterate (dnode_end_t * zap_dnode, zap_phys_t * zap,
+ 	      return grub_errno;
+ 	    }
+ 	  buf = grub_malloc (sz);
++	  if (!buf)
++	    {
++	      grub_free (l);
++	      return grub_errno;
++	    }
+ 	  if (zap_leaf_array_get (l, endian, blksft,
+ 				  grub_zfs_to_cpu16 (le->le_name_chunk,
+ 						     endian),
+@@ -2472,6 +2484,12 @@ fzap_iterate (dnode_end_t * zap_dnode, zap_phys_t * zap,
+ 	  val_length = ((int) le->le_value_length
+ 			* (int) le->le_int_size);
+ 	  val = grub_malloc (grub_zfs_to_cpu16 (val_length, endian));
++	  if (!val)
++	    {
++	      grub_free (l);
++	      grub_free (buf);
++	      return grub_errno;
++	    }
+ 	  if (zap_leaf_array_get (l, endian, blksft,
+ 				  grub_zfs_to_cpu16 (le->le_value_chunk,
+ 						     endian),
+@@ -3714,6 +3732,11 @@ zfs_mount (grub_device_t dev)
+   data->n_devices_allocated = 16;
+   data->devices_attached = grub_calloc (data->n_devices_allocated,
+ 					sizeof (data->devices_attached[0]));
++  if (!data->devices_attached)
++    {
++      grub_free (data);
++      return NULL;
++    }
+   data->n_devices_attached = 0;
+   err = scan_disk (dev, data, 1, &inserted);
+   if (err)
+@@ -4252,6 +4275,9 @@ iterate_zap_snap (const char *name, grub_uint64_t val,
+     return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("name length overflow"));
+ 
+   name2 = grub_malloc (sz);
++  if (!name2)
++    return grub_errno;
++
+   name2[0] = '@';
+   grub_memcpy (name2 + 1, name, grub_strlen (name) + 1);
+   ret = ctx->hook (name2, &info, ctx->hook_data);
diff --git a/0348-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch b/0348-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch
new file mode 100644
index 00000000..988bcbe7
--- /dev/null
+++ b/0348-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Wed, 22 Jan 2025 07:17:04 +0000
+Subject: [PATCH] fs/zfs: Add missing NULL check after grub_strdup() call
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/zfs/zfs.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
+index 6e6d1c921..5ff647ffb 100644
+--- a/grub-core/fs/zfs/zfs.c
++++ b/grub-core/fs/zfs/zfs.c
+@@ -3309,6 +3309,8 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol,
+       filename = 0;
+       snapname = 0;
+       fsname = grub_strdup (fullpath);
++      if (!fsname)
++	return grub_errno;
+     }
+   else
+     {
diff --git a/0349-net-Use-safe-math-macros-to-prevent-overflows.patch b/0349-net-Use-safe-math-macros-to-prevent-overflows.patch
new file mode 100644
index 00000000..60ebaf63
--- /dev/null
+++ b/0349-net-Use-safe-math-macros-to-prevent-overflows.patch
@@ -0,0 +1,240 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Wed, 12 Feb 2025 10:38:17 -0600
+Subject: [PATCH] net: Use safe math macros to prevent overflows
+
+Replace direct arithmetic operations with macros from include/grub/safemath.h
+to prevent potential overflow issues when calculating the memory sizes.
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/net/bootp.c                  | 16 +++++++++++--
+ grub-core/net/dns.c                    |  9 ++++++-
+ grub-core/net/drivers/ieee1275/ofnet.c | 20 ++++++++++++++--
+ grub-core/net/net.c                    | 43 +++++++++++++++++++++++++++-------
+ 4 files changed, 75 insertions(+), 13 deletions(-)
+
+diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
+index 9cbdc2264..bed70c0b2 100644
+--- a/grub-core/net/bootp.c
++++ b/grub-core/net/bootp.c
+@@ -27,6 +27,7 @@
+ #include <grub/datetime.h>
+ #include <grub/time.h>
+ #include <grub/list.h>
++#include <grub/safemath.h>
+ 
+ static int
+ dissect_url (const char *url, char **proto, char **host, char **path)
+@@ -1479,6 +1480,7 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
+   unsigned num;
+   const grub_uint8_t *ptr;
+   grub_uint8_t taglength;
++  grub_uint8_t len;
+ 
+   if (argc < 4)
+     return grub_error (GRUB_ERR_BAD_ARGUMENT,
+@@ -1520,7 +1522,12 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
+   if (grub_strcmp (args[3], "string") == 0)
+     {
+       grub_err_t err = GRUB_ERR_NONE;
+-      char *val = grub_malloc (taglength + 1);
++      char *val;
++
++      if (grub_add (taglength, 1, &len))
++	return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("tag length overflow"));
++
++      val = grub_malloc (len);
+       if (!val)
+ 	return grub_errno;
+       grub_memcpy (val, ptr, taglength);
+@@ -1553,7 +1560,12 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
+   if (grub_strcmp (args[3], "hex") == 0)
+     {
+       grub_err_t err = GRUB_ERR_NONE;
+-      char *val = grub_malloc (2 * taglength + 1);
++      char *val;
++
++      if (grub_mul (taglength, 2, &len) || grub_add (len, 1, &len))
++	return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("tag length overflow"));
++
++      val = grub_malloc (len);
+       int i;
+       if (!val)
+ 	return grub_errno;
+diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
+index fcc09aa65..39b0c46cf 100644
+--- a/grub-core/net/dns.c
++++ b/grub-core/net/dns.c
+@@ -224,10 +224,17 @@ get_name (const grub_uint8_t *name_at, const grub_uint8_t *head,
+ {
+   int length;
+   char *ret;
++  int len;
+ 
+   if (!check_name_real (name_at, head, tail, NULL, &length, NULL))
+     return NULL;
+-  ret = grub_malloc (length + 1);
++
++  if (grub_add (length, 1, &len))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("name length overflow"));
++      return NULL;
++    }
++  ret = grub_malloc (len);
+   if (!ret)
+     return NULL;
+   if (!check_name_real (name_at, head, tail, NULL, NULL, ret))
+diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
+index c56461ff1..b5336dfbb 100644
+--- a/grub-core/net/drivers/ieee1275/ofnet.c
++++ b/grub-core/net/drivers/ieee1275/ofnet.c
+@@ -22,6 +22,7 @@
+ #include <grub/net.h>
+ #include <grub/time.h>
+ #include <grub/i18n.h>
++#include <grub/safemath.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+@@ -392,6 +393,7 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
+   grub_uint8_t *pprop;
+   char *shortname;
+   char need_suffix = 1;
++  grub_size_t sz;
+ 
+   if (grub_strcmp (alias->type, "network") != 0)
+     return 0;
+@@ -449,9 +451,23 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
+   }
+ 
+   if (need_suffix)
+-    ofdata->path = grub_malloc (grub_strlen (alias->path) + sizeof (SUFFIX));
++    {
++      if (grub_add (grub_strlen (alias->path), sizeof (SUFFIX), &sz))
++	{
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obatining size of ofdata path"));
++	  grub_print_error ();
++	  return 0;
++	}
++    }
+   else
+-    ofdata->path = grub_malloc (grub_strlen (alias->path) + 1);
++    {
++      if (grub_add (grub_strlen (alias->path), 1, &sz))
++	{
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obatining size of ofdata path"));
++	  grub_print_error ();
++	  return 0;
++	}
++    }
+   if (!ofdata->path)
+     {
+       grub_print_error ();
+diff --git a/grub-core/net/net.c b/grub-core/net/net.c
+index 6c8dfcba2..22224453f 100644
+--- a/grub-core/net/net.c
++++ b/grub-core/net/net.c
+@@ -32,6 +32,7 @@
+ #include <grub/loader.h>
+ #include <grub/bufio.h>
+ #include <grub/kernel.h>
++#include <grub/safemath.h>
+ #ifdef GRUB_MACHINE_EFI
+ #include <grub/net/efi.h>
+ #endif
+@@ -211,6 +212,7 @@ grub_net_ipv6_get_slaac (struct grub_net_card *card,
+ {
+   struct grub_net_slaac_mac_list *slaac;
+   char *ptr;
++  grub_size_t sz;
+ 
+   for (slaac = card->slaac_list; slaac; slaac = slaac->next)
+     if (grub_net_hwaddr_cmp (&slaac->address, hwaddr) == 0)
+@@ -220,9 +222,16 @@ grub_net_ipv6_get_slaac (struct grub_net_card *card,
+   if (!slaac)
+     return NULL;
+ 
+-  slaac->name = grub_malloc (grub_strlen (card->name)
+-			     + GRUB_NET_MAX_STR_HWADDR_LEN
+-			     + sizeof (":slaac"));
++  if (grub_add (grub_strlen (card->name),
++      (GRUB_NET_MAX_STR_HWADDR_LEN + sizeof (":slaac")), &sz))
++    {
++      grub_free (slaac);
++      grub_error (GRUB_ERR_OUT_OF_RANGE,
++		  "overflow detected while obtaining size of slaac name");
++      return NULL;
++    }
++
++  slaac->name = grub_malloc (sz);
+   ptr = grub_stpcpy (slaac->name, card->name);
+   if (grub_net_hwaddr_cmp (&card->default_address, hwaddr) != 0)
+     {
+@@ -293,6 +302,7 @@ grub_net_ipv6_get_link_local (struct grub_net_card *card,
+   char *name;
+   char *ptr;
+   grub_net_network_level_address_t addr;
++  grub_size_t sz;
+ 
+   addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6;
+   addr.ipv6[0] = grub_cpu_to_be64_compile_time (0xfe80ULL << 48);
+@@ -307,9 +317,14 @@ grub_net_ipv6_get_link_local (struct grub_net_card *card,
+       return inf;
+   }
+ 
+-  name = grub_malloc (grub_strlen (card->name)
+-		      + GRUB_NET_MAX_STR_HWADDR_LEN
+-		      + sizeof (":link"));
++  if (grub_add (grub_strlen (card->name),
++      (GRUB_NET_MAX_STR_HWADDR_LEN + sizeof (":link")), &sz))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE,
++		  "overflow detected while obtaining size of link name");
++      return NULL;
++    }
++  name = grub_malloc (sz);
+   if (!name)
+     return NULL;
+ 
+@@ -1516,9 +1531,15 @@ grub_net_open_real (const char *name)
+ 	  if (grub_strchr (port_start + 1, ':'))
+ 	    {
+ 	      int iplen = grub_strlen (server);
++	      grub_size_t sz;
+ 
+ 	      /* Bracket bare IPv6 addr. */
+-	      host = grub_malloc (iplen + 3);
++	      if (grub_add (iplen, 3, &sz))
++		{
++		  grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining length of host"));
++		  return NULL;
++		}
++	      host = grub_malloc (sz);
+ 	      if (!host)
+                 return NULL;
+ 
+@@ -1773,6 +1794,7 @@ grub_env_set_net_property (const char *intername, const char *suffix,
+ {
+   char *varname, *varvalue;
+   char *ptr;
++  grub_size_t sz;
+ 
+   varname = grub_xasprintf ("net_%s_%s", intername, suffix);
+   if (!varname)
+@@ -1780,7 +1802,12 @@ grub_env_set_net_property (const char *intername, const char *suffix,
+   for (ptr = varname; *ptr; ptr++)
+     if (*ptr == ':')
+       *ptr = '_';
+-  varvalue = grub_malloc (len + 1);
++  if (grub_add (len, 1, &sz))
++    {
++      grub_free (varname);
++      return grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while obtaining the size of an env variable");
++    }
++  varvalue = grub_malloc (sz);
+   if (!varvalue)
+     {
+       grub_free (varname);
diff --git a/0350-net-Prevent-overflows-when-allocating-memory-for-arr.patch b/0350-net-Prevent-overflows-when-allocating-memory-for-arr.patch
new file mode 100644
index 00000000..c6619d2f
--- /dev/null
+++ b/0350-net-Prevent-overflows-when-allocating-memory-for-arr.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Wed, 22 Jan 2025 18:04:43 +0000
+Subject: [PATCH] net: Prevent overflows when allocating memory for arrays
+
+Use grub_calloc() when allocating memory for arrays to ensure proper
+overflow checks are in place.
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/net/dns.c | 4 ++--
+ grub-core/net/net.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
+index 39b0c46cf..f20cd6f83 100644
+--- a/grub-core/net/dns.c
++++ b/grub-core/net/dns.c
+@@ -470,8 +470,8 @@ grub_net_dns_lookup (const char *name,
+ 	  && grub_get_time_ms () < dns_cache[h].limit_time)
+ 	{
+ 	  grub_dprintf ("dns", "retrieved from cache\n");
+-	  *addresses = grub_malloc (dns_cache[h].naddresses
+-				    * sizeof ((*addresses)[0]));
++	  *addresses = grub_calloc (dns_cache[h].naddresses,
++				    sizeof ((*addresses)[0]));
+ 	  if (!*addresses)
+ 	    return grub_errno;
+ 	  *naddresses = dns_cache[h].naddresses;
+diff --git a/grub-core/net/net.c b/grub-core/net/net.c
+index 22224453f..d426ad2c4 100644
+--- a/grub-core/net/net.c
++++ b/grub-core/net/net.c
+@@ -91,8 +91,8 @@ grub_net_link_layer_add_address (struct grub_net_card *card,
+   /* Add sender to cache table.  */
+   if (card->link_layer_table == NULL)
+     {
+-      card->link_layer_table = grub_zalloc (LINK_LAYER_CACHE_SIZE
+-					    * sizeof (card->link_layer_table[0]));
++      card->link_layer_table = grub_calloc (LINK_LAYER_CACHE_SIZE,
++					    sizeof (card->link_layer_table[0]));
+       if (card->link_layer_table == NULL)
+ 	return;
+     }
diff --git a/0351-net-Check-if-returned-pointer-for-allocated-memory-i.patch b/0351-net-Check-if-returned-pointer-for-allocated-memory-i.patch
new file mode 100644
index 00000000..7b5b647b
--- /dev/null
+++ b/0351-net-Check-if-returned-pointer-for-allocated-memory-i.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Wed, 22 Jan 2025 18:04:44 +0000
+Subject: [PATCH] net: Check if returned pointer for allocated memory is NULL
+
+When using grub_malloc(), the function can fail if we are out of memory.
+After allocating memory we should check if this function returned NULL
+and handle this error if it did.
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/net/net.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/grub-core/net/net.c b/grub-core/net/net.c
+index d426ad2c4..bec297cb6 100644
+--- a/grub-core/net/net.c
++++ b/grub-core/net/net.c
+@@ -232,6 +232,11 @@ grub_net_ipv6_get_slaac (struct grub_net_card *card,
+     }
+ 
+   slaac->name = grub_malloc (sz);
++  if (slaac->name == NULL)
++    {
++      grub_free (slaac);
++      return NULL;
++    }
+   ptr = grub_stpcpy (slaac->name, card->name);
+   if (grub_net_hwaddr_cmp (&card->default_address, hwaddr) != 0)
+     {
diff --git a/0352-fs-sfs-Check-if-allocated-memory-is-NULL.patch b/0352-fs-sfs-Check-if-allocated-memory-is-NULL.patch
new file mode 100644
index 00000000..57d2960b
--- /dev/null
+++ b/0352-fs-sfs-Check-if-allocated-memory-is-NULL.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Tue, 28 Jan 2025 05:15:50 +0000
+Subject: [PATCH] fs/sfs: Check if allocated memory is NULL
+
+When using grub_zalloc(), if we are out of memory, this function can fail.
+After allocating memory, we should check if grub_zalloc() returns NULL.
+If so, we should handle this error.
+
+Fixes: CID 473856
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/sfs.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
+index 88705b3a2..bad4ae8d1 100644
+--- a/grub-core/fs/sfs.c
++++ b/grub-core/fs/sfs.c
+@@ -429,6 +429,9 @@ grub_sfs_mount (grub_disk_t disk)
+ 	     - 24    /* offsetof (struct grub_sfs_objc, objects) */
+ 	     - 25);  /* offsetof (struct grub_sfs_obj, filename) */
+   data->label = grub_zalloc (max_len + 1);
++  if (data->label == NULL)
++    goto fail;
++
+   grub_strncpy (data->label, (char *) rootobjc->objects[0].filename, max_len);
+ 
+   grub_free (rootobjc_data);
diff --git a/0353-script-execute-Fix-potential-underflow-and-NULL-dere.patch b/0353-script-execute-Fix-potential-underflow-and-NULL-dere.patch
new file mode 100644
index 00000000..575c81a9
--- /dev/null
+++ b/0353-script-execute-Fix-potential-underflow-and-NULL-dere.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Wed, 29 Jan 2025 06:48:37 +0000
+Subject: [PATCH] script/execute: Fix potential underflow and NULL dereference
+
+The result is initialized to 0 in grub_script_arglist_to_argv().
+If the for loop condition is not met both result.args and result.argc
+remain 0 causing result.argc - 1 to underflow and/or result.args NULL
+dereference. Fix the issues by adding relevant checks.
+
+Fixes: CID 473880
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/script/execute.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
+index 7ed3a1a03..014132703 100644
+--- a/grub-core/script/execute.c
++++ b/grub-core/script/execute.c
+@@ -794,6 +794,9 @@ cleanup:
+ 	}
+     }
+ 
++  if (result.args == NULL || result.argc == 0)
++    goto fail;
++
+   if (! result.args[result.argc - 1])
+     result.argc--;
+ 
diff --git a/0354-osdep-unix-getroot-Fix-potential-underflow.patch b/0354-osdep-unix-getroot-Fix-potential-underflow.patch
new file mode 100644
index 00000000..09c223ea
--- /dev/null
+++ b/0354-osdep-unix-getroot-Fix-potential-underflow.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Wed, 29 Jan 2025 06:48:38 +0000
+Subject: [PATCH] osdep/unix/getroot: Fix potential underflow
+
+The entry_len is initialized in grub_find_root_devices_from_mountinfo()
+to 0 before the while loop iterates through /proc/self/mountinfo. If the
+file is empty or contains only invalid entries entry_len remains
+0 causing entry_len - 1 in the subsequent for loop initialization
+to underflow. To prevent this add a check to ensure entry_len > 0 before
+entering the for loop.
+
+Fixes: CID 473877
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
+---
+ grub-core/osdep/linux/getroot.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
+index b32582eb3..b83259321 100644
+--- a/grub-core/osdep/linux/getroot.c
++++ b/grub-core/osdep/linux/getroot.c
+@@ -596,6 +596,9 @@ again:
+ 	}
+     }
+ 
++  if (!entry_len)
++    goto out;
++
+   /* Now scan visible mounts for the ones we're interested in.  */
+   for (i = entry_len - 1; i >= 0; i--)
+     {
diff --git a/0355-misc-Ensure-consistent-overflow-error-messages.patch b/0355-misc-Ensure-consistent-overflow-error-messages.patch
new file mode 100644
index 00000000..411a4fbc
--- /dev/null
+++ b/0355-misc-Ensure-consistent-overflow-error-messages.patch
@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Tue, 21 Jan 2025 19:02:39 +0000
+Subject: [PATCH] misc: Ensure consistent overflow error messages
+
+Update the overflow error messages to make them consistent
+across the GRUB code.
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ntfs.c           | 2 +-
+ grub-core/fs/ntfscomp.c       | 2 +-
+ grub-core/video/readers/png.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
+index e00349b1d..960833a34 100644
+--- a/grub-core/fs/ntfs.c
++++ b/grub-core/fs/ntfs.c
+@@ -574,7 +574,7 @@ retry:
+ 	      goto retry;
+ 	    }
+ 	}
+-      return grub_error (GRUB_ERR_BAD_FS, "run list overflown");
++      return grub_error (GRUB_ERR_BAD_FS, "run list overflow");
+     }
+   ctx->curr_vcn = ctx->next_vcn;
+   ctx->next_vcn += read_run_data (run, c1, 0);	/* length of current VCN */
+diff --git a/grub-core/fs/ntfscomp.c b/grub-core/fs/ntfscomp.c
+index f168a318e..b68bf5e40 100644
+--- a/grub-core/fs/ntfscomp.c
++++ b/grub-core/fs/ntfscomp.c
+@@ -30,7 +30,7 @@ static grub_err_t
+ decomp_nextvcn (struct grub_ntfs_comp *cc)
+ {
+   if (cc->comp_head >= cc->comp_tail)
+-    return grub_error (GRUB_ERR_BAD_FS, "compression block overflown");
++    return grub_error (GRUB_ERR_BAD_FS, "compression block overflow");
+   if (grub_disk_read
+       (cc->disk,
+        (cc->comp_table[cc->comp_head].next_lcn -
+diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
+index 3163e97bf..aa7524b7d 100644
+--- a/grub-core/video/readers/png.c
++++ b/grub-core/video/readers/png.c
+@@ -626,7 +626,7 @@ static grub_err_t
+ grub_png_output_byte (struct grub_png_data *data, grub_uint8_t n)
+ {
+   if (--data->raw_bytes < 0)
+-    return grub_error (GRUB_ERR_BAD_FILE_TYPE, "image size overflown");
++    return grub_error (GRUB_ERR_BAD_FILE_TYPE, "image size overflow");
+ 
+   if (data->cur_column == 0)
+     {
diff --git a/0356-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch b/0356-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch
new file mode 100644
index 00000000..70342514
--- /dev/null
+++ b/0356-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Tue, 4 Feb 2025 15:11:10 +0000
+Subject: [PATCH] bus/usb/ehci: Define GRUB_EHCI_TOGGLE as grub_uint32_t
+
+The Coverity indicates that GRUB_EHCI_TOGGLE is an int that contains
+a negative value and we are using it for the variable token which is
+grub_uint32_t. To remedy this we can cast the definition to grub_uint32_t.
+
+Fixes: CID 473851
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/bus/usb/ehci.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c
+index 9abebc6bd..2db07c7c0 100644
+--- a/grub-core/bus/usb/ehci.c
++++ b/grub-core/bus/usb/ehci.c
+@@ -218,7 +218,7 @@ enum
+ 
+ #define GRUB_EHCI_TERMINATE      (1<<0)
+ 
+-#define GRUB_EHCI_TOGGLE         (1<<31)
++#define GRUB_EHCI_TOGGLE         ((grub_uint32_t) 1<<31)
+ 
+ enum
+ {
diff --git a/0357-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch b/0357-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch
new file mode 100644
index 00000000..2ae5ec6f
--- /dev/null
+++ b/0357-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Tue, 4 Feb 2025 15:11:11 +0000
+Subject: [PATCH] normal/menu: Use safe math to avoid an integer overflow
+
+The Coverity indicates that the variable current_entry might overflow.
+To prevent this use safe math when adding GRUB_MENU_PAGE_SIZE to current_entry.
+
+On the occasion fix limiting condition which was broken.
+
+Fixes: CID 473853
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/normal/menu.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
+index cda10fa8b..97687013c 100644
+--- a/grub-core/normal/menu.c
++++ b/grub-core/normal/menu.c
+@@ -32,6 +32,7 @@
+ #include <grub/script_sh.h>
+ #include <grub/gfxterm.h>
+ #include <grub/dl.h>
++#include <grub/safemath.h>
+ 
+ /* Time to delay after displaying an error message about a default/fallback
+    entry failing to boot.  */
+@@ -784,9 +785,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot, int *notify_boot)
+ 
+ 	    case GRUB_TERM_CTRL | 'c':
+ 	    case GRUB_TERM_KEY_NPAGE:
+-	      if (current_entry + GRUB_MENU_PAGE_SIZE < menu->size)
+-		current_entry += GRUB_MENU_PAGE_SIZE;
+-	      else
++	      if (grub_add (current_entry, GRUB_MENU_PAGE_SIZE, &current_entry) || current_entry >= menu->size)
+ 		current_entry = menu->size - 1;
+ 	      menu_set_chosen_entry (current_entry);
+ 	      break;
diff --git a/0358-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch b/0358-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch
new file mode 100644
index 00000000..a170fa95
--- /dev/null
+++ b/0358-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Thu, 6 Feb 2025 18:16:56 +0000
+Subject: [PATCH] kern/partition: Add sanity check after grub_strtoul() call
+
+The current code incorrectly assumes that both the input and the values
+returned by grub_strtoul() are always valid which can lead to potential
+errors. This fix ensures proper validation to prevent any unintended issues.
+
+Fixes: CID 473843
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/partition.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/kern/partition.c b/grub-core/kern/partition.c
+index 704512a20..c6a578cf4 100644
+--- a/grub-core/kern/partition.c
++++ b/grub-core/kern/partition.c
+@@ -125,14 +125,22 @@ grub_partition_probe (struct grub_disk *disk, const char *str)
+   for (ptr = str; *ptr;)
+     {
+       grub_partition_map_t partmap;
+-      int num;
++      unsigned long num;
+       const char *partname, *partname_end;
+ 
+       partname = ptr;
+       while (*ptr && grub_isalpha (*ptr))
+ 	ptr++;
+       partname_end = ptr;
+-      num = grub_strtoul (ptr, &ptr, 0) - 1;
++
++      num = grub_strtoul (ptr, &ptr, 0);
++      if (*ptr != '\0' || num == 0 || num > GRUB_INT_MAX)
++	{
++	  grub_error (GRUB_ERR_BAD_NUMBER, N_("invalid partition number"));
++	  return 0;
++	}
++
++      num -= 1;
+ 
+       curpart = 0;
+       /* Use the first partition map type found.  */
diff --git a/0359-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch b/0359-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch
new file mode 100644
index 00000000..7af2fd0b
--- /dev/null
+++ b/0359-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lidong Chen <lidong.chen@oracle.com>
+Date: Thu, 6 Feb 2025 18:16:57 +0000
+Subject: [PATCH] kern/misc: Add sanity check after grub_strtoul() call
+
+When the format string, fmt0, includes a positional argument
+grub_strtoul() or grub_strtoull() is called to extract the argument
+position. However, the returned argument position isn't fully validated.
+If the format is something like "%0$x" then these functions return
+0 which leads to an underflow in the calculation of the args index, curn.
+The fix is to add a check to ensure the extracted argument position is
+greater than 0 before computing curn. Additionally, replace one
+grub_strtoull() with grub_strtoul() and change curn type to make code
+more correct.
+
+Fixes: CID 473841
+
+Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/misc.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
+index 98700423d..69bd655f3 100644
+--- a/grub-core/kern/misc.c
++++ b/grub-core/kern/misc.c
+@@ -912,7 +912,7 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args,
+   while ((c = *fmt++) != 0)
+     {
+       int longfmt = 0;
+-      grub_size_t curn;
++      unsigned long curn;
+       const char *p;
+ 
+       if (c != '%')
+@@ -930,7 +930,10 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args,
+ 
+       if (*fmt == '$')
+ 	{
+-	  curn = grub_strtoull (p, 0, 10) - 1;
++	  curn = grub_strtoul (p, 0, 10);
++	  if (curn == 0)
++	    continue;
++	  curn--;
+ 	  fmt++;
+ 	}
+ 
+@@ -1116,6 +1119,8 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,
+ 
+       if (*fmt == '$')
+ 	{
++	  if (format1 == 0)
++	    continue;
+ 	  curn = format1 - 1;
+ 	  fmt++;
+ 	  format1 = 0;
diff --git a/0360-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch b/0360-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch
new file mode 100644
index 00000000..9c8819bb
--- /dev/null
+++ b/0360-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Wed, 12 Feb 2025 10:56:13 -0600
+Subject: [PATCH] loader/i386/linux: Cast left shift to grub_uint32_t
+
+The Coverity complains that we might overflow into a negative value when
+setting linux_params.kernel_alignment to (1 << align). We can remedy
+this by casting it to grub_uint32_t.
+
+Fixes: CID 473876
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/loader/i386/linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
+index 90121e9bc..33a852197 100644
+--- a/grub-core/loader/i386/linux.c
++++ b/grub-core/loader/i386/linux.c
+@@ -823,7 +823,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 			 GRUB_MEM_ATTR_R|GRUB_MEM_ATTR_W, GRUB_MEM_ATTR_X);
+ 
+   linux_params.code32_start = prot_mode_target + lh.code32_start - GRUB_LINUX_BZIMAGE_ADDR;
+-  linux_params.kernel_alignment = (1 << align);
++  linux_params.kernel_alignment = ((grub_uint32_t)1 << align);
+   linux_params.ps_mouse = linux_params.padding11 = 0;
+   linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
+ 
diff --git a/0361-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch b/0361-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch
new file mode 100644
index 00000000..272293b2
--- /dev/null
+++ b/0361-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Wed, 5 Feb 2025 22:04:08 +0000
+Subject: [PATCH] loader/i386/bsd: Use safe math to avoid underflow
+
+The operation kern_end - kern_start may underflow when we input it into
+grub_relocator_alloc_chunk_addr() call. To avoid this we can use safe
+math for this subtraction.
+
+Fixes: CID 73845
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/loader/i386/bsd.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
+index 8075ac9b0..50f96ea7a 100644
+--- a/grub-core/loader/i386/bsd.c
++++ b/grub-core/loader/i386/bsd.c
+@@ -1341,6 +1341,7 @@ static grub_err_t
+ grub_bsd_load_elf (grub_elf_t elf, const char *filename)
+ {
+   grub_err_t err;
++  grub_size_t sz;
+ 
+   kern_end = 0;
+   kern_start = ~0;
+@@ -1371,8 +1372,11 @@ grub_bsd_load_elf (grub_elf_t elf, const char *filename)
+ 
+       if (grub_errno)
+ 	return grub_errno;
+-      err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+-					     kern_start, kern_end - kern_start);
++
++      if (grub_sub (kern_end, kern_start, &sz))
++	return grub_error (GRUB_ERR_OUT_OF_RANGE, "underflow detected while determining size of kernel for relocator");
++
++      err = grub_relocator_alloc_chunk_addr (relocator, &ch, kern_start, sz);
+       if (err)
+ 	return err;
+ 
+@@ -1432,8 +1436,10 @@ grub_bsd_load_elf (grub_elf_t elf, const char *filename)
+       {
+ 	grub_relocator_chunk_t ch;
+ 
+-	err = grub_relocator_alloc_chunk_addr (relocator, &ch, kern_start,
+-					       kern_end - kern_start);
++	if (grub_sub (kern_end, kern_start, &sz))
++	  return grub_error (GRUB_ERR_OUT_OF_RANGE, "underflow detected while determining size of kernel for relocator");
++
++	err = grub_relocator_alloc_chunk_addr (relocator, &ch, kern_start, sz);
+ 	if (err)
+ 	  return err;
+ 	kern_chunk_src = get_virtual_current_address (ch);
diff --git a/0362-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch b/0362-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch
new file mode 100644
index 00000000..c237f462
--- /dev/null
+++ b/0362-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch
@@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 21 Feb 2025 09:06:12 +0800
+Subject: [PATCH] fs/ext2: Rework out-of-bounds read for inline and external
+ extents
+
+Previously, the number of extent entries was not properly capped based
+on the actual available space. This could lead to insufficient reads for
+external extents, since the computation was based solely on the inline
+extent layout.
+
+In this patch, when processing the extent header, we determine whether
+the header is stored inline (i.e., at inode->blocks.dir_blocks) or in an
+external extent block. We then clamp the number of entries accordingly
+(using max_inline_ext for inline extents and max_external_ext for
+external extent blocks).
+
+This change ensures that only the valid number of extent entries is
+processed, preventing out-of-bound reads and potential filesystem
+corruption.
+
+Fixes: 7e2f750f0a (fs/ext2: Fix out-of-bounds read for inline extents)
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Tested-by: Christian Hesse <mail@eworm.de>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ext2.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index c3058f7..a5650c3 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -496,7 +496,10 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
+       int i;
+       grub_disk_addr_t ret;
+       grub_uint16_t nent;
++      /* maximum number of extent entries in the inode's inline extent area */
+       const grub_uint16_t max_inline_ext = sizeof (inode->blocks) / sizeof (*ext) - 1; /* Minus 1 extent header. */
++      /* maximum number of extent entries in the external extent block */
++      const grub_uint16_t max_external_ext = EXT2_BLOCK_SIZE(data) / sizeof (*ext) - 1; /* Minus 1 extent header. */
+ 
+       if (grub_ext4_find_leaf (data, (struct grub_ext4_extent_header *) inode->blocks.dir_blocks,
+ 			       fileblock, &leaf) != GRUB_ERR_NONE)
+@@ -513,8 +516,18 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
+ 
+       nent = grub_le_to_cpu16 (leaf->entries);
+ 
+-      if (leaf->depth == 0)
++      /*
++       * Determine the effective number of extent entries (nent) to process:
++       * If the extent header (leaf) is stored inline in the inode’s block
++       * area (i.e. at inode->blocks.dir_blocks), then only max_inline_ext
++       * entries can fit.
++       * Otherwise, if the header was read from an external extent block, use
++       * the larger limit, max_external_ext, based on the full block size.
++       */
++      if (leaf == (struct grub_ext4_extent_header *) inode->blocks.dir_blocks)
+ 	nent = grub_min (nent, max_inline_ext);
++      else
++	nent = grub_min (nent, max_external_ext);
+ 
+       for (i = 0; i < nent; i++)
+         {
diff --git a/0363-powerpc-increase-MIN-RMA-size-for-CAS-negotiation.patch b/0363-powerpc-increase-MIN-RMA-size-for-CAS-negotiation.patch
new file mode 100644
index 00000000..1e7dc90d
--- /dev/null
+++ b/0363-powerpc-increase-MIN-RMA-size-for-CAS-negotiation.patch
@@ -0,0 +1,117 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Avnish Chouhan <avnish@linux.ibm.com>
+Date: Thu, 13 Mar 2025 19:45:50 +0530
+Subject: [PATCH] powerpc: increase MIN RMA size for CAS negotiation
+
+Change RMA size from 512 MB to 768 MB which will result
+in more memory at boot time for PowerPC. When vTPM, Secure Boot or
+FADump are enabled on PowerPC, the 512 MB RMA memory is not sufficient for
+booting. With this 512 MB RMA, GRUB2 runs out of memory and fails to
+boot the machine. Sometimes even usage of CDROM requires more memory
+for installation and along with the options mentioned above exhausts
+the boot memory which results in boot failures. Increasing the RMA size
+will resolves multiple out of memory issues observed in PowerPC.
+
+Failure details (GRUB2 debugs):
+
+  kern/ieee1275/init.c:550: mm requested region of size 8513000, flags 1
+  kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime space
+  kern/ieee1275/init.c:550: mm requested region of size 8513000, flags 0
+  kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime space
+  kern/file.c:215: Closing `/ppc/ppc64/initrd.img' ...
+  kern/disk.c:297: Closing `ieee1275//vdevice/v-scsi@30000067/disk@8300000000000000'...
+  kern/disk.c:311: Closing `ieee1275//vdevice/v-scsi@30000067/disk@8300000000000000' succeeded.
+  kern/file.c:225: Closing `/ppc/ppc64/initrd.img' failed with 3.
+  kern/file.c:148: Opening `/ppc/ppc64/initrd.img' succeeded.
+  error: ../../grub-core/kern/mm.c:552:out of memory.
+
+Signed-off-by: Avnish Chouhan <avnish@linux.ibm.com>
+---
+ grub-core/kern/ieee1275/init.c | 51 +++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 46 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
+index 4ec6598cfbb8..bb791f80f41c 100644
+--- a/grub-core/kern/ieee1275/init.c
++++ b/grub-core/kern/ieee1275/init.c
+@@ -737,7 +737,7 @@ struct cas_vector
+ 
+ /*
+  * Call ibm,client-architecture-support to try to get more RMA.
+- * We ask for 512MB which should be enough to verify a distro kernel.
++ * We ask for 768MB which should be enough to verify a distro kernel.
+  * We ignore most errors: if we don't succeed we'll proceed with whatever
+  * memory we have.
+  */
+@@ -809,7 +809,7 @@ grub_ieee1275_ibm_cas (void)
+     .vec1 = 0x80, /* ignore */
+     .vec2_size = 1 + sizeof (struct option_vector2) - 2,
+     .vec2 = {
+-      0, 0, -1, -1, -1, -1, -1, 512, -1, 0, 48
++      0, 0, -1, -1, -1, -1, -1, 768, -1, 0, 48
+     },
+     .vec3_size = 2 - 1,
+     .vec3 = 0x00e0, /* ask for FP + VMX + DFP but don't halt if unsatisfied */
+@@ -846,6 +846,10 @@ grub_claim_heap (void)
+ {
+   grub_err_t err;
+   grub_uint32_t total = HEAP_MAX_SIZE;
++#if defined(__powerpc__)
++  grub_uint32_t ibm_ca_support_reboot = 0;
++  grub_ssize_t actual;
++#endif
+ 
+   err = grub_ieee1275_total_mem (&rmo_top);
+ 
+@@ -858,11 +862,48 @@ grub_claim_heap (void)
+     grub_mm_add_region_fn = grub_ieee1275_mm_add_region;
+ 
+ #if defined(__powerpc__)
++  /* Check if it's a CAS reboot with below property. If so, we will skip CAS call */
++  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen,
++                                          "ibm,client-architecture-support-reboot",
++                                          &ibm_ca_support_reboot,
++                                          sizeof (ibm_ca_support_reboot),
++                                          &actual) >= 0)
++    grub_dprintf ("ieee1275", "ibm,client-architecture-support-reboot: %" PRIuGRUB_UINT32_T "\n",
++                  ibm_ca_support_reboot);
++
+   if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY))
+     {
+-      /* if we have an error, don't call CAS, just hope for the best */
+-      if (err == GRUB_ERR_NONE && rmo_top < (512 * 1024 * 1024))
+-	grub_ieee1275_ibm_cas ();
++      /*
++       * If we have an error, don't call CAS. Just hope for the best.
++       * Along with the above, if the rmo_top is 512 MB or above. We
++       * will skip the CAS call. However, if we call CAS, the rmo_top
++       * will be set to 768 MB via CAS Vector2. But we need to call
++       * CAS with "rmo_top < 512 MB" to avoid the issue on the older
++       * Linux kernel, which still uses rmo_top as 512 MB. If we call
++       * CAS with a condition "rmo_top < 768 MB", it will result in an
++       * issue due to the IBM CAS reboot feature and we won't be able
++       * to boot the newer kernel. Whenever a reboot is detected as
++       * the CAS reboot by GRUB. It will boot the machine with the
++       * last booted kernel by reading the variable "boot-last-label"
++       * which has the info related to the last boot and it's specific
++       * to IBM PowerPC. Due to this, the machine will boot with the
++       * last booted kernel which has rmo_top as 512 MB. Also, if the
++       * reboot is detected as a CAS reboot, the GRUB will skip the CAS
++       * call. As the CAS has already been called earlier, so it is
++       * not required to call CAS even if the other conditions are met.
++       * This condition will also prevent a scenario where the machine
++       * get stuck in the CAS reboot loop while booting. A machine with
++       * an older kernel, having option_vector2 MIN_RMA as 512 MB in
++       * Linux prom_init.c and GRUB uses "rmo_top < 768 MB" condition
++       * for calling CAS. Due to their respective conditions, linux
++       * CAS and GRUB CAS will keep doing the CAS calls and change
++       * the MIN_RMA from 768(changed by GRUB) to 512(changed by Linux)
++       * to 768(changed by GRUB) to 512(changed by Linux) and so on,
++       * and the machine will stuck in this CAS reboot loop forever.
++       * IBM PAPR : https://openpower.foundation/specifications/linuxonpower/
++       */
++      if (!ibm_ca_support_reboot && err == GRUB_ERR_NONE && rmo_top < (512 * 1024 * 1024))
++        grub_ieee1275_ibm_cas ();
+     }
+ #endif
+ 
diff --git a/0364-script-execute-Don-t-let-trailing-blank-lines-determ.patch b/0364-script-execute-Don-t-let-trailing-blank-lines-determ.patch
new file mode 100644
index 00000000..fd2eb2bf
--- /dev/null
+++ b/0364-script-execute-Don-t-let-trailing-blank-lines-determ.patch
@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <jlecuirot@microsoft.com>
+Date: Thu, 24 Oct 2024 14:42:46 +0100
+Subject: [PATCH] script/execute: Don't let trailing blank lines determine the
+ return code
+
+grub_script_execute_sourcecode() parses and executes code one line at a
+time, updating the return code each time because only the last line
+determines the final status. However, trailing new lines were also
+executed, masking any failure on the previous line. Fix this by only
+trying to execute the command when there is actually one present.
+
+This has presumably never been noticed because this code is not used by
+regular functions, only in special cases like eval and menu entries. The
+latter generally don't return at all, having booted an OS. When failing
+to boot, upstream GRUB triggers the fallback mechanism regardless of the
+return code.
+
+We noticed the problem while using Red Hat's patches, which change this
+behaviour to take account of the return code. In that case, a failure
+takes you back to the menu rather than triggering a fallback.
+
+Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
+---
+ grub-core/script/execute.c |  5 ++++-
+ tests/grub_script_eval.in  | 10 +++++++++-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
+index 014132703..3d26a3fe4 100644
+--- a/grub-core/script/execute.c
++++ b/grub-core/script/execute.c
+@@ -952,7 +952,10 @@ grub_script_execute_sourcecode (const char *source)
+ 	  break;
+ 	}
+ 
+-      ret = grub_script_execute (parsed_script);
++      /* Don't let trailing blank lines determine the return code.  */
++      if (parsed_script->cmd)
++	ret = grub_script_execute (parsed_script);
++
+       grub_script_free (parsed_script);
+       grub_free (line);
+     }
+diff --git a/tests/grub_script_eval.in b/tests/grub_script_eval.in
+index c97b78d77..9c6211042 100644
+--- a/tests/grub_script_eval.in
++++ b/tests/grub_script_eval.in
+@@ -3,4 +3,12 @@
+ eval echo "Hello world"
+ valname=tst
+ eval $valname=hi
+-echo $tst
+\ No newline at end of file
++echo $tst
++
++if eval "
++false
++"; then
++  echo should have failed
++else
++  echo failed as expected
++fi
+-- 
+2.48.1
+
diff --git a/0365-normal-menu-Check-return-code-of-the-script-when-exe.patch b/0365-normal-menu-Check-return-code-of-the-script-when-exe.patch
new file mode 100644
index 00000000..3ce0eec3
--- /dev/null
+++ b/0365-normal-menu-Check-return-code-of-the-script-when-exe.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <jlecuirot@microsoft.com>
+Date: Thu, 24 Oct 2024 15:00:26 +0100
+Subject: [PATCH] normal/menu: Check return code of the script when executing a
+ menu entry
+
+Don't rely on grub_errno here because grub_script_execute_new_scope()
+calls grub_print_error(), which always resets grub_errno back to
+GRUB_ERR_NONE. It may also get reset by grub_wait_after_message().
+
+This problem was observed when a "bad signature" error resulted in the
+menu being redisplayed rather than the fallback mechanism being
+triggered, although another change was also needed to fix it. This only
+happens with Red Hat's patches because upstream GRUB triggers the
+fallback mechanism regardless of the return code.
+
+Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
+---
+ grub-core/normal/menu.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
+index 97687013c..a2703dabb 100644
+--- a/grub-core/normal/menu.c
++++ b/grub-core/normal/menu.c
+@@ -377,14 +377,14 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
+   if (ptr && ptr[0] && ptr[1])
+     grub_env_set ("default", ptr + 1);
+ 
+-  grub_script_execute_new_scope (entry->sourcecode, entry->argc, entry->args);
++  err = grub_script_execute_new_scope (entry->sourcecode, entry->argc, entry->args);
+ 
+   if (errs_before != grub_err_printed_errors)
+     grub_wait_after_message ();
+ 
+   errs_before = grub_err_printed_errors;
+ 
+-  if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
++  if (err == GRUB_ERR_NONE && grub_loader_is_loaded ())
+     /* Implicit execution of boot, only if something is loaded.  */
+     err = grub_command_execute ("boot", 0, 0);
+ 
+-- 
+2.48.1
+
diff --git a/0366-ieee1275-ofnet-Fix-grub_malloc-removed-after-added-s.patch b/0366-ieee1275-ofnet-Fix-grub_malloc-removed-after-added-s.patch
new file mode 100644
index 00000000..92da0261
--- /dev/null
+++ b/0366-ieee1275-ofnet-Fix-grub_malloc-removed-after-added-s.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nicolas Frayer <nfrayer@redhat.com>
+Date: Wed, 19 Mar 2025 17:39:41 +0100
+Subject: [PATCH] ieee1275/ofnet: Fix grub_malloc() removed after added safe
+ math functions
+
+grub_malloc() has been inadvertently removed from the ieee1275/ofnet
+code after it has been modified to use safe match function.
+
+Fixes: 4beeff8a (net: Use safe math macros to prevent overflows)
+
+Tested-by: Marta Lewandowska <mlewando@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ grub-core/net/drivers/ieee1275/ofnet.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
+index 3e1b9094e2ab..37bc82467f60 100644
+--- a/grub-core/net/drivers/ieee1275/ofnet.c
++++ b/grub-core/net/drivers/ieee1275/ofnet.c
+@@ -463,6 +463,9 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
+ 	  return 0;
+ 	}
+     }
++
++  ofdata->path = grub_malloc(sz);
++
+   if (!ofdata->path)
+     {
+       grub_print_error ();
diff --git a/0367-grub-mkimage-Create-new-ELF-note-for-SBAT.patch b/0367-grub-mkimage-Create-new-ELF-note-for-SBAT.patch
new file mode 100644
index 00000000..25023c80
--- /dev/null
+++ b/0367-grub-mkimage-Create-new-ELF-note-for-SBAT.patch
@@ -0,0 +1,167 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
+Date: Wed, 23 Oct 2024 17:54:32 +0530
+Subject: [PATCH] grub-mkimage: Create new ELF note for SBAT
+
+In order to store the SBAT data we create a new ELF note. The string
+".sbat", zero-padded to 4 byte alignment, shall be entered in the name
+field. The string "SBAT"'s ASCII values, 0x53424154, should be entered
+in the type field.
+
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ include/grub/util/mkimage.h |  4 ++--
+ util/grub-mkimagexx.c       | 48 +++++++++++++++++++++++++++++++++++++++++++--
+ util/mkimage.c              |  5 +++--
+ 3 files changed, 51 insertions(+), 6 deletions(-)
+
+diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h
+index 6f1da89b9b65..881e3031f41f 100644
+--- a/include/grub/util/mkimage.h
++++ b/include/grub/util/mkimage.h
+@@ -51,12 +51,12 @@ grub_mkimage_load_image64 (const char *kernel_path,
+ 			   const struct grub_install_image_target_desc *image_target);
+ void
+ grub_mkimage_generate_elf32 (const struct grub_install_image_target_desc *image_target,
+-			     int note, size_t appsig_size, char **core_img, size_t *core_size,
++			     int note, size_t appsig_size, char *sbat, char **core_img, size_t *core_size,
+ 			     Elf32_Addr target_addr,
+ 			     struct grub_mkimage_layout *layout);
+ void
+ grub_mkimage_generate_elf64 (const struct grub_install_image_target_desc *image_target,
+-			     int note, size_t appsig_size, char **core_img, size_t *core_size,
++			     int note, size_t appsig_size, char *sbat, char **core_img, size_t *core_size,
+ 			     Elf64_Addr target_addr,
+ 			     struct grub_mkimage_layout *layout);
+ 
+diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
+index 9488f052510a..b9930544889d 100644
+--- a/util/grub-mkimagexx.c
++++ b/util/grub-mkimagexx.c
+@@ -116,6 +116,14 @@ struct section_metadata
+   const char *strtab;
+ };
+ 
++#define GRUB_SBAT_NOTE_NAME ".sbat"
++#define GRUB_SBAT_NOTE_TYPE 0x53424154 /* "SBAT" */
++
++struct grub_sbat_note {
++  Elf32_Nhdr header;
++  char name[ALIGN_UP(sizeof(GRUB_SBAT_NOTE_NAME), 4)];
++};
++
+ static int
+ is_relocatable (const struct grub_install_image_target_desc *image_target)
+ {
+@@ -217,7 +225,7 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr)
+ 
+ void
+ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc *image_target,
+-				    int note, size_t appsig_size, char **core_img, size_t *core_size,
++				    int note, size_t appsig_size, char *sbat, char **core_img, size_t *core_size,
+ 				    Elf_Addr target_addr,
+ 				    struct grub_mkimage_layout *layout)
+ {
+@@ -226,10 +234,17 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+   Elf_Ehdr *ehdr;
+   Elf_Phdr *phdr;
+   Elf_Shdr *shdr;
+-  int header_size, footer_size = 0;
++  int header_size, footer_size = 0, footer_offset = 0;
+   int phnum = 1;
+   int shnum = 4;
+   int string_size = sizeof (".text") + sizeof ("mods") + 1;
++  char *footer;
++
++  if (sbat)
++    {
++      phnum++;
++      footer_size += ALIGN_UP (sizeof (struct grub_sbat_note) + layout->sbat_size, 4);
++    }
+ 
+   if (appsig_size)
+     {
+@@ -263,6 +278,7 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+   ehdr = (void *) elf_img;
+   phdr = (void *) (elf_img + sizeof (*ehdr));
+   shdr = (void *) (elf_img + sizeof (*ehdr) + phnum * sizeof (*phdr));
++  footer = elf_img + program_size + header_size;
+   memcpy (ehdr->e_ident, ELFMAG, SELFMAG);
+   ehdr->e_ident[EI_CLASS] = ELFCLASSXX;
+   if (!image_target->bigendian)
+@@ -435,6 +451,8 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+       phdr->p_filesz = grub_host_to_target32 (XEN_NOTE_SIZE);
+       phdr->p_memsz = 0;
+       phdr->p_offset = grub_host_to_target32 (header_size + program_size);
++      footer = ptr;
++      footer_offset = XEN_NOTE_SIZE;
+     }
+ 
+   if (image_target->id == IMAGE_XEN_PVH)
+@@ -468,6 +486,8 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+       phdr->p_filesz = grub_host_to_target32 (XEN_PVH_NOTE_SIZE);
+       phdr->p_memsz = 0;
+       phdr->p_offset = grub_host_to_target32 (header_size + program_size);
++      footer = ptr;
++      footer_offset = XEN_PVH_NOTE_SIZE;
+     }
+ 
+   if (note)
+@@ -498,6 +518,30 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+       phdr->p_filesz = grub_host_to_target32 (note_size);
+       phdr->p_memsz = 0;
+       phdr->p_offset = grub_host_to_target32 (header_size + program_size);
++      footer = (elf_img + program_size + header_size + note_size);
++      footer_offset += note_size;
++    }
++
++  if (sbat)
++    {
++      int note_size = ALIGN_UP (sizeof (struct grub_sbat_note) + layout->sbat_size, 4);
++      struct grub_sbat_note *note_ptr = (struct grub_sbat_note *) footer;
++
++      note_ptr->header.n_namesz = grub_host_to_target32 (sizeof (GRUB_SBAT_NOTE_NAME));
++      note_ptr->header.n_descsz = grub_host_to_target32 (ALIGN_UP(layout->sbat_size, 4));
++      note_ptr->header.n_type = grub_host_to_target32 (GRUB_SBAT_NOTE_TYPE);
++      memcpy (note_ptr->name, GRUB_SBAT_NOTE_NAME, sizeof (GRUB_SBAT_NOTE_NAME));
++      memcpy ((char *)(note_ptr + 1), sbat, layout->sbat_size);
++
++      phdr++;
++      phdr->p_type = grub_host_to_target32 (PT_NOTE);
++      phdr->p_flags = grub_host_to_target32 (PF_R);
++      phdr->p_align = grub_host_to_target32 (image_target->voidp_sizeof);
++      phdr->p_vaddr = 0;
++      phdr->p_paddr = 0;
++      phdr->p_filesz = grub_host_to_target32 (note_size);
++      phdr->p_memsz = 0;
++      phdr->p_offset = grub_host_to_target32 (header_size + program_size + footer_offset);
+     }
+ 
+   if (appsig_size) {
+diff --git a/util/mkimage.c b/util/mkimage.c
+index f31fdefa814a..7fa6a7b21954 100644
+--- a/util/mkimage.c
++++ b/util/mkimage.c
+@@ -1848,6 +1848,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
+     case IMAGE_I386_IEEE1275:
+       {
+ 	grub_uint64_t target_addr;
++	char *sbat = NULL;
+ 	if (image_target->id == IMAGE_LOONGSON_ELF)
+ 	  {
+ 	    if (comp == GRUB_COMPRESSION_NONE)
+@@ -1859,10 +1860,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
+ 	else
+ 	  target_addr = image_target->link_addr;
+ 	if (image_target->voidp_sizeof == 4)
+-	  grub_mkimage_generate_elf32 (image_target, note, appsig_size, &core_img,
++	  grub_mkimage_generate_elf32 (image_target, note, appsig_size, sbat, &core_img,
+ 				       &core_size, target_addr, &layout);
+ 	else
+-	  grub_mkimage_generate_elf64 (image_target, note, appsig_size, &core_img,
++	  grub_mkimage_generate_elf64 (image_target, note, appsig_size, sbat, &core_img,
+ 				       &core_size, target_addr, &layout);
+       }
+       break;
diff --git a/0368-grub-mkimage-Add-SBAT-metadata-into-ELF-note-for-Pow.patch b/0368-grub-mkimage-Add-SBAT-metadata-into-ELF-note-for-Pow.patch
new file mode 100644
index 00000000..1ce74aed
--- /dev/null
+++ b/0368-grub-mkimage-Add-SBAT-metadata-into-ELF-note-for-Pow.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
+Date: Wed, 23 Oct 2024 17:54:33 +0530
+Subject: [PATCH] grub-mkimage: Add SBAT metadata into ELF note for PowerPC
+ targets
+
+The SBAT metadata is read from CSV file and transformed into an ELF note
+with the -s option.
+
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/mkimage.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/util/mkimage.c b/util/mkimage.c
+index 7fa6a7b21954..f92949d1df25 100644
+--- a/util/mkimage.c
++++ b/util/mkimage.c
+@@ -957,8 +957,8 @@ grub_install_generate_image (const char *dir, const char *prefix,
+       total_module_size += dtb_size + sizeof (struct grub_module_header);
+     }
+ 
+-  if (sbat_path != NULL && image_target->id != IMAGE_EFI)
+-    grub_util_error (_(".sbat section can be embedded into EFI images only"));
++  if (sbat_path != NULL && (image_target->id != IMAGE_EFI && image_target->id != IMAGE_PPC))
++    grub_util_error (_("SBAT data can be added only to EFI or powerpc-ieee1275 images"));
+ 
+   if (disable_shim_lock)
+     total_module_size += sizeof (struct grub_module_header);
+@@ -1849,6 +1849,13 @@ grub_install_generate_image (const char *dir, const char *prefix,
+       {
+ 	grub_uint64_t target_addr;
+ 	char *sbat = NULL;
++	if (sbat_path != NULL)
++	  {
++	    sbat_size = grub_util_get_image_size (sbat_path);
++	    sbat = xmalloc (sbat_size);
++	    grub_util_load_image (sbat_path, sbat);
++	    layout.sbat_size = sbat_size;
++	  }
+ 	if (image_target->id == IMAGE_LOONGSON_ELF)
+ 	  {
+ 	    if (comp == GRUB_COMPRESSION_NONE)
diff --git a/0369-10_linux.in-escape-kernel-option-characters-properly.patch b/0369-10_linux.in-escape-kernel-option-characters-properly.patch
new file mode 100644
index 00000000..fe245e8e
--- /dev/null
+++ b/0369-10_linux.in-escape-kernel-option-characters-properly.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 7 May 2025 13:23:37 -0600
+Subject: [PATCH] 10_linux.in: escape kernel option characters properly
+
+This handles cases where kernel options, specifically the values,
+contain special characters, in this case ';', '&' and '$'.
+
+For example, the user defines the following GRUB_CMDLINE_LINUX on the
+default grub file /etc/default/grub, note the dolar sign on the 'memmap'
+option
+
+    GRUB_CMDLINE_LINUX="console=ttyS0 memmap=32g\\\$0x2000000000"
+
+then regenerating the grub cfg and BLS options line with the
+grub2-mkconfig command, resulting into
+
+    options root=UUID=6baedf23-2510-499a-815d-48b58cf6e619 ro
+    rootflags=subvol=root console=ttyS0 memmap=32g\$0x2000000000
+
+without this patch, we would end up with
+
+    options root=UUID=6baedf23-2510-499a-815d-48b58cf6e619 ro
+    rootflags=subvol=root console=ttyS0 memmap=32g$0x2000000000
+
+Note the missing '\' which is required to escape the '$', otherwise
+it would be consider a variable by blscfg parser which is not the case.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ util/grub.d/10_linux.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 11c19304f8..cdfb72a1e3 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -178,6 +178,9 @@ update_bls_cmdline()
+             options="${options} ${GRUB_CMDLINE_LINUX_DEBUG}"
+         fi
+         options="$(echo "${options}" | sed -e 's/\//\\\//g')"
++        options="$(echo "${options}" | sed -e 's/\;/\\\;/g')"
++        options="$(echo "${options}" | sed -e 's/\\&/\\\\&/g')"
++        options="$(echo "${options}" | sed -e 's/\$/\\\$/g')"
+         sed -i -e "s/^options.*/options ${options}/" "${blsdir}/${bls}.conf"
+     done
+ }
diff --git a/0370-blscfg-check-if-variable-is-escaped-before-consideri.patch b/0370-blscfg-check-if-variable-is-escaped-before-consideri.patch
new file mode 100644
index 00000000..fba69064
--- /dev/null
+++ b/0370-blscfg-check-if-variable-is-escaped-before-consideri.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 7 May 2025 13:49:47 -0600
+Subject: [PATCH] blscfg: check if variable is escaped before considering one
+
+Otherwise escaped variables are considered real variables.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/commands/blscfg.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
+index 6e398fc175..5d931b0c9b 100644
+--- a/grub-core/commands/blscfg.c
++++ b/grub-core/commands/blscfg.c
+@@ -695,7 +695,8 @@ static char *expand_val(const char *value)
+     return NULL;
+ 
+   while (*value) {
+-    if (*value == '$') {
++    /* It's a variable only when *value is '$' and it is not escaped with '\'*/
++    if (*value == '$' && *end != '\\') {
+       if (start != end) {
+ 	buffer = field_append(is_var, buffer, start, end);
+ 	if (!buffer)
diff --git a/0371-kern-rescue_reader-Block-the-rescue-mode-until-the-C.patch b/0371-kern-rescue_reader-Block-the-rescue-mode-until-the-C.patch
new file mode 100644
index 00000000..5d588b1c
--- /dev/null
+++ b/0371-kern-rescue_reader-Block-the-rescue-mode-until-the-C.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Maxim Suhanov <dfirblog@gmail.com>
+Date: Fri, 28 Feb 2025 17:00:53 +0300
+Subject: [PATCH] kern/rescue_reader: Block the rescue mode until the CLI
+ authentication
+
+This further mitigates potential misuse of the CLI after the
+root device has been successfully unlocked via TPM.
+
+Fixes: CVE-2025-4382
+
+Signed-off-by: Maxim Suhanov <dfirblog@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/rescue_reader.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/rescue_reader.c b/grub-core/kern/rescue_reader.c
+index 4259857ba9..a71ada8fb7 100644
+--- a/grub-core/kern/rescue_reader.c
++++ b/grub-core/kern/rescue_reader.c
+@@ -79,7 +79,7 @@ void __attribute__ ((noreturn))
+ grub_rescue_run (void)
+ {
+   /* Stall if the CLI has been disabled */
+-  if (grub_is_cli_disabled ())
++  if (grub_is_cli_disabled () || grub_is_cli_need_auth ())
+     {
+       grub_printf ("Rescue mode has been disabled...\n");
+ 
diff --git a/0372-commands-search-Introduce-the-cryptodisk-only-argume.patch b/0372-commands-search-Introduce-the-cryptodisk-only-argume.patch
new file mode 100644
index 00000000..53e7eaae
--- /dev/null
+++ b/0372-commands-search-Introduce-the-cryptodisk-only-argume.patch
@@ -0,0 +1,133 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Maxim Suhanov <dfirblog@gmail.com>
+Date: Sat, 1 Mar 2025 14:16:48 +0300
+Subject: [PATCH] commands/search: Introduce the --cryptodisk-only argument
+
+This allows users to restrict the "search" command's scope to
+encrypted disks only.
+
+Typically, this command is used to "rebase" $root and $prefix
+before loading additional configuration files via "source" or
+"configfile". Unfortunately, this leads to security problems,
+like CVE-2023-4001, when an unexpected, attacker-controlled
+device is chosen by the "search" command.
+
+The --cryptodisk-only argument allows users to ensure that the
+file system picked is encrypted.
+
+This feature supports the CLI authentication, blocking bypass
+attempts.
+
+Signed-off-by: Maxim Suhanov <dfirblog@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/search.c      | 20 ++++++++++++++++++++
+ grub-core/commands/search_wrap.c |  7 ++++++-
+ grub-core/normal/main.c          |  3 ++-
+ include/grub/search.h            |  9 +++++----
+ 4 files changed, 33 insertions(+), 6 deletions(-)
+
+diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
+index d538b36219..84362b54b3 100644
+--- a/grub-core/commands/search.c
++++ b/grub-core/commands/search.c
+@@ -182,6 +182,26 @@ iterate_device (const char *name, void *data)
+       grub_device_close (dev);
+     }
+ 
++  /* Limit to encrypted disks when requested. */
++  if (ctx->flags & SEARCH_FLAGS_CRYPTODISK_ONLY)
++    {
++      grub_device_t dev;
++
++      dev = grub_device_open (name);
++      if (dev == NULL)
++	{
++	  grub_errno = GRUB_ERR_NONE;
++	  return 0;
++	}
++      if (dev->disk == NULL || dev->disk->dev->id != GRUB_DISK_DEVICE_CRYPTODISK_ID)
++	{
++	  grub_device_close (dev);
++	  grub_errno = GRUB_ERR_NONE;
++	  return 0;
++	}
++      grub_device_close (dev);
++    }
++
+   /* Skip it if it's not the root device when requested. */
+   if (ctx->flags & SEARCH_FLAGS_ROOTDEV_ONLY)
+     {
+diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
+index 4fe6440c65..ec2fb638f1 100644
+--- a/grub-core/commands/search_wrap.c
++++ b/grub-core/commands/search_wrap.c
+@@ -41,6 +41,7 @@ static const struct grub_arg_option options[] =
+      ARG_TYPE_STRING},
+     {"no-floppy",	'n', 0, N_("Do not probe any floppy drive."), 0, 0},
+     {"efidisk-only",	0, 0, N_("Only probe EFI disks."), 0, 0},
++    {"cryptodisk-only",	0, 0, N_("Only probe encrypted disks."), 0, 0},
+     {"root-dev-only",  'r', 0, N_("Only probe root device."), 0, 0},
+     {"hint",	        'h', GRUB_ARG_OPTION_REPEATABLE,
+      N_("First try the device HINT. If HINT ends in comma, "
+@@ -76,6 +77,7 @@ enum options
+     SEARCH_SET,
+     SEARCH_NO_FLOPPY,
+     SEARCH_EFIDISK_ONLY,
++    SEARCH_CRYPTODISK_ONLY,
+     SEARCH_ROOTDEV_ONLY,
+     SEARCH_HINT,
+     SEARCH_HINT_IEEE1275,
+@@ -191,6 +193,9 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
+   if (state[SEARCH_EFIDISK_ONLY].set)
+     flags |= SEARCH_FLAGS_EFIDISK_ONLY;
+ 
++  if (state[SEARCH_CRYPTODISK_ONLY].set)
++    flags |= SEARCH_FLAGS_CRYPTODISK_ONLY;
++
+   if (state[SEARCH_ROOTDEV_ONLY].set)
+     flags |= SEARCH_FLAGS_ROOTDEV_ONLY;
+ 
+@@ -215,7 +220,7 @@ GRUB_MOD_INIT(search)
+   cmd =
+     grub_register_extcmd ("search", grub_cmd_search,
+ 			  GRUB_COMMAND_FLAG_EXTRACTOR | GRUB_COMMAND_ACCEPT_DASH,
+-			  N_("[-f|-l|-u|-s|-n] [--hint HINT [--hint HINT] ...]"
++			  N_("[-f|-l|-u|-s|-n] [--cryptodisk-only] [--hint HINT [--hint HINT] ...]"
+ 			     " NAME"),
+ 			  N_("Search devices by file, filesystem label"
+ 			     " or filesystem UUID."
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index dd20e51290..6f7290a897 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -615,7 +615,8 @@ static const char *features[] = {
+   "feature_chainloader_bpb", "feature_ntldr", "feature_platform_search_hint",
+   "feature_default_font_path", "feature_all_video_module",
+   "feature_menuentry_id", "feature_menuentry_options", "feature_200_final",
+-  "feature_nativedisk_cmd", "feature_timeout_style"
++  "feature_nativedisk_cmd", "feature_timeout_style",
++  "feature_search_cryptodisk_only"  
+ };
+ 
+ GRUB_MOD_INIT(normal)
+diff --git a/include/grub/search.h b/include/grub/search.h
+index 9343c66b13..b6b5c8be1f 100644
+--- a/include/grub/search.h
++++ b/include/grub/search.h
+@@ -21,10 +21,11 @@
+ 
+ enum search_flags
+   {
+-    SEARCH_FLAGS_NONE		= 0,
+-    SEARCH_FLAGS_NO_FLOPPY	= 1,
+-    SEARCH_FLAGS_EFIDISK_ONLY	= 2,
+-    SEARCH_FLAGS_ROOTDEV_ONLY	= 4
++    SEARCH_FLAGS_NONE            = 0,
++    SEARCH_FLAGS_NO_FLOPPY       = 1,
++    SEARCH_FLAGS_EFIDISK_ONLY    = 2,
++    SEARCH_FLAGS_ROOTDEV_ONLY    = 4,
++    SEARCH_FLAGS_CRYPTODISK_ONLY = 8
+   };
+ 
+ void grub_search_fs_file (const char *key, const char *var,
diff --git a/0373-disk-diskfilter-Introduce-the-cryptocheck-command.patch b/0373-disk-diskfilter-Introduce-the-cryptocheck-command.patch
new file mode 100644
index 00000000..a56fc858
--- /dev/null
+++ b/0373-disk-diskfilter-Introduce-the-cryptocheck-command.patch
@@ -0,0 +1,133 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Maxim Suhanov <dfirblog@gmail.com>
+Date: Sun, 2 Mar 2025 18:08:22 +0300
+Subject: [PATCH] disk/diskfilter: Introduce the "cryptocheck" command
+
+This command examines a given diskfilter device, e.g., an LVM disk,
+and checks if underlying disks, physical volumes, are cryptodisks,
+e.g., LUKS disks, this layout is called "LVM-on-LUKS".
+
+The return value is 0 when all underlying disks (of a given device)
+are cryptodisks (1 if at least one disk is unencrypted or in an
+unknown state).
+
+Users are encouraged to include the relevant check before loading
+anything from an LVM disk that is supposed to be encrypted.
+
+This further supports the CLI authentication, blocking bypass
+attempts when booting from an encrypted LVM disk.
+
+Signed-off-by: Maxim Suhanov <dfirblog@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/disk/diskfilter.c | 75 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 75 insertions(+)
+
+diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
+index fef0b815ab..216be6a782 100644
+--- a/grub-core/disk/diskfilter.c
++++ b/grub-core/disk/diskfilter.c
+@@ -20,6 +20,7 @@
+ #include <grub/dl.h>
+ #include <grub/disk.h>
+ #include <grub/mm.h>
++#include <grub/command.h>
+ #include <grub/err.h>
+ #include <grub/misc.h>
+ #include <grub/diskfilter.h>
+@@ -1365,6 +1366,73 @@ grub_diskfilter_get_pv_from_disk (grub_disk_t disk,
+ }
+ #endif
+ 
++static int
++grub_diskfilter_check_pvs_encrypted (grub_disk_t disk, int *pvs_cnt)
++{
++  struct grub_diskfilter_lv *lv = disk->data;
++  struct grub_diskfilter_pv *pv;
++
++  *pvs_cnt = 0;
++
++  if (lv->vg->pvs)
++    for (pv = lv->vg->pvs; pv; pv = pv->next)
++      {
++        (*pvs_cnt)++;
++
++        if (pv->disk == NULL)
++          {
++            /* Can be a partially activated VG, bail out. */
++            return GRUB_ERR_TEST_FAILURE;
++          }
++
++        if (pv->disk->dev->id != GRUB_DISK_DEVICE_CRYPTODISK_ID)
++          {
++            /* All backing devices must be cryptodisks, stop. */
++            return GRUB_ERR_TEST_FAILURE;
++          }
++      }
++  return GRUB_ERR_NONE;
++}
++
++static grub_err_t
++grub_cmd_cryptocheck (grub_command_t cmd __attribute__ ((unused)),
++               int argc, char **args)
++{
++  grub_disk_t disk;
++  int check_pvs_res;
++  int namelen;
++  int pvs_cnt;
++
++  if (argc != 1)
++    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("disk name expected"));
++
++  namelen = grub_strlen (args[0]);
++  if (namelen > 2 && (args[0][0] == '(') && (args[0][namelen - 1] == ')'))
++    args[0][namelen - 1] = 0;
++  else
++    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("invalid disk: %s"),
++                       args[0]);
++
++  if (!is_valid_diskfilter_name (&args[0][1]))
++    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("unrecognized disk: %s"),
++                       &args[0][1]);
++
++  disk = grub_disk_open (&args[0][1]);
++  if (disk == NULL)
++    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("no such disk: %s"),
++                       &args[0][1]);
++
++  check_pvs_res = grub_diskfilter_check_pvs_encrypted (disk, &pvs_cnt);
++  grub_disk_close (disk);
++
++  grub_printf("%s is %sencrypted (%d pv%s examined)\n", &args[0][1],
++              (check_pvs_res == GRUB_ERR_NONE) ? "" : "un",
++              pvs_cnt,
++              (pvs_cnt > 1) ? "s" : "");
++
++  return check_pvs_res;
++}
++
+ static struct grub_disk_dev grub_diskfilter_dev =
+   {
+     .name = "diskfilter",
+@@ -1381,14 +1449,21 @@ static struct grub_disk_dev grub_diskfilter_dev =
+     .next = 0
+   };
+ 
++static grub_command_t cmd;
++
+ 
+ GRUB_MOD_INIT(diskfilter)
+ {
+   grub_disk_dev_register (&grub_diskfilter_dev);
++  cmd = grub_register_command ("cryptocheck", grub_cmd_cryptocheck,
++                                N_("DEVICE"),
++                                N_("Check if a logical volume resides on encrypted disks."));
+ }
+ 
+ GRUB_MOD_FINI(diskfilter)
+ {
+   grub_disk_dev_unregister (&grub_diskfilter_dev);
++  if (cmd != NULL)
++    grub_unregister_command (cmd);
+   free_array ();
+ }
diff --git a/0374-commands-search-Add-the-diskfilter-support.patch b/0374-commands-search-Add-the-diskfilter-support.patch
new file mode 100644
index 00000000..5edb3ea8
--- /dev/null
+++ b/0374-commands-search-Add-the-diskfilter-support.patch
@@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Maxim Suhanov <dfirblog@gmail.com>
+Date: Sun, 2 Mar 2025 23:32:43 +0300
+Subject: [PATCH] commands/search: Add the diskfilter support
+
+When the --cryptodisk-only argument is given, also check the target
+device using the "cryptocheck" command, if available.
+
+This extends the checks to common layouts like LVM-on-LUKS, so the
+--cryptodisk-only argument transparently handles such setups.
+
+Signed-off-by: Maxim Suhanov <dfirblog@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/commands/search.c | 32 +++++++++++++++++++++++++++++++-
+ 1 file changed, 31 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
+index 84362b54b3..1cf714ad7d 100644
+--- a/grub-core/commands/search.c
++++ b/grub-core/commands/search.c
+@@ -150,6 +150,36 @@ check_for_duplicate (const char *name, void *data)
+   return ret;
+ }
+ 
++static bool
++is_unencrypted_disk (grub_disk_t disk)
++{
++  grub_command_t cmd;
++  char *disk_str;
++  int disk_str_len;
++  int res;
++
++  if (disk->dev->id == GRUB_DISK_DEVICE_CRYPTODISK_ID)
++    return false; /* This is (crypto) disk. */
++
++  if (disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID)
++    {
++      cmd = grub_command_find ("cryptocheck");
++      if (cmd == NULL) /* No diskfilter module loaded for some reason. */
++        return true;
++
++      disk_str_len = grub_strlen (disk->name) + 2 + 1;
++      disk_str = grub_malloc (disk_str_len);
++      if (disk_str == NULL) /* Something is wrong, better report as unencrypted. */
++        return true;
++
++      grub_snprintf (disk_str, disk_str_len, "(%s)", disk->name);
++      res = cmd->func (cmd, 1, &disk_str);
++      grub_free (disk_str);
++      return (res != GRUB_ERR_NONE) ? true : false; /* GRUB_ERR_NONE for encrypted. */
++    }
++  return true;
++}
++
+ /* Helper for FUNC_NAME.  */
+ static int
+ iterate_device (const char *name, void *data)
+@@ -193,7 +223,7 @@ iterate_device (const char *name, void *data)
+ 	  grub_errno = GRUB_ERR_NONE;
+ 	  return 0;
+ 	}
+-      if (dev->disk == NULL || dev->disk->dev->id != GRUB_DISK_DEVICE_CRYPTODISK_ID)
++      if (dev->disk == NULL || is_unencrypted_disk (dev->disk) == true)
+ 	{
+ 	  grub_device_close (dev);
+ 	  grub_errno = GRUB_ERR_NONE;
diff --git a/0375-docs-Document-available-crypto-disks-checks.patch b/0375-docs-Document-available-crypto-disks-checks.patch
new file mode 100644
index 00000000..ac22920f
--- /dev/null
+++ b/0375-docs-Document-available-crypto-disks-checks.patch
@@ -0,0 +1,68 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Maxim Suhanov <dfirblog@gmail.com>
+Date: Mon, 10 Mar 2025 15:33:46 +0300
+Subject: [PATCH] docs: Document available crypto disks checks
+
+Document the --cryptodisk-only argument. Also, document the
+"cryptocheck" command invoked when that argument is processed.
+
+Signed-off-by: Maxim Suhanov <dfirblog@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ docs/grub.texi | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/docs/grub.texi b/docs/grub.texi
+index 2d6d73a78d..93e23be99d 100644
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -4365,6 +4365,7 @@ you forget a command, you can run the command @command{help}
+ * configfile::                  Load a configuration file
+ * cpuid::                       Check for CPU features
+ * crc::                         Compute or check CRC32 checksums
++* cryptocheck::                 Check if a device is encrypted
+ * cryptomount::                 Mount a crypto device
+ * cutmem::                      Remove memory regions
+ * date::                        Display or set current date and time
+@@ -4674,6 +4675,16 @@ Alias for @code{hashsum --hash crc32 arg @dots{}}. See command @command{hashsum}
+ (@pxref{hashsum}) for full description.
+ @end deffn
+ 
++@node cryptocheck
++@subsection cryptocheck
++
++@deffn Command cryptocheck device
++Check if a given diskfilter device is backed by encrypted devices
++(@pxref{cryptomount} for additional information).
++
++The command examines all backing devices, physical volumes, of a specified
++logical volume, like LVM2, and fails when at least one of them is unencrypted.
++@end deffn
+ 
+ @node cryptomount
+ @subsection cryptomount
+@@ -5522,7 +5533,8 @@ unbootable. @xref{Using GPG-style digital signatures}, for more information.
+ 
+ @deffn Command search @
+  [@option{--file}|@option{--label}|@option{--fs-uuid}] @
+- [@option{--set} [var]] [@option{--no-floppy}|@option{--efidisk-only}] name
++ [@option{--set} [var]] [@option{--no-floppy}|@option{--efidisk-only}|@option{--cryptodisk-only}] @
++ name
+ Search devices by file (@option{-f}, @option{--file}), filesystem label
+ (@option{-l}, @option{--label}), or filesystem UUID (@option{-u},
+ @option{--fs-uuid}).
+@@ -5537,6 +5549,14 @@ devices, which can be slow.
+ The (@option{--efidisk-only}) option prevents searching any other devices then
+ EFI disks. This is typically used when chainloading to local EFI partition.
+ 
++The (@option{--cryptodisk-only}) option prevents searching any devices other
++than encrypted disks. This is typically used when booting from an encrypted
++file system to ensure that no code gets executed from an unencrypted device
++having the same filesystem UUID or label.
++
++This option implicitly invokes the command @command{cryptocheck}, if it is
++available (@pxref{cryptocheck} for additional information).
++
+ The @samp{search.file}, @samp{search.fs_label}, and @samp{search.fs_uuid}
+ commands are aliases for @samp{search --file}, @samp{search --label}, and
+ @samp{search --fs-uuid} respectively.
diff --git a/0376-disk-cryptodisk-Add-the-erase-secrets-function.patch b/0376-disk-cryptodisk-Add-the-erase-secrets-function.patch
new file mode 100644
index 00000000..5a995cf3
--- /dev/null
+++ b/0376-disk-cryptodisk-Add-the-erase-secrets-function.patch
@@ -0,0 +1,147 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Maxim Suhanov <dfirblog@gmail.com>
+Date: Tue, 6 May 2025 12:25:20 -0600
+Subject: [PATCH] disk/cryptodisk: Add the "erase secrets" function
+
+This commit adds the grub_cryptodisk_erasesecrets() function to wipe
+master keys from all cryptodisks. This function is EFI-only.
+
+Since there is no easy way to "force unmount" a given encrypted disk,
+this function renders all mounted cryptodisks unusable. An attempt to
+read them will return garbage.
+
+This is why this function must be used in "no way back" conditions.
+
+Currently, it is used when unloading the cryptodisk module and when
+performing the "exit" command (it is often used to switch to the next
+EFI application). This function is not called when performing the
+"chainloader" command, because the callee may return to GRUB. For this
+reason, users are encouraged to use "exit" instead of "chainloader" to
+execute third-party boot applications.
+
+This function does not guarantee that all secrets are wiped from RAM.
+Console output, chunks from disk read requests and other may remain.
+
+This function does not clear the IV prefix and rekey key for geli disks.
+
+Also, this commit adds the relevant documentation improvements.
+
+Signed-off-by: Maxim Suhanov <dfirblog@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ docs/grub.texi               |  6 ++++++
+ grub-core/commands/minicmd.c | 11 +++++++++++
+ grub-core/disk/cryptodisk.c  | 28 ++++++++++++++++++++++++++++
+ include/grub/cryptodisk.h    |  1 +
+ 4 files changed, 46 insertions(+)
+
+diff --git a/docs/grub.texi b/docs/grub.texi
+index 93e23be99d..0af47b5ade 100644
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -4721,6 +4721,11 @@ namespace in addition to the cryptodisk namespace.
+ 
+ Support for plain encryption mode (plain dm-crypt) is provided via separate
+ @command{@pxref{plainmount}} command.
++
++On the EFI platform, GRUB tries to erase master keys from memory when the cryptodisk
++module is unloaded or the command @command{exit} is executed. All secrets remain in
++memory when the command @command{chainloader} is issued, because execution can
++return to GRUB on the EFI platform.
+ @end deffn
+ 
+ @node cutmem
+@@ -6982,6 +6987,7 @@ USB support provides benefits similar to ATA (for USB disks) or AT (for USB
+ keyboards). In addition it allows USBserial.
+ 
+ Chainloading refers to the ability to load another bootloader through the same protocol
++and on some platforms, like EFI, allow that bootloader to return to the GRUB.
+ 
+ Hints allow faster disk discovery by already knowing in advance which is the disk in
+ question. On some platforms hints are correct unless you move the disk between boots.
+diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
+index 9efb7718c3..eb786766a8 100644
+--- a/grub-core/commands/minicmd.c
++++ b/grub-core/commands/minicmd.c
+@@ -29,6 +29,10 @@
+ #include <grub/command.h>
+ #include <grub/i18n.h>
+ 
++#ifdef GRUB_MACHINE_EFI
++#include <grub/cryptodisk.h>
++#endif
++
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+ /* cat FILE */
+@@ -199,6 +203,13 @@ grub_mini_cmd_exit (struct grub_command *cmd __attribute__ ((unused)),
+ 	retval = n;
+     }
+ 
++#ifdef GRUB_MACHINE_EFI
++  /*
++   * The "exit" command is often used to launch the next boot application.
++   * So, erase the secrets.
++   */
++  grub_cryptodisk_erasesecrets ();
++#endif
+   grub_exit (retval);
+   /* Not reached.  */
+ }
+diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
+index 8727760100..9597d2d3bd 100644
+--- a/grub-core/disk/cryptodisk.c
++++ b/grub-core/disk/cryptodisk.c
+@@ -1677,6 +1677,31 @@ grub_cryptodisk_challenge_password (void)
+ 
+   return GRUB_ERR_NONE;
+ }
++
++void
++grub_cryptodisk_erasesecrets (void)
++{
++  grub_cryptodisk_t i;
++  grub_uint8_t *buf;
++
++  buf = grub_zalloc (GRUB_CRYPTODISK_MAX_KEYLEN);
++  if (buf == NULL)
++    grub_fatal ("grub_cryptodisk_erasesecrets: cannot allocate memory");
++
++  for (i = cryptodisk_list; i != NULL; i = i->next)
++    if (grub_cryptodisk_setkey (i, buf, i->keysize))
++      grub_fatal ("grub_cryptodisk_erasesecrets: cannot erase secrets for %s", i->source);
++    else
++      grub_printf ("Erased crypto secrets for %s\n", i->source);
++      /*
++       * Unfortunately, there is no way to "force unmount" a given disk, it may
++       * have mounted "child" disks as well, e.g., an LVM volume. So, this
++       * function MUST be called when there is no way back, e.g., when exiting.
++       * Otherwise, subsequent read calls for a cryptodisk will return garbage.
++       */
++
++  grub_free (buf);
++}
+ #endif /* GRUB_MACHINE_EFI */
+ 
+ struct grub_procfs_entry luks_script =
+@@ -1700,6 +1725,9 @@ GRUB_MOD_INIT (cryptodisk)
+ 
+ GRUB_MOD_FINI (cryptodisk)
+ {
++#ifdef GRUB_MACHINE_EFI
++  grub_cryptodisk_erasesecrets ();
++#endif
+   grub_disk_dev_unregister (&grub_cryptodisk_dev);
+   cryptodisk_cleanup ();
+   grub_unregister_extcmd (cmd);
+diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h
+index d2572f8b05..ef307dfd5d 100644
+--- a/include/grub/cryptodisk.h
++++ b/include/grub/cryptodisk.h
+@@ -189,5 +189,6 @@ grub_cryptodisk_t grub_cryptodisk_get_by_source_disk (grub_disk_t disk);
+ 
+ #ifdef GRUB_MACHINE_EFI
+ grub_err_t grub_cryptodisk_challenge_password (void);
++void grub_cryptodisk_erasesecrets (void);
+ #endif
+ #endif
diff --git a/0377-disk-cryptodisk-Wipe-the-passphrase-from-memory.patch b/0377-disk-cryptodisk-Wipe-the-passphrase-from-memory.patch
new file mode 100644
index 00000000..17405318
--- /dev/null
+++ b/0377-disk-cryptodisk-Wipe-the-passphrase-from-memory.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Maxim Suhanov <dfirblog@gmail.com>
+Date: Tue, 4 Mar 2025 15:27:59 +0300
+Subject: [PATCH] disk/cryptodisk: Wipe the passphrase from memory
+
+Switching to another EFI boot application while there are secrets in
+RAM is dangerous, because not all firmware is wiping memory on free.
+
+To reduce the attack surface, wipe the passphrase acquired when
+unlocking an encrypted volume.
+
+Signed-off-by: Maxim Suhanov <dfirblog@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/disk/cryptodisk.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
+index 9597d2d3bd..26457095d3 100644
+--- a/grub-core/disk/cryptodisk.c
++++ b/grub-core/disk/cryptodisk.c
+@@ -1164,6 +1164,7 @@ grub_cryptodisk_scan_device_real (const char *name,
+ 
+   if (askpass)
+     {
++      grub_memset (cargs->key_data, 0, cargs->key_len);
+       cargs->key_len = 0;
+       grub_free (cargs->key_data);
+     }
diff --git a/0378-cryptocheck-Add-quiet-option.patch b/0378-cryptocheck-Add-quiet-option.patch
new file mode 100644
index 00000000..b62c6403
--- /dev/null
+++ b/0378-cryptocheck-Add-quiet-option.patch
@@ -0,0 +1,114 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Fri, 14 Mar 2025 19:03:39 +0800
+Subject: [PATCH] cryptocheck: Add --quiet option
+
+The option can be used to suppress output if we only want to test the
+return value of the command.
+
+Also, mention this option in the documentation.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Signed-off-by: Maxim Suhanov <dfirblog@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ docs/grub.texi              |  4 +++-
+ grub-core/commands/search.c |  7 ++++++-
+ grub-core/disk/diskfilter.c | 25 +++++++++++++++++++------
+ 3 files changed, 28 insertions(+), 8 deletions(-)
+
+diff --git a/docs/grub.texi b/docs/grub.texi
+index 0af47b5ade..ae01e8c994 100644
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -4678,12 +4678,14 @@ Alias for @code{hashsum --hash crc32 arg @dots{}}. See command @command{hashsum}
+ @node cryptocheck
+ @subsection cryptocheck
+ 
+-@deffn Command cryptocheck device
++@deffn Command cryptocheck [ @option{--quiet} ] device
+ Check if a given diskfilter device is backed by encrypted devices
+ (@pxref{cryptomount} for additional information).
+ 
+ The command examines all backing devices, physical volumes, of a specified
+ logical volume, like LVM2, and fails when at least one of them is unencrypted.
++
++The option @option{--quiet} can be given to suppress the output.
+ @end deffn
+ 
+ @node cryptomount
+diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
+index 1cf714ad7d..c432c0ac6f 100644
+--- a/grub-core/commands/search.c
++++ b/grub-core/commands/search.c
+@@ -163,6 +163,9 @@ is_unencrypted_disk (grub_disk_t disk)
+ 
+   if (disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID)
+     {
++      char opt[] = "--quiet";
++      char *args[2];
++
+       cmd = grub_command_find ("cryptocheck");
+       if (cmd == NULL) /* No diskfilter module loaded for some reason. */
+         return true;
+@@ -173,7 +176,9 @@ is_unencrypted_disk (grub_disk_t disk)
+         return true;
+ 
+       grub_snprintf (disk_str, disk_str_len, "(%s)", disk->name);
+-      res = cmd->func (cmd, 1, &disk_str);
++      args[0] = opt;
++      args[1] = disk_str;
++      res = cmd->func (cmd, 2, args);
+       grub_free (disk_str);
+       return (res != GRUB_ERR_NONE) ? true : false; /* GRUB_ERR_NONE for encrypted. */
+     }
+diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
+index 216be6a782..04b64aebc6 100644
+--- a/grub-core/disk/diskfilter.c
++++ b/grub-core/disk/diskfilter.c
+@@ -1402,6 +1402,19 @@ grub_cmd_cryptocheck (grub_command_t cmd __attribute__ ((unused)),
+   int check_pvs_res;
+   int namelen;
+   int pvs_cnt;
++  int opt_quiet = 0;
++
++  if (argc == 2)
++    {
++      if (grub_strcmp (args[0], "--quiet") == 0)
++	{
++	  opt_quiet = 1;
++	  argc--;
++	  args++;
++	}
++      else
++	return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("unrecognized option: %s"), args[0]);
++    }
+ 
+   if (argc != 1)
+     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("disk name expected"));
+@@ -1424,11 +1437,11 @@ grub_cmd_cryptocheck (grub_command_t cmd __attribute__ ((unused)),
+ 
+   check_pvs_res = grub_diskfilter_check_pvs_encrypted (disk, &pvs_cnt);
+   grub_disk_close (disk);
+-
+-  grub_printf("%s is %sencrypted (%d pv%s examined)\n", &args[0][1],
+-              (check_pvs_res == GRUB_ERR_NONE) ? "" : "un",
+-              pvs_cnt,
+-              (pvs_cnt > 1) ? "s" : "");
++  if (!opt_quiet)
++    grub_printf ("%s is %sencrypted (%d pv%s examined)\n", &args[0][1],
++		 (check_pvs_res == GRUB_ERR_NONE) ? "" : "un",
++		 pvs_cnt,
++		 (pvs_cnt > 1) ? "s" : "");
+ 
+   return check_pvs_res;
+ }
+@@ -1456,7 +1469,7 @@ GRUB_MOD_INIT(diskfilter)
+ {
+   grub_disk_dev_register (&grub_diskfilter_dev);
+   cmd = grub_register_command ("cryptocheck", grub_cmd_cryptocheck,
+-                                N_("DEVICE"),
++                                N_("[--quiet] DEVICE"),
+                                 N_("Check if a logical volume resides on encrypted disks."));
+ }
+ 
diff --git a/0379-loader-efi-chainloader-Fix-double-free.patch b/0379-loader-efi-chainloader-Fix-double-free.patch
new file mode 100644
index 00000000..ae51483b
--- /dev/null
+++ b/0379-loader-efi-chainloader-Fix-double-free.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Frauendorfer | Miray Software <tf@miray.de>
+Date: Wed, 21 May 2025 10:56:19 +0200
+Subject: [PATCH] loader/efi/chainloader: Fix double free
+
+Signed-off-by: Thomas Frauendorfer | Miray Software <tf@miray.de>
+Reviewed-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ grub-core/loader/efi/chainloader.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index 7652f5a..0a78d0d 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -1193,9 +1193,6 @@ fail:
+   if (address)
+     grub_efi_free_pages (address, pages);
+ 
+-  if (cmdline)
+-    grub_free (cmdline);
+-
+   if (image_handle != NULL)
+     grub_efi_unload_image (image_handle);
+ 
diff --git a/0380-loader-efi-chainloader-Fix-null-pointer-dereference.patch b/0380-loader-efi-chainloader-Fix-null-pointer-dereference.patch
new file mode 100644
index 00000000..1a5048ab
--- /dev/null
+++ b/0380-loader-efi-chainloader-Fix-null-pointer-dereference.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Frauendorfer | Miray Software <tf@miray.de>
+Date: Tue, 20 May 2025 09:20:46 +0200
+Subject: [PATCH] loader/efi/chainloader: Fix null pointer dereference
+
+This fixes a null pointer access during netboot
+introduced in
+* Allow chainloading EFI apps from loop mounts.
+
+The commit accesses dev->disk without testing it.
+But when booting through network dev->disk will be NULL
+
+Signed-off-by: Thomas Frauendorfer | Miray Software <tf@miray.de>
+Reviewed-by: Nicolas Frayer <nfrayer@redhat.com>
+---
+ grub-core/loader/efi/chainloader.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
+index 0a78d0d..a004020 100644
+--- a/grub-core/loader/efi/chainloader.c
++++ b/grub-core/loader/efi/chainloader.c
+@@ -1006,7 +1006,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+     grub_free (devname);
+ 
+   /* if device is loopback, use underlying dev */
+-  if (dev && dev->disk->dev->id == GRUB_DISK_DEVICE_LOOPBACK_ID)
++  if (dev && dev->disk && dev->disk->dev->id == GRUB_DISK_DEVICE_LOOPBACK_ID)
+     {
+       struct grub_loopback *d;
+       orig_dev = dev;
diff --git a/0381-osdep-linux-getroot-Detect-DDF-container-similar-to-.patch b/0381-osdep-linux-getroot-Detect-DDF-container-similar-to-.patch
new file mode 100644
index 00000000..95628b3b
--- /dev/null
+++ b/0381-osdep-linux-getroot-Detect-DDF-container-similar-to-.patch
@@ -0,0 +1,86 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
+Date: Thu, 24 Apr 2025 11:43:28 +0200
+Subject: [PATCH] osdep/linux/getroot: Detect DDF container similar to IMSM
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Similarly to Intel IMSM, there are BIOS and UEFI implementations that
+support DDF containers natively.
+
+DDF and IMSM are very similar in handling, especially these should not
+be considered as RAID abstraction. This fixes the requirement of having
+a device map when probing DDF containers.
+
+Fixes: https://issues.redhat.com/browse/RHEL-44336
+
+Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/osdep/linux/getroot.c | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
+index b832593213e6..4bf386b590b5 100644
+--- a/grub-core/osdep/linux/getroot.c
++++ b/grub-core/osdep/linux/getroot.c
+@@ -127,7 +127,7 @@ struct btrfs_ioctl_search_args {
+                                struct btrfs_ioctl_fs_info_args)
+ 
+ static int
+-grub_util_is_imsm (const char *os_dev);
++grub_util_is_imsm_or_ddf (const char *os_dev);
+ 
+ 
+ #define ESCAPED_PATH_MAX (4 * PATH_MAX)
+@@ -759,10 +759,10 @@ out:
+ }
+ 
+ static int
+-grub_util_is_imsm (const char *os_dev)
++grub_util_is_imsm_or_ddf (const char *os_dev)
+ {
+   int retry;
+-  int is_imsm = 0;
++  int is_imsm_or_ddf = 0;
+   int container_seen = 0;
+   const char *dev = os_dev;
+ 
+@@ -823,10 +823,17 @@ grub_util_is_imsm (const char *os_dev)
+ 	  if (strncmp (buf, "MD_METADATA=imsm",
+ 		       sizeof ("MD_METADATA=imsm") - 1) == 0)
+ 	    {
+-	      is_imsm = 1;
++	      is_imsm_or_ddf = 1;
+ 	      grub_util_info ("%s is imsm", dev);
+ 	      break;
+ 	    }
++	  if (strncmp (buf, "MD_METADATA=ddf",
++		       sizeof ("MD_METADATA=ddf") - 1) == 0)
++	    {
++	      is_imsm_or_ddf = 1;
++	      grub_util_info ("%s is ddf", dev);
++	      break;
++	    }
+ 	}
+ 
+       free (buf);
+@@ -837,7 +844,7 @@ grub_util_is_imsm (const char *os_dev)
+ 
+   if (dev != os_dev)
+     free ((void *) dev);
+-  return is_imsm;
++  return is_imsm_or_ddf;
+ }
+ 
+ char *
+@@ -1202,7 +1209,7 @@ grub_util_get_dev_abstraction_os (const char *os_dev)
+ 
+   /* Check for RAID.  */
+   if (!strncmp (os_dev, "/dev/md", 7) && ! grub_util_device_is_mapped (os_dev)
+-      && !grub_util_is_imsm (os_dev))
++      && !grub_util_is_imsm_or_ddf (os_dev))
+     return GRUB_DEV_ABSTRACTION_RAID;
+   return GRUB_DEV_ABSTRACTION_NONE;
+ }
diff --git a/0382-Set-correctly-the-memory-attributes-for-the-kernel-P.patch b/0382-Set-correctly-the-memory-attributes-for-the-kernel-P.patch
new file mode 100644
index 00000000..6fe22da7
--- /dev/null
+++ b/0382-Set-correctly-the-memory-attributes-for-the-kernel-P.patch
@@ -0,0 +1,291 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Tue, 29 Jul 2025 09:43:37 -0600
+Subject: [PATCH] Set correctly the memory attributes for the kernel PE
+ sections
+
+Currently the whole kernel memory region is set to RO, so at some
+point when execution is passed to the kernel, the latter faults on a
+memory write access, e.g. zeroing .bss section. The proposed change
+sets the memory attribute appropriately for each kernel PE section.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/loader/efi/linux.c      | 170 +++++++++++++++++++++++++++-----------
+ grub-core/loader/i386/efi/linux.c |   5 +-
+ include/grub/efi/linux.h          |   6 ++
+ 3 files changed, 134 insertions(+), 47 deletions(-)
+
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index ef55556f2d..111edf0e1d 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -36,6 +36,7 @@
+ #include <grub/efi/sb.h>
+ #include <grub/i18n.h>
+ #include <grub/lib/cmdline.h>
++#include <grub/safemath.h>
+ #include <grub/verify.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+@@ -202,22 +203,133 @@ grub_efi_check_nx_required (int *nx_required)
+ typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
+ 
+ grub_err_t
+-grub_efi_linux_boot (grub_addr_t k_address, grub_size_t k_size,
++grub_efi_mem_set_att(grub_addr_t k_address, grub_size_t k_size,
++                     grub_size_t k_start, int nx_supported)
++{
++  grub_addr_t k_start_address = k_address + k_start;
++
++  grub_uint64_t default_set_attrs = GRUB_MEM_ATTR_R | GRUB_MEM_ATTR_W | GRUB_MEM_ATTR_X;
++  grub_uint64_t default_clear_attrs = 0;
++  grub_uint64_t stack_set_attrs = default_set_attrs;
++  grub_uint64_t stack_clear_attrs = default_clear_attrs;
++  grub_uint64_t kernel_set_attrs = default_set_attrs;
++  grub_uint64_t kernel_clear_attrs = default_clear_attrs;
++  grub_uint64_t attrs;
++
++  struct grub_msdos_image_header *header;
++  struct grub_pe_image_header *pe_image_header;
++  struct grub_pe32_coff_header *coff_header;
++  struct grub_pe32_section_table *section, *sections;
++  grub_uint16_t i;
++  grub_size_t sz;
++
++  header = (struct grub_msdos_image_header *)k_address;
++
++  if (grub_add ((grub_addr_t) header, header->pe_image_header_offset, &sz))
++    return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("Error on PE image header address calculation"));
++
++  pe_image_header = (struct grub_pe_image_header *) (sz);
++
++  if (pe_image_header > (k_address + k_size))
++    return grub_error (GRUB_ERR_BAD_OS, N_("PE image header address is invalid"));
++
++  if (grub_memcmp (pe_image_header->signature, GRUB_PE32_SIGNATURE,
++                   GRUB_PE32_SIGNATURE_SIZE) != 0)
++    return grub_error (GRUB_ERR_BAD_OS, N_("kernel PE magic is invalid"));
++
++  coff_header = &(pe_image_header->coff_header);
++  grub_dprintf ("nx", "coff_header 0x%"PRIxGRUB_ADDR" machine %08x\n", (grub_addr_t)coff_header, coff_header->machine);
++
++  if (grub_add ((grub_addr_t) coff_header, sizeof (*coff_header), &sz) ||
++      grub_add (sz, coff_header->optional_header_size, &sz))
++    return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("Error on PE sections calculation"));
++
++  sections = (struct grub_pe32_section_table *) (sz);
++
++  if (sections > (k_address + k_size))
++    return grub_error (GRUB_ERR_BAD_OS, N_("Section address is invalid"));
++
++  /* Parse the PE, remove W for code section, remove X for data sections, RO for the rest */
++  for (i = 0, section = sections; i < coff_header->num_sections; i++, section++)
++    {
++      kernel_set_attrs = default_set_attrs;
++      kernel_clear_attrs = default_clear_attrs;
++
++      if (nx_supported)
++        {
++          if (section->characteristics & GRUB_PE32_SCN_MEM_EXECUTE)
++            {
++              /* RX section */
++              kernel_set_attrs &= ~GRUB_MEM_ATTR_W;
++              kernel_clear_attrs |= GRUB_MEM_ATTR_W;
++            }
++          else if (section->characteristics & GRUB_PE32_SCN_MEM_WRITE)
++            {
++              /* RW section */
++              kernel_set_attrs &= ~GRUB_MEM_ATTR_X;
++              kernel_clear_attrs |= GRUB_MEM_ATTR_X;
++            }
++          else
++            {
++              /* RO section */
++              kernel_set_attrs &= ~GRUB_MEM_ATTR_W & ~GRUB_MEM_ATTR_X;
++              kernel_clear_attrs |= GRUB_MEM_ATTR_X | GRUB_MEM_ATTR_W ;
++            }
++        }
++
++      /* Make sure we are inside range */
++      if (grub_add ((grub_addr_t) k_address, section->raw_data_offset, &sz))
++        return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("Error on PE Executable section calculation"));
++
++      grub_update_mem_attrs (sz, section->raw_data_size, kernel_set_attrs, kernel_clear_attrs);
++
++      grub_get_mem_attrs (sz, 4096, &attrs);
++      grub_dprintf ("nx", "permissions for section %s 0x%"PRIxGRUB_ADDR" are %s%s%s\n",
++		    section->name,
++		    (grub_addr_t)sz,
++		    (attrs & GRUB_MEM_ATTR_R) ? "r" : "-",
++		    (attrs & GRUB_MEM_ATTR_W) ? "w" : "-",
++		    (attrs & GRUB_MEM_ATTR_X) ? "x" : "-");
++    }
++
++  if (grub_stack_addr != (grub_addr_t)-1ll)
++    {
++      if (nx_supported)
++        {
++          stack_set_attrs &= ~GRUB_MEM_ATTR_X;
++          stack_clear_attrs |= GRUB_MEM_ATTR_X;
++        }
++
++      grub_dprintf ("nx", "Setting attributes for stack at 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" to rw%c\n",
++                    grub_stack_addr, grub_stack_addr + grub_stack_size - 1,
++                    (stack_set_attrs & GRUB_MEM_ATTR_X) ? 'x' : '-');
++
++      grub_update_mem_attrs (grub_stack_addr, grub_stack_size,
++                             stack_set_attrs, stack_clear_attrs);
++
++      grub_get_mem_attrs (grub_stack_addr, 4096, &attrs);
++      grub_dprintf ("nx", "permissions for 0x%"PRIxGRUB_ADDR" are %s%s%s\n",
++                    grub_stack_addr,
++                    (attrs & GRUB_MEM_ATTR_R) ? "r" : "-",
++                    (attrs & GRUB_MEM_ATTR_W) ? "w" : "-",
++                    (attrs & GRUB_MEM_ATTR_X) ? "x" : "-");
++    }
++
++  return GRUB_ERR_NONE;
++}
++
++
++grub_err_t
++grub_efi_linux_boot (grub_addr_t k_address, grub_size_t k_size, grub_size_t k_start,
+ 		     grub_off_t h_offset, void *k_params,
+ 		     int nx_supported)
+ {
++  grub_addr_t k_start_address = k_address + k_start;
+   grub_efi_loaded_image_t *loaded_image = NULL;
+   handover_func hf;
+   int offset = 0;
+-  grub_uint64_t stack_set_attrs = GRUB_MEM_ATTR_R |
+-				  GRUB_MEM_ATTR_W |
+-				  GRUB_MEM_ATTR_X;
+-  grub_uint64_t stack_clear_attrs = 0;
+-  grub_uint64_t kernel_set_attrs = stack_set_attrs;
+-  grub_uint64_t kernel_clear_attrs = stack_clear_attrs;
+-  grub_uint64_t attrs;
+   int nx_required = 0;
+-
++ 
+ #ifdef __x86_64__
+   offset = 512;
+ #endif
+@@ -241,47 +353,13 @@ grub_efi_linux_boot (grub_addr_t k_address, grub_size_t k_size,
+   if (nx_required && !nx_supported)
+     return grub_error (GRUB_ERR_BAD_OS, N_("kernel does not support NX loading required by policy"));
+ 
+-  if (nx_supported)
+-    {
+-      kernel_set_attrs &= ~GRUB_MEM_ATTR_W;
+-      kernel_clear_attrs |= GRUB_MEM_ATTR_W;
+-      stack_set_attrs &= ~GRUB_MEM_ATTR_X;
+-      stack_clear_attrs |= GRUB_MEM_ATTR_X;
+-    }
+-
+-  grub_dprintf ("nx", "Setting attributes for 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" to r%cx\n",
+-		    k_address, k_address + k_size - 1,
+-		    (kernel_set_attrs & GRUB_MEM_ATTR_W) ? 'w' : '-');
+-  grub_update_mem_attrs (k_address, k_size,
+-			 kernel_set_attrs, kernel_clear_attrs);
+-
+-  grub_get_mem_attrs (k_address, 4096, &attrs);
+-  grub_dprintf ("nx", "permissions for 0x%"PRIxGRUB_ADDR" are %s%s%s\n",
+-		(grub_addr_t)k_address,
+-		(attrs & GRUB_MEM_ATTR_R) ? "r" : "-",
+-		(attrs & GRUB_MEM_ATTR_W) ? "w" : "-",
+-		(attrs & GRUB_MEM_ATTR_X) ? "x" : "-");
+-  if (grub_stack_addr != (grub_addr_t)-1ll)
+-    {
+-      grub_dprintf ("nx", "Setting attributes for stack at 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" to rw%c\n",
+-		    grub_stack_addr, grub_stack_addr + grub_stack_size - 1,
+-		    (stack_set_attrs & GRUB_MEM_ATTR_X) ? 'x' : '-');
+-      grub_update_mem_attrs (grub_stack_addr, grub_stack_size,
+-			     stack_set_attrs, stack_clear_attrs);
+-
+-      grub_get_mem_attrs (grub_stack_addr, 4096, &attrs);
+-      grub_dprintf ("nx", "permissions for 0x%"PRIxGRUB_ADDR" are %s%s%s\n",
+-		    grub_stack_addr,
+-		    (attrs & GRUB_MEM_ATTR_R) ? "r" : "-",
+-		    (attrs & GRUB_MEM_ATTR_W) ? "w" : "-",
+-		    (attrs & GRUB_MEM_ATTR_X) ? "x" : "-");
+-    }
++  grub_efi_mem_set_att (k_address, k_size, k_start, nx_supported);
+ 
+ #if defined(__i386__) || defined(__x86_64__)
+   asm volatile ("cli");
+ #endif
+ 
+-  hf = (handover_func)((char *)k_address + h_offset + offset);
++  hf = (handover_func)((char *)k_start_address + h_offset + offset);
+   hf (grub_efi_image_handle, grub_efi_system_table, k_params);
+ 
+   return GRUB_ERR_BUG;
+@@ -451,7 +529,7 @@ grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args,
+ 
+   grub_dprintf ("linux", "linux command line: '%s'\n", args);
+ 
+-  retval = grub_efi_linux_boot (addr, size, handover_offset,
++  retval = grub_efi_linux_boot (addr, size, 0, handover_offset,
+ 				(void *)addr, nx_supported);
+ 
+   /* Never reached... */
+diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
+index abbf6b24f5..6c310d9879 100644
+--- a/grub-core/loader/i386/efi/linux.c
++++ b/grub-core/loader/i386/efi/linux.c
+@@ -41,6 +41,7 @@ static grub_command_t cmd_linuxefi, cmd_initrdefi;
+ struct grub_linuxefi_context {
+   void *kernel_mem;
+   grub_uint64_t kernel_size;
++  grub_uint64_t kernel_start;
+   grub_uint32_t handover_offset;
+   struct linux_kernel_params *params;
+   char *cmdline;
+@@ -169,6 +170,7 @@ grub_linuxefi_boot (void *data)
+ 
+   return grub_efi_linux_boot ((grub_addr_t)context->kernel_mem,
+ 			      context->kernel_size,
++			      context->kernel_start,
+ 			      context->handover_offset,
+ 			      context->params,
+ 			      context->nx_supported);
+@@ -527,7 +529,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 		LOW_U32(kernel_mem));
+   lh->code32_start = LOW_U32(kernel_mem);
+ 
+-  grub_memcpy (kernel_mem, (char *)kernel + start, filelen - start);
++  grub_memcpy (kernel_mem, (char *)kernel, filelen);
+ 
+   lh->type_of_loader = 0x6;
+   grub_dprintf ("linux", "setting lh->type_of_loader = 0x%02x\n",
+@@ -544,6 +546,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+     goto fail;
+   context->kernel_mem = kernel_mem;
+   context->kernel_size = kernel_size;
++  context->kernel_start = start;
+   context->handover_offset = handover_offset;
+   context->params = params;
+   context->cmdline = cmdline;
+diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
+index 5b4e626c37..cd17be506a 100644
+--- a/include/grub/efi/linux.h
++++ b/include/grub/efi/linux.h
+@@ -27,6 +27,7 @@
+ grub_err_t
+ EXPORT_FUNC(grub_efi_linux_boot) (grub_addr_t kernel_address,
+                                   grub_size_t kernel_size,
++                                  grub_size_t kernel_start,
+                                   grub_off_t handover_offset,
+                                   void *kernel_param, int nx_enabled);
+ 
+@@ -38,4 +39,9 @@ EXPORT_FUNC(grub_efi_check_nx_image_support) (grub_addr_t kernel_addr,
+ grub_err_t
+ EXPORT_FUNC(grub_efi_check_nx_required) (int *nx_required);
+ 
++grub_err_t
++EXPORT_FUNC(grub_efi_mem_set_att) (grub_addr_t k_address,
++				   grub_size_t k_size,
++				   grub_size_t k_start, int nx_supported);
++
+ #endif /* ! GRUB_EFI_LINUX_HEADER */
diff --git a/0383-Include-function-name-on-debug-print-function.patch b/0383-Include-function-name-on-debug-print-function.patch
new file mode 100644
index 00000000..e38ad7f3
--- /dev/null
+++ b/0383-Include-function-name-on-debug-print-function.patch
@@ -0,0 +1,102 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Fri, 11 Apr 2025 15:31:53 -0600
+Subject: [PATCH] Include function name on debug and error print functions
+
+Together with the line number, the debug log gives more context when
+debugging.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/kern/err.c  | 4 ++--
+ grub-core/kern/misc.c | 4 ++--
+ include/grub/err.h    | 6 +++---
+ include/grub/misc.h   | 5 +++--
+ 4 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
+index aebfe0cf83..ba04b57fb7 100644
+--- a/grub-core/kern/err.c
++++ b/grub-core/kern/err.c
+@@ -38,14 +38,14 @@ static int grub_error_stack_assert;
+ #endif
+ 
+ grub_err_t
+-grub_error (grub_err_t n, const char *file, const int line, const char *fmt, ...)
++grub_error (grub_err_t n, const char *file, const char *function, const int line, const char *fmt, ...)
+ {
+   va_list ap;
+   int m;
+ 
+   grub_errno = n;
+ 
+-  m = grub_snprintf (grub_errmsg, sizeof (grub_errmsg), "%s:%d:", file, line);
++  m = grub_snprintf (grub_errmsg, sizeof (grub_errmsg), "%s:%s:%d:", file, function, line);
+   if (m < 0)
+     m = 0;
+ 
+diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
+index 69bd655f3d..541c7bb80c 100644
+--- a/grub-core/kern/misc.c
++++ b/grub-core/kern/misc.c
+@@ -248,7 +248,7 @@ grub_debug_enabled (const char * condition)
+ }
+ 
+ void
+-grub_real_dprintf (const char *file, const int line, const char *condition,
++grub_real_dprintf (const char *file, const char *function, const int line, const char *condition,
+ 		   const char *fmt, ...)
+ {
+   va_list args;
+@@ -272,7 +272,7 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
+       else
+         last_had_cr = 0;
+ #endif
+-      grub_printf ("%s:%d:%s: ", file, line, condition);
++      grub_printf ("%s:%s:%d:%s: ", file, function, line, condition);
+       va_start (args, fmt);
+       grub_vprintf (fmt, args);
+       va_end (args);
+diff --git a/include/grub/err.h b/include/grub/err.h
+index 7530f58b29..6379a6baf8 100644
+--- a/include/grub/err.h
++++ b/include/grub/err.h
+@@ -88,10 +88,10 @@ struct grub_error_saved
+ extern grub_err_t EXPORT_VAR(grub_errno);
+ extern char EXPORT_VAR(grub_errmsg)[GRUB_MAX_ERRMSG];
+ 
+-grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *file, const int line, const char *fmt, ...)
+-	__attribute__ ((format (GNU_PRINTF, 4, 5)));
++grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *file, const char *function, const int line, const char *fmt, ...)
++	__attribute__ ((format (GNU_PRINTF, 5, 6)));
+ 
+-#define grub_error(n, fmt, ...) grub_error (n, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
++#define grub_error(n, fmt, ...) grub_error (n, __FILE__, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
+ 
+ 
+ void EXPORT_FUNC(grub_fatal) (const char *fmt, ...) __attribute__ ((noreturn));
+diff --git a/include/grub/misc.h b/include/grub/misc.h
+index 0429339ef3..2b9096a0b3 100644
+--- a/include/grub/misc.h
++++ b/include/grub/misc.h
+@@ -43,7 +43,7 @@
+ #define CONCAT(a, b) CONCAT_(a, b)
+ #endif
+ 
+-#define grub_dprintf(condition, ...) grub_real_dprintf(GRUB_FILE, __LINE__, condition, __VA_ARGS__)
++#define grub_dprintf(condition, ...) grub_real_dprintf(GRUB_FILE, __FUNCTION__, __LINE__, condition, __VA_ARGS__)
+ 
+ void *EXPORT_FUNC(grub_memmove) (void *dest, const void *src, grub_size_t n);
+ char *EXPORT_FUNC(grub_strcpy) (char *dest, const char *src);
+@@ -420,9 +420,10 @@ int EXPORT_FUNC(grub_puts_) (const char *s);
+ int EXPORT_FUNC(grub_debug_is_enabled) (void);
+ int EXPORT_FUNC(grub_debug_enabled) (const char *condition);
+ void EXPORT_FUNC(grub_real_dprintf) (const char *file,
++				     const char *function,
+                                      const int line,
+                                      const char *condition,
+-                                     const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 4, 5)));
++                                     const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 5, 6)));
+ int EXPORT_FUNC(grub_printf) (const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 1, 2)));
+ int EXPORT_FUNC(grub_printf_) (const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 1, 2)));
+ void EXPORT_FUNC(grub_qdprintf) (const char *condition,
diff --git a/0384-kern-misc-Implement-grub_strtok.patch b/0384-kern-misc-Implement-grub_strtok.patch
new file mode 100644
index 00000000..e9e0e1ec
--- /dev/null
+++ b/0384-kern-misc-Implement-grub_strtok.patch
@@ -0,0 +1,109 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Tue, 12 Aug 2025 03:45:32 +0000
+Subject: [PATCH] kern/misc: Implement grub_strtok()
+
+Add the functions grub_strtok() and grub_strtok_r() to help parse strings into
+tokens separated by characters in the "delim" parameter. These functions are
+present in gnulib but calling them directly from the gnulib code is quite
+challenging since the call "#include <string.h>" would include the header file
+grub-core/lib/posix_wrap/string.h instead of grub-core/lib/gnulib/string.h,
+where strtok() and strtok_r() are declared. Since this overlap is quite
+problematic, the simpler solution was to implement the code in the GRUB based
+on gnulib's implementation. For more information on these functions, visit the
+Linux Programmer's Manual, man strtok.
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/misc.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ include/grub/misc.h   |  3 +++
+ 2 files changed, 65 insertions(+)
+
+diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
+index 69bd655f3d..c69fe7fb19 100644
+--- a/grub-core/kern/misc.c
++++ b/grub-core/kern/misc.c
+@@ -453,6 +453,68 @@ grub_strword (const char *haystack, const char *needle)
+   return 0;
+ }
+ 
++char *
++grub_strtok_r (char *s, const char *delim, char **save_ptr)
++{
++  char *token;
++  const char *c;
++  bool is_delim;
++
++  if (s == NULL)
++    s = *save_ptr;
++
++  /* Scan leading delimiters. */
++  while (*s != '\0')
++    {
++      is_delim = false;
++      for (c = delim; *c != '\0'; c++)
++	{
++	  if (*s == *c)
++	    {
++	      is_delim = true;
++	      break;
++	    }
++	}
++      if (is_delim == true)
++	s++;
++      else
++	break;
++    }
++
++  if (*s == '\0')
++    {
++      *save_ptr = s;
++      return NULL;
++    }
++
++  /* Find the end of the token. */
++  token = s;
++  while (*s != '\0')
++    {
++      for (c = delim; *c != '\0'; c++)
++	{
++	  if (*s == *c)
++	    {
++	      *s = '\0';
++	      *save_ptr = s + 1;
++	      return token;
++	    }
++	}
++      s++;
++    }
++
++  *save_ptr = s;
++  return token;
++}
++
++char *
++grub_strtok (char *s, const char *delim)
++{
++  static char *last;
++
++  return grub_strtok_r (s, delim, &last);
++}
++
+ int
+ grub_isspace (int c)
+ {
+diff --git a/include/grub/misc.h b/include/grub/misc.h
+index 0429339ef3..626f0c3535 100644
+--- a/include/grub/misc.h
++++ b/include/grub/misc.h
+@@ -134,6 +134,9 @@ char *EXPORT_FUNC(grub_strchr) (const char *s, int c);
+ char *EXPORT_FUNC(grub_strrchr) (const char *s, int c);
+ int EXPORT_FUNC(grub_strword) (const char *s, const char *w);
+ 
++char *EXPORT_FUNC(grub_strtok_r) (char *s, const char *delim, char **save_ptr);
++char *EXPORT_FUNC(grub_strtok) (char *s, const char *delim);
++
+ /* Copied from gnulib.
+    Written by Bruno Haible <bruno@clisp.org>, 2005. */
+ static inline char *
diff --git a/0385-blsuki-Add-blscfg-command-to-parse-Boot-Loader-Speci.patch b/0385-blsuki-Add-blscfg-command-to-parse-Boot-Loader-Speci.patch
new file mode 100644
index 00000000..e2bf790a
--- /dev/null
+++ b/0385-blsuki-Add-blscfg-command-to-parse-Boot-Loader-Speci.patch
@@ -0,0 +1,1354 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 12 Aug 2025 03:45:33 +0000
+Subject: [PATCH] blsuki: Add blscfg command to parse Boot Loader Specification
+ snippets
+
+The BootLoaderSpec (BLS) defines a scheme where different bootloaders can
+share a format for boot items and a configuration directory that accepts
+these common configurations as drop-in files.
+
+The BLS Specification: https://uapi-group.org/specifications/specs/boot_loader_specification/
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+Signed-off-by: Will Thompson <wjt@endlessm.com>
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ bootstrap.conf                 |    1 +
+ docs/grub.texi                 |   74 ++-
+ grub-core/Makefile.core.def    |   12 +
+ grub-core/commands/blscfg.c    |    2 +-
+ grub-core/commands/blsuki.c    | 1028 ++++++++++++++++++++++++++++++++++++++++
+ grub-core/commands/legacycfg.c |    4 +-
+ grub-core/commands/menuentry.c |    7 +-
+ grub-core/normal/main.c        |    4 +
+ include/grub/menu.h            |   14 +
+ include/grub/normal.h          |    2 +-
+ 10 files changed, 1140 insertions(+), 8 deletions(-)
+ create mode 100644 grub-core/commands/blsuki.c
+
+diff --git a/bootstrap.conf b/bootstrap.conf
+index 60de0597c5..799cdb1a35 100644
+--- a/bootstrap.conf
++++ b/bootstrap.conf
+@@ -24,6 +24,7 @@ gnulib_modules="
+   argp
+   base64
+   error
++  filevercmp
+   fnmatch
+   getdelim
+   getline
+diff --git a/docs/grub.texi b/docs/grub.texi
+index ae01e8c994..336f8e87ed 100644
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -3275,6 +3275,7 @@ These variables have special meaning to GRUB.
+ 
+ @menu
+ * biosnum::
++* blsuki_save_default::
+ * check_appended_signatures::
+ * check_signatures::
+ * chosen::
+@@ -3339,6 +3340,11 @@ this.
+ For an alternative approach which also changes BIOS drive mappings for the
+ chain-loaded system, @pxref{drivemap}.
+ 
++@node blsuki_save_default
++@subsection blsuki_save_default
++
++If this variable is set, menu entries generated from BLS config files
++(@pxref{blscfg}) will be set as the default boot entry when selected.
+ 
+ @node check_appended_signatures
+ @subsection check_appended_signatures
+@@ -3346,7 +3352,6 @@ chain-loaded system, @pxref{drivemap}.
+ This variable controls whether GRUB enforces appended signature validation on
+ certain loaded files. @xref{Using appended signatures}.
+ 
+-
+ @node check_signatures
+ @subsection check_signatures
+ 
+@@ -4355,6 +4360,7 @@ you forget a command, you can run the command @command{help}
+ * background_image::            Load background image for active terminal
+ * badram::                      Filter out bad regions of RAM
+ * blocklist::                   Print a block list
++* blscfg::                      Load Boot Loader Specification menu entries
+ * boot::                        Start up your operating system
+ * cat::                         Show the contents of a file
+ * clear::                       Clear the screen
+@@ -4542,6 +4548,72 @@ Print a block list (@pxref{Block list syntax}) for @var{file}.
+ @end deffn
+ 
+ 
++@node blscfg
++@subsection blscfg
++
++@deffn Command blscfg [@option{-p|--path} dir] [@option{-f|--enable-fallback}] [@option{-d|--show-default}] [@option{-n|--show-non-default}] [@option{-e|--entry} file]
++Load Boot Loader Specification (BLS) entries into the GRUB menu. Boot entries
++generated from @command{blscfg} won't interfere with entries from @file{grub.cfg} appearing in
++the GRUB menu. Also, entries generated from @command{blscfg} exists only in memory and
++don't update @file{grub.cfg}.
++
++By default, the BLS entries are stored in the @file{/loader/entries} directory in the
++boot partition. If BLS entries are stored elsewhere, the @option{--path} option can be
++used to check a different directory instead of the default location. If no BLS
++entries are found while using the @option{--path} option, the @option{--enable-fallback} option
++can be used to check for entries in the default location.
++
++The @option{--show-default} option allows the default boot entry to be added to the
++GRUB menu from the BLS entries.
++
++The @option{--show-non-default} option allows non-default boot entries to be added to
++the GRUB menu from the BLS entries.
++
++The @option{--entry} option allows specific boot entries to be added to the GRUB menu
++from the BLS entries.
++
++The @option{--entry}, @option{--show-default}, and @option{--show-non-default} options
++are used to filter which BLS entries are added to the GRUB menu. If none are
++used, all entries in the default location or the location specified by @option{--path}
++will be added to the GRUB menu.
++
++A BLS config file example:
++@example
++# /boot/loader/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf
++title        Fedora 19 (Rawhide)
++sort-key     fedora
++machine-id   6a9857a393724b7a981ebb5b8495b9ea
++version      3.8.0-2.fc19.x86_64
++options      root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2 quiet
++architecture x64
++linux        /6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/linux
++initrd       /6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/initrd
++@end example
++
++For more information on BLS entry keys as well as other information on BLS,
++see: @uref{https://uapi-group.org/specifications/specs/boot_loader_specification/, The Boot Loader Specification}. For the GRUB, there are a few additional
++BLS entry keys based on the @command{menuentry} command (@pxref{menuentry}).
++
++The @code{grub_class} key may be used any number of times to group menu entries into
++classes. Menu themes may display different classes using different styles.
++
++The @code{grub_users} key grants specific users access to specific menu
++entries.  @xref{Security}.
++
++The @code{grub_hotkey} key associates a hotkey with a menu entry.
++@var{key} may be a single letter, or one of the aliases @samp{backspace},
++@samp{tab}, or @samp{delete}.
++
++The @code{grub_args} key can be used for any other argument to be passed as positonal
++parameters when the list of commands generated from the BLS config file are
++executed.
++
++Variable expansion using the @samp{$} character (@xref{Shell-like scripting}) may be
++used with BLS config files for the GRUB but might not be compatible with other
++bootloaders.
++@end deffn
++
++
+ @node boot
+ @subsection boot
+ 
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 95fd18d2dd..5e0e757344 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -884,6 +884,18 @@ module = {
+   enable = i386_xen_pvh;
+ };
+ 
++module = {
++  name = blsuki;
++  common = commands/blsuki.c;
++  common = lib/gnulib/filevercmp.c;
++  enable = powerpc_ieee1275;
++  enable = efi;
++  enable = i386_pc;
++  enable = emu;
++  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
++  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
++};
++
+ module = {
+   name = boot;
+   common = commands/boot.c;
+diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
+index 5d931b0c9b..38913d6964 100644
+--- a/grub-core/commands/blscfg.c
++++ b/grub-core/commands/blscfg.c
+@@ -955,7 +955,7 @@ static void create_entry (struct bls_entry *entry)
+ 			clinux, options ? " " : "", options ? options : "",
+ 			initrd ? initrd : "", dt ? dt : "");
+ 
+-  grub_normal_add_menu_entry (argc, argv, classes, id, users, hotkey, NULL, src, 0, &index, entry);
++  grub_normal_add_menu_entry (argc, argv, classes, id, users, hotkey, NULL, src, 0, &index, entry, NULL);
+   grub_dprintf ("blscfg", "Added entry %d id:\"%s\"\n", index, id);
+ 
+ finish:
+diff --git a/grub-core/commands/blsuki.c b/grub-core/commands/blsuki.c
+new file mode 100644
+index 0000000000..9440adb100
+--- /dev/null
++++ b/grub-core/commands/blsuki.c
+@@ -0,0 +1,1028 @@
++/*
++ *  GRUB  --  GRand Unified Bootloader
++ *  Copyright (C) 2025  Free Software Foundation, Inc.
++ *
++ *  GRUB is free software: you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation, either version 3 of the License, or
++ *  (at your option) any later version.
++ *
++ *  GRUB is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <grub/list.h>
++#include <grub/types.h>
++#include <grub/misc.h>
++#include <grub/mm.h>
++#include <grub/err.h>
++#include <grub/dl.h>
++#include <grub/extcmd.h>
++#include <grub/i18n.h>
++#include <grub/fs.h>
++#include <grub/env.h>
++#include <grub/file.h>
++#include <grub/normal.h>
++#include <grub/safemath.h>
++#include <grub/lib/envblk.h>
++#include <filevercmp.h>
++
++GRUB_MOD_LICENSE ("GPLv3+");
++
++#define GRUB_BLS_CONFIG_PATH "/loader/entries/"
++
++#define BLS_EXT_LEN (sizeof (".conf") - 1)
++
++/*
++ * It is highly unlikely to ever receive a large amount of keyval pairs. A
++ * limit of 10000 is more than enough.
++ */
++#define BLSUKI_KEYVALS_MAX 10000
++
++static const struct grub_arg_option bls_opt[] =
++  {
++    {"path", 'p', 0, "Specify path to find BLS entries.", N_("DIR"), ARG_TYPE_PATHNAME},
++    {"enable-fallback", 'f', 0, "Fallback to the default BLS path if --path fails to find BLS entries.", 0, ARG_TYPE_NONE},
++    {"show-default", 'd', 0, "Allow the default BLS entry to be added to the GRUB menu.", 0, ARG_TYPE_NONE},
++    {"show-non-default", 'n', 0, "Allow the non-default BLS entries to be added to the GRUB menu.", 0, ARG_TYPE_NONE},
++    {"entry", 'e', 0, "Allow specific BLS entries to be added to the GRUB menu.", N_("FILE"), ARG_TYPE_FILE},
++    {0, 0, 0, 0, 0, 0}
++  };
++
++struct keyval
++{
++  const char *key;
++  char *val;
++};
++
++struct read_entry_info
++{
++  const char *devid;
++  const char *dirname;
++  grub_file_t file;
++};
++
++struct find_entry_info
++{
++  const char *dirname;
++  const char *devid;
++  grub_device_t dev;
++  grub_fs_t fs;
++};
++
++static grub_blsuki_entry_t *entries;
++
++#define FOR_BLSUKI_ENTRIES(var) FOR_LIST_ELEMENTS (var, entries)
++
++/*
++ * This function will add a new keyval pair to a list of keyvals stored in the
++ * entry parameter.
++ */
++static grub_err_t
++blsuki_add_keyval (grub_blsuki_entry_t *entry, char *key, char *val)
++{
++  char *k, *v;
++  struct keyval **kvs, *kv;
++  grub_size_t size;
++  int new_n = entry->nkeyvals + 1;
++
++  if (new_n > BLSUKI_KEYVALS_MAX)
++    return grub_error (GRUB_ERR_BAD_NUMBER, "too many keyval pairs");
++
++  if (entry->keyvals_size == 0)
++    {
++      size = sizeof (struct keyval *);
++      kvs = grub_malloc (size);
++      if (kvs == NULL)
++	return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't allocate space for BLS key values");
++
++      entry->keyvals = kvs;
++      entry->keyvals_size = size;
++    }
++  else if (entry->keyvals_size < new_n * sizeof (struct keyval *))
++    {
++      size = entry->keyvals_size * 2;
++      kvs = grub_realloc (entry->keyvals, size);
++      if (kvs == NULL)
++	return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't reallocate space for BLS key values");
++
++      entry->keyvals = kvs;
++      entry->keyvals_size = size;
++    }
++
++  kv = grub_malloc (sizeof (struct keyval));
++  if (kv == NULL)
++    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't find space for new BLS key value");
++
++  k = grub_strdup (key);
++  if (k == NULL)
++    {
++      grub_free (kv);
++      return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't find space for new BLS key value");
++    }
++
++  v = grub_strdup (val);
++  if (v == NULL)
++    {
++      grub_free (k);
++      grub_free (kv);
++      return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't find space for new BLS key value");
++    }
++
++  kv->key = k;
++  kv->val = v;
++  entry->keyvals[entry->nkeyvals] = kv;
++  entry->nkeyvals = new_n;
++
++  return GRUB_ERR_NONE;
++}
++
++/*
++ * Find the value of the key named by keyname. If there are allowed to be
++ * more than one, pass a pointer set to -1 to the last parameter the first
++ * time, and pass the same pointer through each time after, and it'll return
++ * them in sorted order as defined in the BLS fragment file.
++ */
++static char *
++blsuki_get_val (grub_blsuki_entry_t *entry, const char *keyname, int *last)
++{
++  int idx, start = (last != NULL) ? (*last + 1) : 0;
++  struct keyval *kv = NULL;
++  char *ret = NULL;
++
++  for (idx = start; idx < entry->nkeyvals; idx++)
++    {
++      kv = entry->keyvals[idx];
++
++      if (grub_strcmp (keyname, kv->key) == 0)
++	{
++	  ret = kv->val;
++	  break;
++	}
++    }
++
++  if (last != NULL)
++    {
++      if (idx == entry->nkeyvals)
++	*last = -1;
++      else
++	*last = idx;
++    }
++
++  return ret;
++}
++
++/*
++ * Add a new grub_blsuki_entry_t struct to the entries list and sort it's
++ * position on the list.
++ */
++static grub_err_t
++blsuki_add_entry (grub_blsuki_entry_t *entry)
++{
++  grub_blsuki_entry_t *e, *last = NULL;
++  int rc;
++
++  if (entries == NULL)
++    {
++      grub_dprintf ("blsuki", "Add entry with id \"%s\"\n", entry->filename);
++      entries = entry;
++      return GRUB_ERR_NONE;
++    }
++
++  FOR_BLSUKI_ENTRIES (e)
++    {
++      rc = filevercmp (entry->filename, e->filename);
++      if (rc == 0)
++	return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("duplicate file: `%s'"), entry->filename);
++
++      if (rc > 0)
++	{
++	  grub_dprintf ("blsuki", "Add entry with id \"%s\"\n", entry->filename);
++	  grub_list_push (GRUB_AS_LIST_P (&e), GRUB_AS_LIST (entry));
++	  if (entry->next == entries)
++	    {
++	      entries = entry;
++	      entry->prev = NULL;
++	    }
++	  else if (last != NULL)
++	    last->next = entry;
++
++	  return GRUB_ERR_NONE;
++	}
++      last = e;
++    }
++
++  if (last != NULL)
++    {
++      grub_dprintf ("blsuki", "Add entry with id \"%s\"\n", entry->filename);
++      last->next = entry;
++      entry->prev = &last;
++    }
++
++  return GRUB_ERR_NONE;
++}
++
++/*
++ * This function parses each line of a BLS config file to obtain the key value
++ * pairs that will be used to setup the GRUB menu entries. The key value pair
++ * will be stored in a list in the entry parameter.
++ */
++static grub_err_t
++bls_parse_keyvals (grub_file_t f, grub_blsuki_entry_t *entry)
++{
++  grub_err_t err = GRUB_ERR_NONE;
++
++  for (;;)
++    {
++      char *line, *key, *val;
++
++      line = grub_file_getline (f);
++      if (line == NULL)
++	break;
++
++      key = grub_strtok_r (line, " \t", &val);
++      if (key == NULL)
++	{
++	  grub_free (line);
++	  break;
++	}
++      if (*key == '#')
++	{
++	  grub_free (line);
++	  continue;
++	}
++
++      while (*val == ' ' || *val == '\t')
++	val++;
++
++      if (*val == '\0')
++	{
++	  grub_free (line);
++	  break;
++	}
++
++      err = blsuki_add_keyval (entry, key, val);
++      grub_free (line);
++      if (err != GRUB_ERR_NONE)
++	break;
++    }
++
++  return err;
++}
++
++/*
++ * If a file hasn't already been opened, this function opens a BLS config file
++ * and initializes entry data before parsing keyvals and adding the entry to
++ * the list of BLS entries.
++ */
++static int
++blsuki_read_entry (const char *filename,
++		   const struct grub_dirhook_info *dirhook_info __attribute__ ((__unused__)),
++		   void *data)
++{
++  grub_size_t path_len = 0, filename_len;
++  grub_err_t err;
++  char *p = NULL;
++  grub_file_t f = NULL;
++  grub_blsuki_entry_t *entry;
++  struct read_entry_info *info = (struct read_entry_info *) data;
++
++  grub_dprintf ("blsuki", "filename: \"%s\"\n", filename);
++
++  filename_len = grub_strlen (filename);
++
++  if (info->file != NULL)
++    f = info->file;
++  else
++    {
++      if (filename_len < BLS_EXT_LEN ||
++	  grub_strcmp (filename + filename_len - BLS_EXT_LEN, ".conf") != 0)
++	return 0;
++
++      p = grub_xasprintf ("(%s)%s/%s", info->devid, info->dirname, filename);
++
++      f = grub_file_open (p, GRUB_FILE_TYPE_CONFIG);
++      grub_free (p);
++      if (f == NULL)
++	goto finish;
++    }
++
++  entry = grub_zalloc (sizeof (*entry));
++  if (entry == NULL)
++    goto finish;
++
++  /*
++   * If a file is opened before this function, the filename may have a path.
++   * Since the filename is used for the ID of the GRUB menu entry, we can
++   * remove the path.
++   */
++  if (info->file != NULL)
++    {
++      char *slash;
++
++      slash = grub_strrchr (filename, '/');
++      if (slash != NULL)
++	path_len = slash - filename + 1;
++    }
++  filename_len -= path_len;
++
++  entry->filename = grub_strndup (filename + path_len, filename_len);
++  if (entry->filename == NULL)
++    {
++      grub_free (entry);
++      goto finish;
++    }
++
++  err = bls_parse_keyvals (f, entry);
++
++  if (err == GRUB_ERR_NONE)
++    blsuki_add_entry (entry);
++  else
++    grub_free (entry);
++
++ finish:
++  if (f != NULL)
++    grub_file_close (f);
++
++  return 0;
++}
++
++/*
++ * This function returns a list of values that had the same key in the BLS
++ * config file. The number of entries in this list is returned by the len
++ * parameter.
++ */
++static char **
++blsuki_make_list (grub_blsuki_entry_t *entry, const char *key, int *len)
++{
++  int last = -1;
++  char *val;
++  int nlist = 0;
++  char **list;
++
++  list = grub_zalloc (sizeof (char *));
++  if (list == NULL)
++    return NULL;
++
++  while (1)
++    {
++      char **new;
++
++      /*
++       * Since the same key might appear more than once, the 'last' variable
++       * starts at -1 and increments to indicate the last index in the list
++       * we obtained from blsuki_get_val().
++       */
++      val = blsuki_get_val (entry, key, &last);
++      if (val == NULL)
++	break;
++
++      new = grub_realloc (list, (nlist + 2) * sizeof (char *));
++      if (new == NULL)
++	break;
++
++      list = new;
++      list[nlist++] = val;
++      list[nlist] = NULL;
++  }
++
++  if (nlist == 0)
++    {
++      grub_free (list);
++      return NULL;
++    }
++
++  if (len != NULL)
++    *len = nlist;
++
++  return list;
++}
++
++/*
++ * This function appends a field to the end of a buffer. If the field given is
++ * an enviornmental variable, it gets the value stored for that variable and
++ * appends that to the buffer instead.
++ */
++static char *
++blsuki_field_append (bool is_env_var, char *buffer, const char *start, const char *end)
++{
++  char *tmp;
++  const char *field;
++  grub_size_t size = 0;
++
++  tmp = grub_strndup (start, end - start + 1);
++  if (tmp == NULL)
++    return NULL;
++
++  field = tmp;
++
++  if (is_env_var == true)
++    {
++      field = grub_env_get (tmp);
++      if (field == NULL)
++	return buffer;
++    }
++
++  if (grub_add (grub_strlen (field), 1, &size))
++    return NULL;
++
++  if (buffer == NULL)
++    buffer = grub_zalloc (size);
++  else
++    {
++      if (grub_add (size, grub_strlen (buffer), &size))
++	return NULL;
++
++      buffer = grub_realloc (buffer, size);
++    }
++
++  if (buffer == NULL)
++    return NULL;
++
++  tmp = buffer + grub_strlen (buffer);
++  tmp = grub_stpcpy (tmp, field);
++
++  if (is_env_var == true)
++    tmp = grub_stpcpy (tmp, " ");
++
++  return buffer;
++}
++
++/*
++ * This function takes a value string, checks for environmental variables, and
++ * returns the value string with all environmental variables replaced with the
++ * value stored in the variable.
++ */
++static char *
++blsuki_expand_val (const char *value)
++{
++  char *buffer = NULL;
++  const char *start = value;
++  const char *end = value;
++  bool is_env_var = false;
++
++  if (value == NULL)
++    return NULL;
++
++  while (*value != '\0')
++    {
++      if (*value == '$')
++	{
++	  if (start != end)
++	    {
++	      buffer = blsuki_field_append (is_env_var, buffer, start, end);
++	      if (buffer == NULL)
++		return NULL;
++	    }
++
++	  is_env_var = true;
++	  start = value + 1;
++	}
++      else if (is_env_var == true)
++	{
++	  if (grub_isalnum (*value) == 0 && *value != '_')
++	    {
++	      buffer = blsuki_field_append (is_env_var, buffer, start, end);
++	      is_env_var = false;
++	      start = value;
++	      if (*start == ' ')
++		start++;
++	    }
++	}
++
++      end = value;
++      value++;
++    }
++
++  if (start != end)
++    {
++      buffer = blsuki_field_append (is_env_var, buffer, start, end);
++      if (buffer == NULL)
++	return NULL;
++    }
++
++  return buffer;
++}
++
++/*
++ * This function returns a string with the command to load a linux kernel with
++ * kernel command-line options based on what was specified in the BLS config
++ * file.
++ */
++static char *
++bls_get_linux (grub_blsuki_entry_t *entry)
++{
++  char *linux_path;
++  char *linux_cmd = NULL;
++  char *options = NULL;
++  char *tmp;
++  grub_size_t size;
++
++  linux_path = blsuki_get_val (entry, "linux", NULL);
++  options = blsuki_expand_val (blsuki_get_val (entry, "options", NULL));
++
++  if (grub_add (sizeof ("linux "), grub_strlen (linux_path), &size))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while calculating linux buffer size");
++      goto finish;
++    }
++
++  if (options != NULL)
++    {
++      if (grub_add (size, grub_strlen (options), &size) ||
++	  grub_add (size, 1, &size))
++	{
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while calculating linux buffer size");
++	  goto finish;
++	}
++    }
++
++  linux_cmd = grub_malloc (size);
++  if (linux_cmd == NULL)
++    goto finish;
++
++  tmp = linux_cmd;
++  tmp = grub_stpcpy (tmp, "linux ");
++  tmp = grub_stpcpy (tmp, linux_path);
++  if (options != NULL)
++    {
++      tmp = grub_stpcpy (tmp, " ");
++      tmp = grub_stpcpy (tmp, options);
++    }
++
++  tmp = grub_stpcpy (tmp, "\n");
++
++ finish:
++  grub_free (options);
++  return linux_cmd;
++}
++
++/*
++ * This function returns a string with the command to load all initrds for a
++ * linux kernel image based on the list provided by the BLS config file.
++ */
++static char *
++bls_get_initrd (grub_blsuki_entry_t *entry)
++{
++  char **initrd_list;
++  char *initrd_cmd = NULL;
++  char *tmp;
++  grub_size_t size;
++  int i;
++
++  initrd_list = blsuki_make_list (entry, "initrd", NULL);
++  if (initrd_list != NULL)
++    {
++      size = sizeof ("initrd");
++
++      for (i = 0; initrd_list != NULL && initrd_list[i] != NULL; i++)
++	{
++	  if (grub_add (size, 1, &size) ||
++	      grub_add (size, grub_strlen (initrd_list[i]), &size))
++	    {
++	      grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected calculating initrd buffer size");
++	      goto finish;
++	    }
++	}
++
++      if (grub_add (size, 1, &size))
++	{
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected calculating initrd buffer size");
++	  goto finish;
++	}
++
++      initrd_cmd = grub_malloc (size);
++      if (initrd_cmd == NULL)
++	goto finish;
++
++      tmp = grub_stpcpy (initrd_cmd, "initrd");
++      for (i = 0; initrd_list != NULL && initrd_list[i] != NULL; i++)
++	{
++	  grub_dprintf ("blsuki", "adding initrd %s\n", initrd_list[i]);
++	  tmp = grub_stpcpy (tmp, " ");
++	  tmp = grub_stpcpy (tmp, initrd_list[i]);
++	}
++      tmp = grub_stpcpy (tmp, "\n");
++    }
++
++ finish:
++  grub_free (initrd_list);
++  return initrd_cmd;
++}
++
++/*
++ * This function returns a string with the command to load a device tree blob
++ * from the BLS config file.
++ */
++static char *
++bls_get_devicetree (grub_blsuki_entry_t *entry)
++{
++  char *dt_path;
++  char *dt_cmd = NULL;
++  char *tmp;
++  grub_size_t size;
++
++  dt_path = blsuki_expand_val (blsuki_get_val (entry, "devicetree", NULL));
++  if (dt_path != NULL)
++    {
++      if (grub_add (sizeof ("devicetree "), grub_strlen (dt_path), &size) ||
++	  grub_add (size, 1, &size))
++	{
++	  grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected calculating device tree buffer size");
++	  return NULL;
++	}
++
++      dt_cmd = grub_malloc (size);
++      if (dt_cmd == NULL)
++	return NULL;
++
++      tmp = dt_cmd;
++      tmp = grub_stpcpy (dt_cmd, "devicetree ");
++      tmp = grub_stpcpy (tmp, dt_path);
++      tmp = grub_stpcpy (tmp, "\n");
++    }
++
++  return dt_cmd;
++}
++
++/*
++ * This function puts together all of the commands generated from the contents
++ * of the BLS config file and creates a new entry in the GRUB boot menu.
++ */
++static void
++bls_create_entry (grub_blsuki_entry_t *entry)
++{
++  int argc = 0;
++  const char **argv = NULL;
++  char *title = NULL;
++  char *linux_path = NULL;
++  char *linux_cmd = NULL;
++  char *initrd_cmd = NULL;
++  char *dt_cmd = NULL;
++  char *id = entry->filename;
++  grub_size_t id_len;
++  char *hotkey = NULL;
++  char *users = NULL;
++  char **classes = NULL;
++  char **args = NULL;
++  char *src = NULL;
++  int i;
++  grub_size_t size;
++  bool blsuki_save_default;
++
++  linux_path = blsuki_get_val (entry, "linux", NULL);
++  if (linux_path == NULL)
++    {
++      grub_dprintf ("blsuki", "Skipping file %s with no 'linux' key.\n", entry->filename);
++      goto finish;
++    }
++
++  id_len = grub_strlen (id);
++  if (id_len >= BLS_EXT_LEN && grub_strcmp (id + id_len - BLS_EXT_LEN, ".conf") == 0)
++    id[id_len - BLS_EXT_LEN] = '\0';
++
++  title = blsuki_get_val (entry, "title", NULL);
++  hotkey = blsuki_get_val (entry, "grub_hotkey", NULL);
++  users = blsuki_expand_val (blsuki_get_val (entry, "grub_users", NULL));
++  classes = blsuki_make_list (entry, "grub_class", NULL);
++  args = blsuki_make_list (entry, "grub_arg", &argc);
++
++  argc++;
++  if (grub_mul (argc + 1, sizeof (char *), &size))
++    {
++      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected creating argv list"));
++      goto finish;
++    }
++
++  argv = grub_malloc (size);
++  if (argv == NULL)
++    goto finish;
++
++  argv[0] = (title != NULL) ? title : linux_path;
++  for (i = 1; i < argc; i++)
++    argv[i] = args[i - 1];
++  argv[argc] = NULL;
++
++  linux_cmd = bls_get_linux (entry);
++  if (linux_cmd == NULL)
++    goto finish;
++
++  initrd_cmd = bls_get_initrd (entry);
++  if (grub_errno != GRUB_ERR_NONE)
++    goto finish;
++
++  dt_cmd = bls_get_devicetree (entry);
++  if (grub_errno != GRUB_ERR_NONE)
++    goto finish;
++
++  blsuki_save_default = grub_env_get_bool ("blsuki_save_default", false);
++  src = grub_xasprintf ("%s%s%s%s",
++			blsuki_save_default ? "savedefault\n" : "",
++			linux_cmd, initrd_cmd ? initrd_cmd : "",
++			dt_cmd ? dt_cmd : "");
++
++  grub_normal_add_menu_entry (argc, argv, classes, id, users, hotkey, NULL, src, 0, entry);
++
++ finish:
++  grub_free (linux_cmd);
++  grub_free (dt_cmd);
++  grub_free (initrd_cmd);
++  grub_free (classes);
++  grub_free (args);
++  grub_free (argv);
++  grub_free (src);
++}
++
++/*
++ * This function fills a find_entry_info struct passed in by the info parameter.
++ * If the dirname or devid parameters are set to NULL, the dirname and devid
++ * fields in the info parameter will be set to default values. If info already
++ * has a value in the dev fields, we can compare it to the value passed in by
++ * the devid parameter or the default devid to see if we need to open a new
++ * device.
++ */
++static grub_err_t
++blsuki_set_find_entry_info (struct find_entry_info *info, const char *dirname, const char *devid)
++{
++  grub_device_t dev;
++  grub_fs_t fs;
++
++  if (info == NULL)
++    return grub_error (GRUB_ERR_BAD_ARGUMENT, "info parameter is not set");
++
++  if (devid == NULL)
++    {
++      devid = grub_env_get ("root");
++      if (devid == NULL)
++	return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable '%s' isn't set"), "root");
++    }
++
++  /* Check that we aren't closing and opening the same device. */
++  if (info->dev != NULL && grub_strcmp (info->devid, devid) != 0)
++    {
++      grub_device_close (info->dev);
++      info->dev = NULL;
++    }
++  /* If we are using the same device, then we can skip this step and only set the directory. */
++  if (info->dev == NULL)
++    {
++      grub_dprintf ("blsuki", "opening %s\n", devid);
++      dev = grub_device_open (devid);
++      if (dev == NULL)
++	return grub_errno;
++
++      grub_dprintf ("blsuki", "probing fs\n");
++      fs = grub_fs_probe (dev);
++      if (fs == NULL)
++	{
++	  grub_device_close (dev);
++	  return grub_errno;
++	}
++
++      info->devid = devid;
++      info->dev = dev;
++      info->fs = fs;
++    }
++
++  info->dirname = dirname;
++
++  return GRUB_ERR_NONE;
++}
++
++/*
++ * This function searches for BLS config files based on the data in the info
++ * parameter. If the fallback option is enabled, the default location will be
++ * checked for BLS config files if the first attempt fails.
++ */
++static void
++blsuki_find_entry (struct find_entry_info *info, bool enable_fallback)
++{
++  struct read_entry_info read_entry_info;
++  grub_fs_t dir_fs = NULL;
++  grub_device_t dir_dev = NULL;
++  bool fallback = false;
++  int r;
++
++  do
++    {
++      read_entry_info.file = NULL;
++      read_entry_info.dirname = info->dirname;
++
++      grub_dprintf ("blsuki", "scanning dir: %s\n", info->dirname);
++      dir_dev = info->dev;
++      dir_fs = info->fs;
++      read_entry_info.devid = info->devid;
++
++      r = dir_fs->fs_dir (dir_dev, read_entry_info.dirname, blsuki_read_entry,
++			  &read_entry_info);
++      if (r != 0)
++	{
++	  grub_dprintf ("blsuki", "blsuki_read_entry returned error\n");
++	  grub_errno = GRUB_ERR_NONE;
++	}
++
++      /*
++       * If we aren't able to find BLS entries in the directory given by info->dirname,
++       * we can fallback to the default location "/boot/loader/entries/" and see if we
++       * can find the files there.
++       */
++      if (entries == NULL && fallback == false && enable_fallback == true)
++	{
++	  blsuki_set_find_entry_info (info, GRUB_BLS_CONFIG_PATH, NULL);
++	  grub_dprintf ("blsuki", "Entries weren't found in %s, fallback to %s\n",
++			read_entry_info.dirname, info->dirname);
++	  fallback = true;
++	}
++      else
++	fallback = false;
++    }
++  while (fallback == true);
++}
++
++static grub_err_t
++blsuki_load_entries (char *path, bool enable_fallback)
++{
++  grub_size_t len;
++  static grub_err_t r;
++  const char *devid = NULL;
++  char *dir = NULL;
++  struct find_entry_info info = {
++      .dev = NULL,
++      .fs = NULL,
++      .dirname = NULL,
++  };
++  struct read_entry_info rei = {
++      .devid = NULL,
++      .dirname = NULL,
++  };
++
++  if (path != NULL)
++    {
++      len = grub_strlen (path);
++      if (len >= BLS_EXT_LEN && grub_strcmp (path + len - BLS_EXT_LEN, ".conf") == 0)
++	{
++	  rei.file = grub_file_open (path, GRUB_FILE_TYPE_CONFIG);
++	  if (rei.file == NULL)
++	    return grub_errno;
++
++	  /* blsuki_read_entry() closes the file. */
++	  return blsuki_read_entry (path, NULL, &rei);
++	}
++      else if (path[0] == '(')
++	{
++	  devid = path + 1;
++
++	  dir = grub_strchr (path, ')');
++	  if (dir == NULL)
++	    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid file name `%s'"), path);
++
++	  *dir = '\0';
++
++	  /* Check if there is more than the devid in the path. */
++	  if (dir + 1 < path + len)
++	    dir = dir + 1;
++	}
++      else if (path[0] == '/')
++	dir = path;
++    }
++
++  if (dir == NULL)
++    dir = (char *) GRUB_BLS_CONFIG_PATH;
++
++  r = blsuki_set_find_entry_info (&info, dir, devid);
++  if (r == GRUB_ERR_NONE)
++    blsuki_find_entry (&info, enable_fallback);
++
++  if (info.dev != NULL)
++    grub_device_close (info.dev);
++
++  return r;
++}
++
++static bool
++blsuki_is_default_entry (const char *def_entry, grub_blsuki_entry_t *entry, int idx)
++{
++  const char *title;
++  const char *def_entry_end;
++  long def_idx;
++
++  if (def_entry == NULL || *def_entry == '\0')
++    return false;
++
++  if (grub_strcmp (def_entry, entry->filename) == 0)
++    return true;
++
++  title = blsuki_get_val (entry, "title", NULL);
++
++  if (title != NULL && grub_strcmp (def_entry, title) == 0)
++    return true;
++
++  def_idx = grub_strtol (def_entry, &def_entry_end, 0);
++  if (*def_entry_end != '\0' || def_idx < 0 || def_idx > GRUB_INT_MAX)
++    return false;
++
++  if ((int) def_idx == idx)
++    return true;
++
++  return false;
++}
++
++/*
++ * This function creates a GRUB boot menu entry for each BLS entry in the
++ * entries list.
++ */
++static grub_err_t
++blsuki_create_entries (bool show_default, bool show_non_default, char *entry_id)
++{
++  const char *def_entry = NULL;
++  grub_blsuki_entry_t *entry = NULL;
++  int idx = 0;
++
++  def_entry = grub_env_get ("default");
++
++  FOR_BLSUKI_ENTRIES(entry)
++    {
++      if (entry->visible == true)
++	{
++	  idx++;
++	  continue;
++	}
++      if ((show_default == true && blsuki_is_default_entry (def_entry, entry, idx) == true) ||
++	  (show_non_default == true && blsuki_is_default_entry (def_entry, entry, idx) == false) ||
++	  (entry_id != NULL && grub_strcmp (entry_id, entry->filename) == 0))
++	{
++	  bls_create_entry (entry);
++	  entry->visible = true;
++	}
++
++      idx++;
++    }
++
++  return GRUB_ERR_NONE;
++}
++
++static grub_err_t
++grub_cmd_blscfg (grub_extcmd_context_t ctxt, int argc __attribute__ ((unused)),
++		 char **args __attribute__ ((unused)))
++{
++  grub_err_t err;
++  struct grub_arg_list *state = ctxt->state;
++  char *path = NULL;
++  char *entry_id = NULL;
++  bool enable_fallback = false;
++  bool show_default = false;
++  bool show_non_default = false;
++  bool all = true;
++  entries = NULL;
++
++  if (state[0].set)
++    path = state[0].arg;
++  if (state[1].set)
++    enable_fallback = true;
++  if (state[2].set)
++    {
++      show_default = true;
++      all = false;
++    }
++  if (state[3].set)
++    {
++      show_non_default = true;
++      all = false;
++    }
++  if (state[4].set)
++    {
++      entry_id = state[4].arg;
++      all = false;
++    }
++  if (all == true)
++    {
++      show_default = true;
++      show_non_default = true;
++    }
++
++  err = blsuki_load_entries (path, enable_fallback);
++  if (err != GRUB_ERR_NONE)
++    return err;
++
++  return blsuki_create_entries (show_default, show_non_default, entry_id);
++}
++
++static grub_extcmd_t bls_cmd;
++
++GRUB_MOD_INIT(blsuki)
++{
++  bls_cmd = grub_register_extcmd ("blscfg", grub_cmd_blscfg, 0,
++				  N_("[-p|--path] [-f|--enable-fallback] DIR [-d|--show-default] [-n|--show-non-default] [-e|--entry] FILE"),
++				  N_("Import Boot Loader Specification snippets."),
++				  bls_opt);
++}
++
++GRUB_MOD_FINI(blsuki)
++{
++  grub_unregister_extcmd (bls_cmd);
++}
+diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
+index 86bcda6954..a5d296769e 100644
+--- a/grub-core/commands/legacycfg.c
++++ b/grub-core/commands/legacycfg.c
+@@ -143,7 +143,7 @@ legacy_file (const char *filename)
+ 	    args[0] = oldname;
+ 	    grub_normal_add_menu_entry (1, args, NULL, NULL, "legacy",
+ 					NULL, NULL,
+-					entrysrc, 0, NULL, NULL);
++					entrysrc, 0, NULL, NULL, NULL);
+ 	    grub_free (args);
+ 	    entrysrc[0] = 0;
+ 	    grub_free (oldname);
+@@ -205,7 +205,7 @@ legacy_file (const char *filename)
+       args[0] = entryname;
+       grub_normal_add_menu_entry (1, args, NULL, NULL, NULL,
+ 				  NULL, NULL, entrysrc, 0, NULL,
+-				  NULL);
++				  NULL, NULL);
+       grub_free (args);
+     }
+ 
+diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
+index b175a1b43b..d6cf329203 100644
+--- a/grub-core/commands/menuentry.c
++++ b/grub-core/commands/menuentry.c
+@@ -78,7 +78,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
+ 			    char **classes, const char *id,
+ 			    const char *users, const char *hotkey,
+ 			    const char *prefix, const char *sourcecode,
+-			    int submenu, int *index, struct bls_entry *bls)
++			    int submenu, int *index, struct bls_entry *bls, grub_blsuki_entry_t *blsuki)
+ {
+   int menu_hotkey = 0;
+   char **menu_args = NULL;
+@@ -196,6 +196,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
+   (*last)->sourcecode = menu_sourcecode;
+   (*last)->submenu = submenu;
+   (*last)->bls = bls;
++  (*last)->blsuki = blsuki;
+ 
+   menu->size++;
+   if (index)
+@@ -297,7 +298,7 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
+ 				       ctxt->state[2].arg, 0,
+ 				       ctxt->state[3].arg,
+ 				       ctxt->extcmd->cmd->name[0] == 's',
+-				       NULL, NULL);
++				       NULL, NULL, NULL);
+ 
+   src = args[argc - 1];
+   args[argc - 1] = NULL;
+@@ -315,7 +316,7 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
+ 				  users,
+ 				  ctxt->state[2].arg, prefix, src + 1,
+ 				  ctxt->extcmd->cmd->name[0] == 's', NULL,
+-				  NULL);
++				  NULL, NULL);
+ 
+   src[len - 1] = ch;
+   args[argc - 1] = src;
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index 6f7290a897..e038ed14b8 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -75,6 +75,10 @@ grub_normal_free_menu (grub_menu_t menu)
+ 	{
+ 	  entry->bls->visible = 0;
+ 	}
++      if (entry->blsuki)
++	{
++	  entry->blsuki->visible = 0;
++	}
+ 
+       grub_free ((void *) entry->id);
+       grub_free ((void *) entry->users);
+diff --git a/include/grub/menu.h b/include/grub/menu.h
+index 0acdc2aa6b..43a3c5809b 100644
+--- a/include/grub/menu.h
++++ b/include/grub/menu.h
+@@ -20,6 +20,7 @@
+ #ifndef GRUB_MENU_HEADER
+ #define GRUB_MENU_HEADER 1
+ 
++
+ struct bls_entry
+ {
+   struct bls_entry *next;
+@@ -30,6 +31,18 @@ struct bls_entry
+   int visible;
+ };
+ 
++struct grub_blsuki_entry
++{
++  struct grub_blsuki_entry *next;
++  struct grub_blsuki_entry **prev;
++  struct keyval **keyvals;
++  grub_size_t keyvals_size;
++  int nkeyvals;
++  char *filename;
++  bool visible;
++};
++typedef struct grub_blsuki_entry grub_blsuki_entry_t;
++
+ struct grub_menu_entry_class
+ {
+   char *name;
+@@ -73,6 +86,7 @@ struct grub_menu_entry
+ 
+   /* BLS used to populate the entry */
+   struct bls_entry *bls;
++  grub_blsuki_entry_t *blsuki;
+ };
+ typedef struct grub_menu_entry *grub_menu_entry_t;
+ 
+diff --git a/include/grub/normal.h b/include/grub/normal.h
+index 8839ad85a1..6d2b59db88 100644
+--- a/include/grub/normal.h
++++ b/include/grub/normal.h
+@@ -145,7 +145,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes,
+ 			    const char *id,
+ 			    const char *users, const char *hotkey,
+ 			    const char *prefix, const char *sourcecode,
+-			    int submenu, int *index, struct bls_entry *bls);
++			    int submenu, int *index, struct bls_entry *bls, grub_blsuki_entry_t *blsuki);
+ 
+ grub_err_t
+ grub_normal_set_password (const char *user, const char *password);
diff --git a/0386-util-misc.c-Change-offset-type-for-grub_util_write_i.patch b/0386-util-misc.c-Change-offset-type-for-grub_util_write_i.patch
new file mode 100644
index 00000000..f80fb5c9
--- /dev/null
+++ b/0386-util-misc.c-Change-offset-type-for-grub_util_write_i.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Tue, 12 Aug 2025 03:45:34 +0000
+Subject: [PATCH] util/misc.c: Change offset type for
+ grub_util_write_image_at()
+
+Adding filevercmp support to grub-core/commands/blsuki.c from gnulib will cause
+issues with the type of the offset parameter for grub_util_write_image_at() for
+emu builds. To fix this issue, we can change the type from off_t to grub_off_t.
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ include/grub/util/misc.h | 2 +-
+ util/misc.c              | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
+index e9e0a6724a..bfce065583 100644
+--- a/include/grub/util/misc.h
++++ b/include/grub/util/misc.h
+@@ -36,7 +36,7 @@ char *grub_util_read_image (const char *path);
+ void grub_util_load_image (const char *path, char *buf);
+ void grub_util_write_image (const char *img, size_t size, FILE *out,
+ 			    const char *name);
+-void grub_util_write_image_at (const void *img, size_t size, off_t offset,
++void grub_util_write_image_at (const void *img, size_t size, grub_off_t offset,
+ 			       FILE *out, const char *name);
+ 
+ char *make_system_path_relative_to_its_root (const char *path);
+diff --git a/util/misc.c b/util/misc.c
+index 0f928e5b49..6e16a68d9a 100644
+--- a/util/misc.c
++++ b/util/misc.c
+@@ -101,7 +101,7 @@ grub_util_read_image (const char *path)
+ }
+ 
+ void
+-grub_util_write_image_at (const void *img, size_t size, off_t offset, FILE *out,
++grub_util_write_image_at (const void *img, size_t size, grub_off_t offset, FILE *out,
+ 			  const char *name)
+ {
+   grub_util_info ("writing 0x%" GRUB_HOST_PRIxLONG_LONG " bytes at offset 0x%"
diff --git a/0387-blsuki-Check-for-mounted-boot-in-emu.patch b/0387-blsuki-Check-for-mounted-boot-in-emu.patch
new file mode 100644
index 00000000..3f207333
--- /dev/null
+++ b/0387-blsuki-Check-for-mounted-boot-in-emu.patch
@@ -0,0 +1,342 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Tue, 12 Aug 2025 03:45:35 +0000
+Subject: [PATCH] blsuki: Check for mounted /boot in emu
+
+Irritatingly, BLS defines paths relative to the mountpoint of the
+filesystem which contains its snippets, not / or any other fixed
+location. So grub-emu needs to know whether /boot is a separate
+filesystem from / and conditionally prepend a path.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/Makefile.core.def     |  3 ++
+ grub-core/commands/blsuki.c     | 83 +++++++++++++++++++++++++++++++++++++----
+ grub-core/osdep/linux/getroot.c |  8 ++++
+ grub-core/osdep/unix/getroot.c  |  4 +-
+ include/grub/emu/misc.h         |  2 +-
+ 5 files changed, 91 insertions(+), 9 deletions(-)
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 5e0e757344..885dd436de 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -376,6 +376,9 @@ kernel = {
+   emu = kern/emu/cache_s.S;
+   emu = kern/emu/hostdisk.c;
+   emu = osdep/unix/hostdisk.c;
++  emu = osdep/relpath.c;
++  emu = osdep/getroot.c;
++  emu = osdep/unix/getroot.c;
+   emu = osdep/exec.c;
+   extra_dist = osdep/unix/exec.c;
+   emu = osdep/devmapper/hostdisk.c;
+diff --git a/grub-core/commands/blsuki.c b/grub-core/commands/blsuki.c
+index 9440adb100..ed93a150b1 100644
+--- a/grub-core/commands/blsuki.c
++++ b/grub-core/commands/blsuki.c
+@@ -32,6 +32,13 @@
+ #include <grub/lib/envblk.h>
+ #include <filevercmp.h>
+ 
++#ifdef GRUB_MACHINE_EMU
++#include <grub/emu/misc.h>
++#define GRUB_BOOT_DEVICE "/boot"
++#else
++#define GRUB_BOOT_DEVICE ""
++#endif
++
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+ #define GRUB_BLS_CONFIG_PATH "/loader/entries/"
+@@ -79,6 +86,34 @@ static grub_blsuki_entry_t *entries;
+ 
+ #define FOR_BLSUKI_ENTRIES(var) FOR_LIST_ELEMENTS (var, entries)
+ 
++/*
++ * BLS appears to make paths relative to the filesystem that snippets are
++ * on, not /. Attempt to cope.
++ */
++static char *blsuki_update_boot_device (char *tmp)
++{
++#ifdef GRUB_MACHINE_EMU
++  static int separate_boot = -1;
++  char *ret;
++
++  if (separate_boot != -1)
++    goto probed;
++
++  separate_boot = 0;
++
++  ret = grub_make_system_path_relative_to_its_root (GRUB_BOOT_DEVICE);
++
++  if (ret != NULL && ret[0] == '\0')
++    separate_boot = 1;
++
++ probed:
++  if (separate_boot == 0)
++    return tmp;
++#endif
++
++  return grub_stpcpy (tmp, GRUB_BOOT_DEVICE);
++}
++
+ /*
+  * This function will add a new keyval pair to a list of keyvals stored in the
+  * entry parameter.
+@@ -526,7 +561,7 @@ bls_get_linux (grub_blsuki_entry_t *entry)
+   linux_path = blsuki_get_val (entry, "linux", NULL);
+   options = blsuki_expand_val (blsuki_get_val (entry, "options", NULL));
+ 
+-  if (grub_add (sizeof ("linux "), grub_strlen (linux_path), &size))
++  if (grub_add (sizeof ("linux " GRUB_BOOT_DEVICE), grub_strlen (linux_path), &size))
+     {
+       grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while calculating linux buffer size");
+       goto finish;
+@@ -548,6 +583,7 @@ bls_get_linux (grub_blsuki_entry_t *entry)
+ 
+   tmp = linux_cmd;
+   tmp = grub_stpcpy (tmp, "linux ");
++  tmp = blsuki_update_boot_device (tmp);
+   tmp = grub_stpcpy (tmp, linux_path);
+   if (options != NULL)
+     {
+@@ -582,7 +618,7 @@ bls_get_initrd (grub_blsuki_entry_t *entry)
+ 
+       for (i = 0; initrd_list != NULL && initrd_list[i] != NULL; i++)
+ 	{
+-	  if (grub_add (size, 1, &size) ||
++	  if (grub_add (size, sizeof (" " GRUB_BOOT_DEVICE) - 1, &size) ||
+ 	      grub_add (size, grub_strlen (initrd_list[i]), &size))
+ 	    {
+ 	      grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected calculating initrd buffer size");
+@@ -605,6 +641,7 @@ bls_get_initrd (grub_blsuki_entry_t *entry)
+ 	{
+ 	  grub_dprintf ("blsuki", "adding initrd %s\n", initrd_list[i]);
+ 	  tmp = grub_stpcpy (tmp, " ");
++	  tmp = blsuki_update_boot_device (tmp);
+ 	  tmp = grub_stpcpy (tmp, initrd_list[i]);
+ 	}
+       tmp = grub_stpcpy (tmp, "\n");
+@@ -630,7 +667,7 @@ bls_get_devicetree (grub_blsuki_entry_t *entry)
+   dt_path = blsuki_expand_val (blsuki_get_val (entry, "devicetree", NULL));
+   if (dt_path != NULL)
+     {
+-      if (grub_add (sizeof ("devicetree "), grub_strlen (dt_path), &size) ||
++      if (grub_add (sizeof ("devicetree " GRUB_BOOT_DEVICE), grub_strlen (dt_path), &size) ||
+ 	  grub_add (size, 1, &size))
+ 	{
+ 	  grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected calculating device tree buffer size");
+@@ -643,6 +680,7 @@ bls_get_devicetree (grub_blsuki_entry_t *entry)
+ 
+       tmp = dt_cmd;
+       tmp = grub_stpcpy (dt_cmd, "devicetree ");
++      tmp = blsuki_update_boot_device (tmp);
+       tmp = grub_stpcpy (tmp, dt_path);
+       tmp = grub_stpcpy (tmp, "\n");
+     }
+@@ -757,7 +795,11 @@ blsuki_set_find_entry_info (struct find_entry_info *info, const char *dirname, c
+ 
+   if (devid == NULL)
+     {
++#ifdef GRUB_MACHINE_EMU
++      devid = "host";
++#else
+       devid = grub_env_get ("root");
++#endif
+       if (devid == NULL)
+ 	return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable '%s' isn't set"), "root");
+     }
+@@ -799,10 +841,13 @@ blsuki_set_find_entry_info (struct find_entry_info *info, const char *dirname, c
+  * parameter. If the fallback option is enabled, the default location will be
+  * checked for BLS config files if the first attempt fails.
+  */
+-static void
++static grub_err_t
+ blsuki_find_entry (struct find_entry_info *info, bool enable_fallback)
+ {
+   struct read_entry_info read_entry_info;
++  char *default_dir = NULL;
++  char *tmp;
++  grub_size_t default_size;
+   grub_fs_t dir_fs = NULL;
+   grub_device_t dir_dev = NULL;
+   bool fallback = false;
+@@ -833,7 +878,15 @@ blsuki_find_entry (struct find_entry_info *info, bool enable_fallback)
+        */
+       if (entries == NULL && fallback == false && enable_fallback == true)
+ 	{
+-	  blsuki_set_find_entry_info (info, GRUB_BLS_CONFIG_PATH, NULL);
++	  default_size = sizeof (GRUB_BOOT_DEVICE) + sizeof (GRUB_BLS_CONFIG_PATH) - 1;
++	  default_dir = grub_malloc (default_size);
++	  if (default_dir == NULL)
++	    return grub_errno;
++
++	  tmp = blsuki_update_boot_device (default_dir);
++	  tmp = grub_stpcpy (tmp, GRUB_BLS_CONFIG_PATH);
++
++	  blsuki_set_find_entry_info (info, default_dir, NULL);
+ 	  grub_dprintf ("blsuki", "Entries weren't found in %s, fallback to %s\n",
+ 			read_entry_info.dirname, info->dirname);
+ 	  fallback = true;
+@@ -842,6 +895,9 @@ blsuki_find_entry (struct find_entry_info *info, bool enable_fallback)
+ 	fallback = false;
+     }
+   while (fallback == true);
++
++  grub_free (default_dir);
++  return GRUB_ERR_NONE;
+ }
+ 
+ static grub_err_t
+@@ -851,6 +907,9 @@ blsuki_load_entries (char *path, bool enable_fallback)
+   static grub_err_t r;
+   const char *devid = NULL;
+   char *dir = NULL;
++  char *default_dir = NULL;
++  char *tmp;
++  grub_size_t dir_size;
+   struct find_entry_info info = {
+       .dev = NULL,
+       .fs = NULL,
+@@ -892,15 +951,25 @@ blsuki_load_entries (char *path, bool enable_fallback)
+     }
+ 
+   if (dir == NULL)
+-    dir = (char *) GRUB_BLS_CONFIG_PATH;
++    {
++      dir_size = sizeof (GRUB_BOOT_DEVICE) + sizeof (GRUB_BLS_CONFIG_PATH) - 2;
++      default_dir = grub_malloc (dir_size);
++      if (default_dir == NULL)
++	return grub_errno;
++
++      tmp = blsuki_update_boot_device (default_dir);
++      tmp = grub_stpcpy (tmp, GRUB_BLS_CONFIG_PATH);
++      dir = default_dir;
++    }
+ 
+   r = blsuki_set_find_entry_info (&info, dir, devid);
+   if (r == GRUB_ERR_NONE)
+-    blsuki_find_entry (&info, enable_fallback);
++    r = blsuki_find_entry (&info, enable_fallback);
+ 
+   if (info.dev != NULL)
+     grub_device_close (info.dev);
+ 
++  grub_free (default_dir);
+   return r;
+ }
+ 
+diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
+index 4bf386b590..8bf281c1d8 100644
+--- a/grub-core/osdep/linux/getroot.c
++++ b/grub-core/osdep/linux/getroot.c
+@@ -139,6 +139,7 @@ struct mountinfo_entry
+   char fstype[ESCAPED_PATH_MAX + 1], device[ESCAPED_PATH_MAX + 1];
+ };
+ 
++#ifdef GRUB_UTIL
+ static char **
+ grub_util_raid_getmembers (const char *name, int bootable)
+ {
+@@ -199,6 +200,7 @@ grub_util_raid_getmembers (const char *name, int bootable)
+ 
+   return devicelist;
+ }
++#endif
+ 
+ /* Statting something on a btrfs filesystem always returns a virtual device
+    major/minor pair rather than the real underlying device, because btrfs
+@@ -700,6 +702,7 @@ out:
+   return ret;
+ }
+ 
++#ifdef GRUB_UTIL
+ static char *
+ get_mdadm_uuid (const char *os_dev)
+ {
+@@ -757,6 +760,7 @@ out:
+ 
+   return name;
+ }
++#endif
+ 
+ static int
+ grub_util_is_imsm_or_ddf (const char *os_dev)
+@@ -1096,6 +1100,7 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
+   return path;
+ }
+ 
++#ifdef GRUB_UTIL
+ static char *
+ grub_util_get_raid_grub_dev (const char *os_dev)
+ {
+@@ -1198,6 +1203,7 @@ grub_util_get_raid_grub_dev (const char *os_dev)
+   }
+   return grub_dev;
+ }
++#endif
+ 
+ enum grub_dev_abstraction_types
+ grub_util_get_dev_abstraction_os (const char *os_dev)
+@@ -1214,6 +1220,7 @@ grub_util_get_dev_abstraction_os (const char *os_dev)
+   return GRUB_DEV_ABSTRACTION_NONE;
+ }
+ 
++#ifdef GRUB_UTIL
+ int
+ grub_util_pull_device_os (const char *os_dev,
+ 			  enum grub_dev_abstraction_types ab)
+@@ -1270,6 +1277,7 @@ grub_util_get_grub_dev_os (const char *os_dev)
+ 
+   return grub_dev;
+ }
++#endif
+ 
+ static void *mp = NULL;
+ static void
+diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c
+index ee11b02fb6..62581ba601 100644
+--- a/grub-core/osdep/unix/getroot.c
++++ b/grub-core/osdep/unix/getroot.c
+@@ -16,8 +16,8 @@
+  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#include <config.h>
+ #include <config-util.h>
++#include <config.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+@@ -567,6 +567,7 @@ grub_guess_root_devices (const char *dir_in)
+ 
+ #endif
+ 
++#ifdef GRUB_UTIL
+ void
+ grub_util_pull_lvm_by_command (const char *os_dev)
+ {
+@@ -663,6 +664,7 @@ out:
+   free (buf);
+   free (vgid);
+ }
++#endif
+ 
+ /* ZFS has similar problems to those of btrfs (see above).  */
+ void
+diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
+index f3a712a8b2..59b8038c60 100644
+--- a/include/grub/emu/misc.h
++++ b/include/grub/emu/misc.h
+@@ -39,7 +39,7 @@ void grub_fini_all (void);
+ void grub_find_zpool_from_dir (const char *dir,
+ 			       char **poolname, char **poolfs);
+ 
+-char *grub_make_system_path_relative_to_its_root (const char *path)
++char *EXPORT_FUNC (grub_make_system_path_relative_to_its_root) (const char *path)
+  WARN_UNUSED_RESULT;
+ int
+ grub_util_device_is_mapped (const char *dev);
diff --git a/0388-blsuki-Add-uki-command-to-load-Unified-Kernel-Image-.patch b/0388-blsuki-Add-uki-command-to-load-Unified-Kernel-Image-.patch
new file mode 100644
index 00000000..fe91d9e4
--- /dev/null
+++ b/0388-blsuki-Add-uki-command-to-load-Unified-Kernel-Image-.patch
@@ -0,0 +1,822 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alec Brown <alec.r.brown@oracle.com>
+Date: Tue, 12 Aug 2025 03:45:36 +0000
+Subject: [PATCH] blsuki: Add uki command to load Unified Kernel Image entries
+
+A Unified Kernel Image (UKI) is a single UEFI PE file that combines
+a UEFI boot stub, a Linux kernel image, an initrd, and further resources.
+The uki command will locate where the UKI file is and create a GRUB menu
+entry to load it.
+
+The Unified Kernel Image Specification: https://uapi-group.org/specifications/specs/unified_kernel_image/
+
+Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ docs/grub.texi              |  36 +++-
+ grub-core/commands/blsuki.c | 476 ++++++++++++++++++++++++++++++++++++++++----
+ include/grub/menu.h         |   2 +
+ 3 files changed, 474 insertions(+), 40 deletions(-)
+
+diff --git a/docs/grub.texi b/docs/grub.texi
+index 336f8e87ed..531e847f32 100644
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -3344,7 +3344,8 @@ chain-loaded system, @pxref{drivemap}.
+ @subsection blsuki_save_default
+ 
+ If this variable is set, menu entries generated from BLS config files
+-(@pxref{blscfg}) will be set as the default boot entry when selected.
++(@pxref{blscfg}) or UKI files (@pxref{uki}) will be set as the default boot
++entry when selected.
+ 
+ @node check_appended_signatures
+ @subsection check_appended_signatures
+@@ -4434,6 +4435,7 @@ you forget a command, you can run the command @command{help}
+ * true::                        Do nothing, successfully
+ * trust::                       Add public key to list of trusted keys
+ * trust_certificate::           Add an x509 certificate to the list of trusted certificates
++* uki::                         Load Unified Kernel Image menu entries
+ * unset::                       Unset an environment variable
+ @comment * vbeinfo::                     List available video modes
+ * verify_appended::             Verify appended digital signature
+@@ -6062,6 +6064,38 @@ Unset the environment variable @var{envvar}.
+ @end deffn
+ 
+ 
++@node uki
++@subsection uki
++
++@deffn Command uki [@option{-p|--path} dir] [@option{-f|--enable-fallback}] [@option{-d|--show-default}] [@option{-n|--show-non-default}] [@option{-e|--entry} file]
++Load Unified Kernel Image (UKI) files into the GRUB menu. Boot entries
++generated from @command{uki} won't interfere with entries from @file{grub.cfg} appearing in the
++GRUB menu. Also, entries generated from @command{uki} exists only in memory and don't
++update @file{grub.cfg}.
++
++By default, the UKI files are stored in the @file{/EFI/Linux} directory in the EFI
++system partition. If UKI files are stored elsewhere, the @option{--path} option can be
++used to check a different directory instead of the default location. If no UKI
++files are found while using the @option{--path} option, the @option{--enable-fallback} option can
++be used to check for files in the default location.
++
++The @option{--show-default} option allows the default boot entry to be added to the
++GRUB menu from the UKI files.
++
++The @option{--show-non-default} option allows non-default boot entries to be added to
++the GRUB menu from the UKI files.
++
++The @option{--entry} option allows specific boot entries to be added to the GRUB menu
++from the UKI files.
++
++The @option{--entry}, @option{--show-default}, and @option{--show-non-default} options
++are used to filter which UKI files are added to the GRUB menu. If none are
++used, all files in the default location or the location specified by @option{--path}
++will be added to the GRUB menu.
++
++For more information on UKI, see: @uref{https://uapi-group.org/specifications/specs/unified_kernel_image/, The Unified Kernel Image Specification}
++@end deffn
++
+ @ignore
+ @node vbeinfo
+ @subsection vbeinfo
+diff --git a/grub-core/commands/blsuki.c b/grub-core/commands/blsuki.c
+index ed93a150b1..cb00f936a7 100644
+--- a/grub-core/commands/blsuki.c
++++ b/grub-core/commands/blsuki.c
+@@ -32,6 +32,12 @@
+ #include <grub/lib/envblk.h>
+ #include <filevercmp.h>
+ 
++#ifdef GRUB_MACHINE_EFI
++#include <grub/efi/efi.h>
++#include <grub/efi/disk.h>
++#include <grub/efi/pe32.h>
++#endif
++
+ #ifdef GRUB_MACHINE_EMU
+ #include <grub/emu/misc.h>
+ #define GRUB_BOOT_DEVICE "/boot"
+@@ -42,14 +48,28 @@
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+ #define GRUB_BLS_CONFIG_PATH "/loader/entries/"
++#define GRUB_UKI_CONFIG_PATH "/EFI/Linux"
+ 
+ #define BLS_EXT_LEN (sizeof (".conf") - 1)
++#define UKI_EXT_LEN (sizeof (".efi") - 1)
+ 
+ /*
+  * It is highly unlikely to ever receive a large amount of keyval pairs. A
+  * limit of 10000 is more than enough.
+  */
+ #define BLSUKI_KEYVALS_MAX 10000
++/*
++ * The only sections we read are ".cmdline" and ".osrel". The ".cmdline"
++ * section has a size limit of 4096 and it would be very unlikely for the size
++ * of the ".osrel" section to be 5 times larger than 4096.
++ */
++#define UKI_SECTION_SIZE_MAX (5 * 4096)
++
++enum blsuki_cmd_type
++  {
++    BLSUKI_BLS_CMD,
++    BLSUKI_UKI_CMD,
++  };
+ 
+ static const struct grub_arg_option bls_opt[] =
+   {
+@@ -61,6 +81,18 @@ static const struct grub_arg_option bls_opt[] =
+     {0, 0, 0, 0, 0, 0}
+   };
+ 
++#ifdef GRUB_MACHINE_EFI
++static const struct grub_arg_option uki_opt[] =
++  {
++    {"path", 'p', 0, N_("Specify path to find UKI entries."), N_("DIR"), ARG_TYPE_PATHNAME},
++    {"enable-fallback", 'f', 0, "Fallback to the default BLS path if --path fails to find UKI entries.", 0, ARG_TYPE_NONE},
++    {"show-default", 'd', 0, N_("Allow the default UKI entry to be added to the GRUB menu."), 0, ARG_TYPE_NONE},
++    {"show-non-default", 'n', 0, N_("Allow the non-default UKI entries to be added to the GRUB menu."), 0, ARG_TYPE_NONE},
++    {"entry", 'e', 0, N_("Allow specificUKII entries to be added to the GRUB menu."), N_("FILE"), ARG_TYPE_FILE},
++    {0, 0, 0, 0, 0, 0}
++  };
++#endif
++
+ struct keyval
+ {
+   const char *key;
+@@ -71,6 +103,7 @@ struct read_entry_info
+ {
+   const char *devid;
+   const char *dirname;
++  enum blsuki_cmd_type cmd_type;
+   grub_file_t file;
+ };
+ 
+@@ -82,7 +115,7 @@ struct find_entry_info
+   grub_fs_t fs;
+ };
+ 
+-static grub_blsuki_entry_t *entries;
++static grub_blsuki_entry_t *entries = NULL;
+ 
+ #define FOR_BLSUKI_ENTRIES(var) FOR_LIST_ELEMENTS (var, entries)
+ 
+@@ -181,7 +214,7 @@ blsuki_add_keyval (grub_blsuki_entry_t *entry, char *key, char *val)
+  * Find the value of the key named by keyname. If there are allowed to be
+  * more than one, pass a pointer set to -1 to the last parameter the first
+  * time, and pass the same pointer through each time after, and it'll return
+- * them in sorted order as defined in the BLS fragment file.
++ * them in sorted order.
+  */
+ static char *
+ blsuki_get_val (grub_blsuki_entry_t *entry, const char *keyname, int *last)
+@@ -310,20 +343,212 @@ bls_parse_keyvals (grub_file_t f, grub_blsuki_entry_t *entry)
+   return err;
+ }
+ 
++#ifdef GRUB_MACHINE_EFI
++/*
++ * This function searches for the .cmdline, .osrel, and .linux sections of a
++ * UKI. We only need to store the data for the .cmdline and .osrel sections,
++ * but we also need to verify that the .linux section exists.
++ */
++static grub_err_t
++uki_parse_keyvals (grub_file_t f, grub_blsuki_entry_t *entry)
++{
++  struct grub_msdos_image_header *dos = NULL;
++  struct grub_pe_image_header *pe = NULL;
++  grub_off_t section_offset = 0;
++  struct grub_pe32_section_table *section = NULL;
++  struct grub_pe32_coff_header *coff_header = NULL;
++  char *val = NULL;
++  char *key = NULL;
++  const char *target[] = {".cmdline", ".osrel", ".linux", NULL};
++  bool has_linux = false;
++  grub_err_t err = GRUB_ERR_NONE;
++
++  dos = grub_zalloc (sizeof (*dos));
++  if (dos == NULL)
++    return grub_errno;
++  if (grub_file_read (f, dos, sizeof (*dos)) < (grub_ssize_t) sizeof (*dos))
++    {
++      err = grub_error (GRUB_ERR_FILE_READ_ERROR, "failed to read UKI image header");
++      goto finish;
++    }
++  if (dos->msdos_magic != GRUB_DOS_MAGIC)
++    {
++      err = grub_error (GRUB_ERR_BAD_FILE_TYPE, "plain image kernel is not supported");
++      goto finish;
++    }
++
++  grub_dprintf ("blsuki", "PE/COFF header @ %08x\n", dos->pe_image_header_offset);
++  pe = grub_zalloc (sizeof (*pe));
++  if (pe == NULL)
++    {
++      err = grub_errno;
++      goto finish;
++    }
++  if (grub_file_seek (f, dos->pe_image_header_offset) == (grub_off_t) -1 ||
++      grub_file_read (f, pe, sizeof (*pe)) != sizeof (*pe))
++    {
++      err = grub_error (GRUB_ERR_FILE_READ_ERROR, "failed to read COFF image header");
++      goto finish;
++    }
++  if (pe->optional_header.magic != GRUB_PE32_NATIVE_MAGIC)
++    {
++      err = grub_error (GRUB_ERR_BAD_FILE_TYPE, "non-native image not supported");
++      goto finish;
++    }
++
++  coff_header = &(pe->coff_header);
++  section_offset = dos->pe_image_header_offset + sizeof (*pe);
++
++  for (int i = 0; i < coff_header->num_sections; i++)
++    {
++      section = grub_zalloc (sizeof (*section));
++      if (section == NULL)
++	{
++	  err = grub_errno;
++	  goto finish;
++	}
++
++      if (grub_file_seek (f, section_offset) == (grub_off_t) -1 ||
++          grub_file_read (f, section, sizeof (*section)) != sizeof (*section))
++	{
++	  err = grub_error (GRUB_ERR_FILE_READ_ERROR, "failed to read section header");
++	  goto finish;
++	}
++
++      key = grub_strndup (section->name, 8);
++      if (key == NULL)
++	{
++	  err = grub_errno;
++	  goto finish;
++	}
++
++      for (int j = 0; target[j] != NULL; j++)
++	{
++	  if (grub_strcmp (key, target[j]) == 0)
++	    {
++	      /*
++	       * We don't need to read the contents of the .linux PE section, but we
++	       * should verify that the section exists.
++	       */
++	      if (grub_strcmp (key, ".linux") == 0)
++		{
++		  has_linux = true;
++		  break;
++		}
++
++	      if (section->raw_data_size > UKI_SECTION_SIZE_MAX)
++		{
++		  err = grub_error (GRUB_ERR_BAD_NUMBER, "UKI section size is larger than expected");
++		  goto finish;
++		}
++
++	      val = grub_zalloc (section->raw_data_size);
++	      if (val == NULL)
++		{
++		  err = grub_errno;
++		  goto finish;
++		}
++
++	      if (grub_file_seek (f, section->raw_data_offset) == (grub_off_t) -1 ||
++		  grub_file_read (f, val, section->raw_data_size) != (grub_ssize_t) section->raw_data_size)
++		{
++		  err = grub_error (GRUB_ERR_FILE_READ_ERROR, "failed to read section");
++		  goto finish;
++		}
++
++	      err = blsuki_add_keyval (entry, key, val);
++	      if (err != GRUB_ERR_NONE)
++		goto finish;
++
++	      break;
++	    }
++	}
++
++      section_offset += sizeof (*section);
++      grub_free (section);
++      grub_free (val);
++      grub_free (key);
++      section = NULL;
++      val = NULL;
++      key = NULL;
++    }
++
++  if (has_linux == false)
++    err = grub_error (GRUB_ERR_NO_KERNEL, "UKI is missing the '.linux' section");
++
++ finish:
++  grub_free (dos);
++  grub_free (pe);
++  grub_free (section);
++  grub_free (val);
++  grub_free (key);
++  return err;
++}
++
++/*
++ * This function obtains the keyval pairs when the .osrel data is input into
++ * the osrel_ptr parameter and returns the keyval pair. Since we are using
++ * grub_strtok_r(), the osrel_ptr will be updated to the following line of
++ * osrel. This function returns NULL when it reaches the end of osrel.
++ */
++static char *
++uki_read_osrel (char **osrel_ptr, char **val_ret)
++{
++  char *key, *val;
++  grub_size_t val_size;
++
++  for (;;)
++    {
++      key = grub_strtok_r (NULL, "\n\r", osrel_ptr);
++      if (key == NULL)
++	return NULL;
++
++      /* Remove leading white space */
++      while (*key == ' ' || *key == '\t')
++	key++;
++
++      /* Skip commented lines */
++      if (*key == '#')
++	continue;
++
++      /* Split key/value */
++      key = grub_strtok_r (key, "=", &val);
++      if (key == NULL || *val == '\0')
++	continue;
++
++      /* Remove quotes from value */
++      val_size = grub_strlen (val);
++      if ((*val == '\"' && val[val_size - 1] == '\"') ||
++	  (*val == '\'' && val[val_size - 1] == '\''))
++	{
++	  val[val_size - 1] = '\0';
++	  val++;
++	}
++
++      *val_ret = val;
++      break;
++    }
++
++  return key;
++}
++#endif
++
+ /*
+  * If a file hasn't already been opened, this function opens a BLS config file
+- * and initializes entry data before parsing keyvals and adding the entry to
+- * the list of BLS entries.
++ * or UKI and initializes entry data before parsing keyvals and adding the entry
++ * to the list of BLS or UKI entries.
+  */
+ static int
+ blsuki_read_entry (const char *filename,
+ 		   const struct grub_dirhook_info *dirhook_info __attribute__ ((__unused__)),
+ 		   void *data)
+ {
+-  grub_size_t path_len = 0, filename_len;
+-  grub_err_t err;
++  grub_size_t path_len = 0, ext_len = 0, filename_len;
++  grub_err_t err = GRUB_ERR_NONE;
+   char *p = NULL;
++  const char *ext = NULL;
+   grub_file_t f = NULL;
++  enum grub_file_type file_type = 0;
+   grub_blsuki_entry_t *entry;
+   struct read_entry_info *info = (struct read_entry_info *) data;
+ 
+@@ -331,17 +556,31 @@ blsuki_read_entry (const char *filename,
+ 
+   filename_len = grub_strlen (filename);
+ 
++  if (info->cmd_type == BLSUKI_BLS_CMD)
++    {
++      ext = ".conf";
++      ext_len = BLS_EXT_LEN;
++      file_type = GRUB_FILE_TYPE_CONFIG;
++    }
++#ifdef GRUB_MACHINE_EFI
++  else if (info->cmd_type == BLSUKI_UKI_CMD)
++    {
++      ext = ".efi";
++      ext_len = UKI_EXT_LEN;
++      file_type = GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE;
++    }
++#endif
++
+   if (info->file != NULL)
+     f = info->file;
+   else
+     {
+-      if (filename_len < BLS_EXT_LEN ||
+-	  grub_strcmp (filename + filename_len - BLS_EXT_LEN, ".conf") != 0)
++      if (filename_len < ext_len ||
++	  grub_strcmp (filename + filename_len - ext_len, ext) != 0)
+ 	return 0;
+ 
+       p = grub_xasprintf ("(%s)%s/%s", info->devid, info->dirname, filename);
+-
+-      f = grub_file_open (p, GRUB_FILE_TYPE_CONFIG);
++      f = grub_file_open (p, file_type);
+       grub_free (p);
+       if (f == NULL)
+ 	goto finish;
+@@ -373,7 +612,26 @@ blsuki_read_entry (const char *filename,
+       goto finish;
+     }
+ 
+-  err = bls_parse_keyvals (f, entry);
++  entry->dirname = grub_strdup (info->dirname);
++  if (entry->dirname == NULL)
++    {
++      grub_free (entry);
++      goto finish;
++    }
++
++  entry->devid = grub_strdup (info->devid);
++  if (entry->devid == NULL)
++    {
++      grub_free (entry);
++      goto finish;
++    }
++
++  if (info->cmd_type == BLSUKI_BLS_CMD)
++    err = bls_parse_keyvals (f, entry);
++#ifdef GRUB_MACHINE_EFI
++  else if (info->cmd_type == BLSUKI_UKI_CMD)
++    err = uki_parse_keyvals (f, entry);
++#endif
+ 
+   if (err == GRUB_ERR_NONE)
+     blsuki_add_entry (entry);
+@@ -389,7 +647,7 @@ blsuki_read_entry (const char *filename,
+ 
+ /*
+  * This function returns a list of values that had the same key in the BLS
+- * config file. The number of entries in this list is returned by the len
++ * config file or UKI. The number of entries in this list is returned by the len
+  * parameter.
+  */
+ static char **
+@@ -764,7 +1022,7 @@ bls_create_entry (grub_blsuki_entry_t *entry)
+ 			linux_cmd, initrd_cmd ? initrd_cmd : "",
+ 			dt_cmd ? dt_cmd : "");
+ 
+-  grub_normal_add_menu_entry (argc, argv, classes, id, users, hotkey, NULL, src, 0, entry);
++  grub_normal_add_menu_entry (argc, argv, classes, id, users, hotkey, NULL, src, 0, NULL, NULL, entry);
+ 
+  finish:
+   grub_free (linux_cmd);
+@@ -776,6 +1034,70 @@ bls_create_entry (grub_blsuki_entry_t *entry)
+   grub_free (src);
+ }
+ 
++#ifdef GRUB_MACHINE_EFI
++/*
++ * This function puts together the section data received from the UKI and
++ * generates a new entry in the GRUB boot menu.
++ */
++static void
++uki_create_entry (grub_blsuki_entry_t *entry)
++{
++  const char **argv = NULL;
++  char *id = entry->filename;
++  char *title = NULL;
++  char *options = NULL;
++  char *osrel, *osrel_line;
++  char *key = NULL;
++  char *value = NULL;
++  char *src = NULL;
++  bool blsuki_save_default;
++
++  /*
++   * Although .osrel is listed as optional in the UKI specification, the .osrel
++   * section is needed to generate the GRUB menu entry title.
++   */
++  osrel = blsuki_get_val (entry, ".osrel", NULL);
++  if (osrel == NULL)
++    {
++      grub_dprintf ("blsuki", "Skipping file %s with no '.osrel' key.\n", entry->filename);
++      goto finish;
++    }
++
++  osrel_line = osrel;
++  while ((key = uki_read_osrel (&osrel_line, &value)) != NULL)
++    {
++      if (grub_strcmp ("PRETTY_NAME", key) == 0)
++	{
++	  title = value;
++	  break;
++	}
++    }
++
++  options = blsuki_get_val (entry, ".cmdline", NULL);
++
++  argv = grub_zalloc (2 * sizeof (char *));
++  if (argv == NULL)
++    goto finish;
++  argv[0] = title;
++
++  blsuki_save_default = grub_env_get_bool ("blsuki_save_default", false);
++  src = grub_xasprintf ("%schainloader (%s)%s/%s%s%s\n",
++			blsuki_save_default ? "savedefault\n" : "",
++			entry->devid, entry->dirname,
++			entry->filename,
++			(options != NULL) ? " " : "",
++			(options != NULL) ? options : "");
++
++  grub_normal_add_menu_entry (1, argv, NULL, id, NULL, NULL, NULL, src, 0, NULL, NULL, entry);
++
++ finish:
++  grub_free (argv);
++  grub_free (src);
++  grub_free (options);
++  grub_free (osrel);
++}
++#endif
++
+ /*
+  * This function fills a find_entry_info struct passed in by the info parameter.
+  * If the dirname or devid parameters are set to NULL, the dirname and devid
+@@ -785,7 +1107,7 @@ bls_create_entry (grub_blsuki_entry_t *entry)
+  * device.
+  */
+ static grub_err_t
+-blsuki_set_find_entry_info (struct find_entry_info *info, const char *dirname, const char *devid)
++blsuki_set_find_entry_info (struct find_entry_info *info, const char *dirname, const char *devid, enum blsuki_cmd_type cmd_type)
+ {
+   grub_device_t dev;
+   grub_fs_t fs;
+@@ -795,10 +1117,23 @@ blsuki_set_find_entry_info (struct find_entry_info *info, const char *dirname, c
+ 
+   if (devid == NULL)
+     {
++      if (cmd_type == BLSUKI_BLS_CMD)
++	{
+ #ifdef GRUB_MACHINE_EMU
+-      devid = "host";
++	  devid = "host";
+ #else
+-      devid = grub_env_get ("root");
++	  devid = grub_env_get ("root");
++#endif
++	}
++#ifdef GRUB_MACHINE_EFI
++      else if (cmd_type == BLSUKI_UKI_CMD)
++	{
++	  grub_efi_loaded_image_t *image = grub_efi_get_loaded_image (grub_efi_image_handle);
++
++	  if (image == NULL)
++	    return grub_error (GRUB_ERR_BAD_DEVICE, N_("unable to find boot device"));
++	  devid = grub_efidisk_get_device_name (image->device_handle);
++	}
+ #endif
+       if (devid == NULL)
+ 	return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable '%s' isn't set"), "root");
+@@ -837,15 +1172,16 @@ blsuki_set_find_entry_info (struct find_entry_info *info, const char *dirname, c
+ }
+ 
+ /*
+- * This function searches for BLS config files based on the data in the info
+- * parameter. If the fallback option is enabled, the default location will be
+- * checked for BLS config files if the first attempt fails.
++ * This function searches for BLS config files and UKIs based on the data in the
++ * info parameter. If the fallback option is enabled, the default location will
++ * be checked for BLS config files or UKIs if the first attempt fails.
+  */
+ static grub_err_t
+-blsuki_find_entry (struct find_entry_info *info, bool enable_fallback)
++blsuki_find_entry (struct find_entry_info *info, bool enable_fallback, enum blsuki_cmd_type cmd_type)
+ {
+   struct read_entry_info read_entry_info;
+   char *default_dir = NULL;
++  const char *cmd_dir = NULL;
+   char *tmp;
+   grub_size_t default_size;
+   grub_fs_t dir_fs = NULL;
+@@ -862,6 +1198,7 @@ blsuki_find_entry (struct find_entry_info *info, bool enable_fallback)
+       dir_dev = info->dev;
+       dir_fs = info->fs;
+       read_entry_info.devid = info->devid;
++      read_entry_info.cmd_type = cmd_type;
+ 
+       r = dir_fs->fs_dir (dir_dev, read_entry_info.dirname, blsuki_read_entry,
+ 			  &read_entry_info);
+@@ -874,19 +1211,27 @@ blsuki_find_entry (struct find_entry_info *info, bool enable_fallback)
+       /*
+        * If we aren't able to find BLS entries in the directory given by info->dirname,
+        * we can fallback to the default location "/boot/loader/entries/" and see if we
+-       * can find the files there.
++       * can find the files there. If we can't find UKI entries, fallback to
++       * "/EFI/Linux" on the EFI system partition.
+        */
+       if (entries == NULL && fallback == false && enable_fallback == true)
+ 	{
+-	  default_size = sizeof (GRUB_BOOT_DEVICE) + sizeof (GRUB_BLS_CONFIG_PATH) - 1;
++	  if (cmd_type == BLSUKI_BLS_CMD)
++	    cmd_dir = GRUB_BLS_CONFIG_PATH;
++#ifdef GRUB_MACHINE_EFI
++	  else if (cmd_type == BLSUKI_UKI_CMD)
++	    cmd_dir = GRUB_UKI_CONFIG_PATH;
++#endif
++
++	  default_size = sizeof (GRUB_BOOT_DEVICE) + grub_strlen (cmd_dir);
+ 	  default_dir = grub_malloc (default_size);
+ 	  if (default_dir == NULL)
+ 	    return grub_errno;
+ 
+ 	  tmp = blsuki_update_boot_device (default_dir);
+-	  tmp = grub_stpcpy (tmp, GRUB_BLS_CONFIG_PATH);
++	  tmp = grub_stpcpy (tmp, cmd_dir);
+ 
+-	  blsuki_set_find_entry_info (info, default_dir, NULL);
++	  blsuki_set_find_entry_info (info, default_dir, NULL, cmd_type);
+ 	  grub_dprintf ("blsuki", "Entries weren't found in %s, fallback to %s\n",
+ 			read_entry_info.dirname, info->dirname);
+ 	  fallback = true;
+@@ -901,15 +1246,17 @@ blsuki_find_entry (struct find_entry_info *info, bool enable_fallback)
+ }
+ 
+ static grub_err_t
+-blsuki_load_entries (char *path, bool enable_fallback)
++blsuki_load_entries (char *path, bool enable_fallback, enum blsuki_cmd_type cmd_type)
+ {
+-  grub_size_t len;
++  grub_size_t len, ext_len = 0;
+   static grub_err_t r;
+   const char *devid = NULL;
+   char *dir = NULL;
+   char *default_dir = NULL;
+   char *tmp;
++  const char *cmd_dir = NULL;
+   grub_size_t dir_size;
++  const char *ext = NULL;
+   struct find_entry_info info = {
+       .dev = NULL,
+       .fs = NULL,
+@@ -918,12 +1265,26 @@ blsuki_load_entries (char *path, bool enable_fallback)
+   struct read_entry_info rei = {
+       .devid = NULL,
+       .dirname = NULL,
++      .cmd_type = cmd_type,
+   };
+ 
+   if (path != NULL)
+     {
++      if (cmd_type == BLSUKI_BLS_CMD)
++	{
++	  ext = ".conf";
++	  ext_len = BLS_EXT_LEN;
++	}
++#ifdef GRUB_MACHINE_EFI
++      else if (cmd_type == BLSUKI_UKI_CMD)
++	{
++	  ext = ".efi";
++	  ext_len = UKI_EXT_LEN;
++	}
++#endif
++
+       len = grub_strlen (path);
+-      if (len >= BLS_EXT_LEN && grub_strcmp (path + len - BLS_EXT_LEN, ".conf") == 0)
++      if (len >= ext_len && grub_strcmp (path + len - ext_len, ext) == 0)
+ 	{
+ 	  rei.file = grub_file_open (path, GRUB_FILE_TYPE_CONFIG);
+ 	  if (rei.file == NULL)
+@@ -952,19 +1313,26 @@ blsuki_load_entries (char *path, bool enable_fallback)
+ 
+   if (dir == NULL)
+     {
+-      dir_size = sizeof (GRUB_BOOT_DEVICE) + sizeof (GRUB_BLS_CONFIG_PATH) - 2;
++      if (cmd_type == BLSUKI_BLS_CMD)
++	cmd_dir = GRUB_BLS_CONFIG_PATH;
++#ifdef GRUB_MACHINE_EFI
++      else if (cmd_type == BLSUKI_UKI_CMD)
++	cmd_dir = GRUB_UKI_CONFIG_PATH;
++#endif
++
++      dir_size = sizeof (GRUB_BOOT_DEVICE) + grub_strlen (cmd_dir);
+       default_dir = grub_malloc (dir_size);
+       if (default_dir == NULL)
+ 	return grub_errno;
+ 
+       tmp = blsuki_update_boot_device (default_dir);
+-      tmp = grub_stpcpy (tmp, GRUB_BLS_CONFIG_PATH);
++      tmp = grub_stpcpy (tmp, cmd_dir);
+       dir = default_dir;
+     }
+ 
+-  r = blsuki_set_find_entry_info (&info, dir, devid);
++  r = blsuki_set_find_entry_info (&info, dir, devid, cmd_type);
+   if (r == GRUB_ERR_NONE)
+-    r = blsuki_find_entry (&info, enable_fallback);
++    r = blsuki_find_entry (&info, enable_fallback, cmd_type);
+ 
+   if (info.dev != NULL)
+     grub_device_close (info.dev);
+@@ -1002,11 +1370,11 @@ blsuki_is_default_entry (const char *def_entry, grub_blsuki_entry_t *entry, int
+ }
+ 
+ /*
+- * This function creates a GRUB boot menu entry for each BLS entry in the
+- * entries list.
++ * This function creates a GRUB boot menu entry for each BLS or UKI  entry in
++ * the entries list.
+  */
+ static grub_err_t
+-blsuki_create_entries (bool show_default, bool show_non_default, char *entry_id)
++blsuki_create_entries (bool show_default, bool show_non_default, char *entry_id, enum blsuki_cmd_type cmd_type)
+ {
+   const char *def_entry = NULL;
+   grub_blsuki_entry_t *entry = NULL;
+@@ -1025,7 +1393,12 @@ blsuki_create_entries (bool show_default, bool show_non_default, char *entry_id)
+ 	  (show_non_default == true && blsuki_is_default_entry (def_entry, entry, idx) == false) ||
+ 	  (entry_id != NULL && grub_strcmp (entry_id, entry->filename) == 0))
+ 	{
+-	  bls_create_entry (entry);
++	  if (cmd_type == BLSUKI_BLS_CMD)
++	    bls_create_entry (entry);
++#ifdef GRUB_MACHINE_EFI
++	  else if (cmd_type == BLSUKI_UKI_CMD)
++	    uki_create_entry (entry);
++#endif
+ 	  entry->visible = true;
+ 	}
+ 
+@@ -1036,8 +1409,7 @@ blsuki_create_entries (bool show_default, bool show_non_default, char *entry_id)
+ }
+ 
+ static grub_err_t
+-grub_cmd_blscfg (grub_extcmd_context_t ctxt, int argc __attribute__ ((unused)),
+-		 char **args __attribute__ ((unused)))
++blsuki_cmd (grub_extcmd_context_t ctxt, enum blsuki_cmd_type cmd_type)
+ {
+   grub_err_t err;
+   struct grub_arg_list *state = ctxt->state;
+@@ -1074,24 +1446,50 @@ grub_cmd_blscfg (grub_extcmd_context_t ctxt, int argc __attribute__ ((unused)),
+       show_non_default = true;
+     }
+ 
+-  err = blsuki_load_entries (path, enable_fallback);
++  err = blsuki_load_entries (path, enable_fallback, cmd_type);
+   if (err != GRUB_ERR_NONE)
+     return err;
+ 
+-  return blsuki_create_entries (show_default, show_non_default, entry_id);
++  return blsuki_create_entries (show_default, show_non_default, entry_id, cmd_type);
++}
++
++static grub_err_t
++grub_cmd_blscfg (grub_extcmd_context_t ctxt, int argc __attribute__ ((unused)),
++		 char **args __attribute__ ((unused)))
++{
++  return blsuki_cmd (ctxt, BLSUKI_BLS_CMD);
+ }
+ 
+ static grub_extcmd_t bls_cmd;
+ 
++#ifdef GRUB_MACHINE_EFI
++static grub_err_t
++grub_cmd_uki (grub_extcmd_context_t ctxt, int argc __attribute__ ((unused)),
++		 char **args __attribute__ ((unused)))
++{
++  return blsuki_cmd (ctxt, BLSUKI_UKI_CMD);
++}
++
++static grub_extcmd_t uki_cmd;
++#endif
++
+ GRUB_MOD_INIT(blsuki)
+ {
+   bls_cmd = grub_register_extcmd ("blscfg", grub_cmd_blscfg, 0,
+ 				  N_("[-p|--path] [-f|--enable-fallback] DIR [-d|--show-default] [-n|--show-non-default] [-e|--entry] FILE"),
+ 				  N_("Import Boot Loader Specification snippets."),
+ 				  bls_opt);
++#ifdef GRUB_MACHINE_EFI
++  uki_cmd = grub_register_extcmd ("uki", grub_cmd_uki, 0,
++				  N_("[-p|--path] DIR [-f|--enable-fallback] [-d|--show-default] [-n|--show-non-default] [-e|--entry] FILE"),
++				  N_("Import Unified Kernel Images"), uki_opt);
++#endif
+ }
+ 
+ GRUB_MOD_FINI(blsuki)
+ {
+   grub_unregister_extcmd (bls_cmd);
++#ifdef GRUB_MACHINE_EFI
++  grub_unregister_extcmd (uki_cmd);
++#endif
+ }
+diff --git a/include/grub/menu.h b/include/grub/menu.h
+index 43a3c5809b..0e4978dc3b 100644
+--- a/include/grub/menu.h
++++ b/include/grub/menu.h
+@@ -39,6 +39,8 @@ struct grub_blsuki_entry
+   grub_size_t keyvals_size;
+   int nkeyvals;
+   char *filename;
++  char *dirname;
++  char *devid;
+   bool visible;
+ };
+ typedef struct grub_blsuki_entry grub_blsuki_entry_t;
diff --git a/0389-posix_wrap-Tweaks-in-preparation-for-libtasn1.patch b/0389-posix_wrap-Tweaks-in-preparation-for-libtasn1.patch
new file mode 100644
index 00000000..d5932723
--- /dev/null
+++ b/0389-posix_wrap-Tweaks-in-preparation-for-libtasn1.patch
@@ -0,0 +1,168 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens <dja@axtens.net>
+Date: Fri, 15 Nov 2024 15:34:29 +0800
+Subject: [PATCH] posix_wrap: Tweaks in preparation for libtasn1
+
+Cc: Vladimir Serbinenko <phcoder@gmail.com>
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Gary Lin <glin@suse.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Tested-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ grub-core/lib/posix_wrap/c-ctype.h | 114 +++++++++++++++++++++++++++++++++++++
+ grub-core/lib/posix_wrap/string.h  |  21 +++++++
+ 2 files changed, 135 insertions(+)
+ create mode 100644 grub-core/lib/posix_wrap/c-ctype.h
+
+diff --git a/grub-core/lib/posix_wrap/c-ctype.h b/grub-core/lib/posix_wrap/c-ctype.h
+new file mode 100644
+index 0000000000..5f8fc8ce3f
+--- /dev/null
++++ b/grub-core/lib/posix_wrap/c-ctype.h
+@@ -0,0 +1,114 @@
++/*
++ *  GRUB  --  GRand Unified Bootloader
++ *  Copyright (C) 2024  Free Software Foundation, Inc.
++ *
++ *  GRUB is free software: you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation, either version 3 of the License, or
++ *  (at your option) any later version.
++ *
++ *  GRUB is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef GRUB_POSIX_C_CTYPE_H
++#define GRUB_POSIX_C_CTYPE_H	1
++
++#include <grub/misc.h>
++
++static inline bool
++c_isspace (int c)
++{
++  return !!grub_isspace (c);
++}
++
++static inline bool
++c_isdigit (int c)
++{
++  return !!grub_isdigit (c);
++}
++
++static inline bool
++c_islower (int c)
++{
++  return !!grub_islower (c);
++}
++
++static inline bool
++c_isascii (int c)
++{
++  return !(c & ~0x7f);
++}
++
++static inline bool
++c_isupper (int c)
++{
++  return !!grub_isupper (c);
++}
++
++static inline bool
++c_isxdigit (int c)
++{
++  return !!grub_isxdigit (c);
++}
++
++static inline bool
++c_isprint (int c)
++{
++  return !!grub_isprint (c);
++}
++
++static inline bool
++c_iscntrl (int c)
++{
++  return !grub_isprint (c);
++}
++
++static inline bool
++c_isgraph (int c)
++{
++  return grub_isprint (c) && !grub_isspace (c);
++}
++
++static inline bool
++c_isalnum (int c)
++{
++  return grub_isalpha (c) || grub_isdigit (c);
++}
++
++static inline bool
++c_ispunct (int c)
++{
++  return grub_isprint (c) && !grub_isspace (c) && !c_isalnum (c);
++}
++
++static inline bool
++c_isalpha (int c)
++{
++  return !!grub_isalpha (c);
++}
++
++static inline bool
++c_isblank (int c)
++{
++  return c == ' ' || c == '\t';
++}
++
++static inline int
++c_tolower (int c)
++{
++  return grub_tolower (c);
++}
++
++static inline int
++c_toupper (int c)
++{
++  return grub_toupper (c);
++}
++
++#endif
+diff --git a/grub-core/lib/posix_wrap/string.h b/grub-core/lib/posix_wrap/string.h
+index 1adb450b5a..d3e400d500 100644
+--- a/grub-core/lib/posix_wrap/string.h
++++ b/grub-core/lib/posix_wrap/string.h
+@@ -84,6 +84,27 @@ memchr (const void *s, int c, grub_size_t n)
+   return grub_memchr (s, c, n);
+ }
+ 
++static inline char *
++strncat (char *dest, const char *src, grub_size_t n)
++{
++  const char *end;
++  char *str = dest;
++  grub_size_t src_len;
++
++  dest += grub_strlen (dest);
++
++  end = grub_memchr (src, '\0', n);
++  if (end != NULL)
++    src_len = (grub_size_t) (end - src);
++  else
++    src_len = n;
++
++  dest[src_len] = '\0';
++  grub_memcpy (dest, src, src_len);
++
++  return str;
++}
++
+ #define memcmp grub_memcmp
+ #define memcpy grub_memcpy
+ #define memmove grub_memmove
diff --git a/0390-blsuki-do-not-register-blscfg-command.patch b/0390-blsuki-do-not-register-blscfg-command.patch
new file mode 100644
index 00000000..3fd4fa59
--- /dev/null
+++ b/0390-blsuki-do-not-register-blscfg-command.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Thu, 13 Nov 2025 11:57:52 -0600
+Subject: [PATCH] blsuki: do not register blscfg command
+
+The blscfg command is already defined on commands/blscfg.c so do not
+register it on blsuki.c. Also, the 'uki' command is only intended for
+EFI system so remove the other platforms from the module.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/Makefile.core.def | 2 --
+ grub-core/commands/blsuki.c | 4 ----
+ 2 files changed, 6 deletions(-)
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 885dd436de..a545ee430b 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -893,8 +893,6 @@ module = {
+   common = lib/gnulib/filevercmp.c;
+   enable = powerpc_ieee1275;
+   enable = efi;
+-  enable = i386_pc;
+-  enable = emu;
+   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+ };
+diff --git a/grub-core/commands/blsuki.c b/grub-core/commands/blsuki.c
+index cb00f936a7..bcd0114d85 100644
+--- a/grub-core/commands/blsuki.c
++++ b/grub-core/commands/blsuki.c
+@@ -1475,10 +1475,6 @@ static grub_extcmd_t uki_cmd;
+ 
+ GRUB_MOD_INIT(blsuki)
+ {
+-  bls_cmd = grub_register_extcmd ("blscfg", grub_cmd_blscfg, 0,
+-				  N_("[-p|--path] [-f|--enable-fallback] DIR [-d|--show-default] [-n|--show-non-default] [-e|--entry] FILE"),
+-				  N_("Import Boot Loader Specification snippets."),
+-				  bls_opt);
+ #ifdef GRUB_MACHINE_EFI
+   uki_cmd = grub_register_extcmd ("uki", grub_cmd_uki, 0,
+ 				  N_("[-p|--path] DIR [-f|--enable-fallback] [-d|--show-default] [-n|--show-non-default] [-e|--entry] FILE"),
diff --git a/0391-misc-add-z-length-modifier-support.patch b/0391-misc-add-z-length-modifier-support.patch
new file mode 100644
index 00000000..2fdcd77c
--- /dev/null
+++ b/0391-misc-add-z-length-modifier-support.patch
@@ -0,0 +1,81 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:32 +0800
+Subject: [PATCH] misc: add z length modifier support
+
+Add support for the 'z' length modifier in the printf code. This allows
+printing of size_t and ssize_t values using %zu, %zd and related
+formats. The parser maps 'z' to the correct integer width based on
+sizeof (size_t).
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/misc.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
+index c1c77c300c..2568a5489b 100644
+--- a/grub-core/kern/misc.c
++++ b/grub-core/kern/misc.c
+@@ -30,6 +30,7 @@
+ #if DEBUG_WITH_TIMESTAMPS
+ #include <grub/time.h>
+ #endif
++#include <stddef.h>
+ 
+ union printf_arg
+ {
+@@ -883,6 +884,9 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args,
+   COMPILE_TIME_ASSERT (sizeof (long) <= sizeof (long long));
+   COMPILE_TIME_ASSERT (sizeof (long long) == sizeof (void *)
+ 		       || sizeof (int) == sizeof (void *));
++  COMPILE_TIME_ASSERT (sizeof (size_t) == sizeof (unsigned)
++		       || sizeof (size_t) == sizeof (unsigned long)
++		       || sizeof (size_t) == sizeof (unsigned long long));
+ 
+   fmt = fmt0;
+   while ((c = *fmt++) != 0)
+@@ -917,11 +921,17 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args,
+ 	fmt++;
+ 
+       c = *fmt++;
++      if (c == 'z')
++	{
++	  c = *fmt++;
++	  goto do_count;
++	}
+       if (c == 'l')
+ 	c = *fmt++;
+       if (c == 'l')
+ 	c = *fmt++;
+ 
++ do_count:
+       switch (c)
+ 	{
+ 	case 'p':
+@@ -1018,6 +1028,14 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args,
+ 	  continue;
+ 	}
+ 
++      if (c == 'z')
++	{
++	  c = *fmt++;
++	  if (sizeof (size_t) == sizeof (unsigned long))
++	    longfmt = 1;
++	  else if (sizeof (size_t) == sizeof (unsigned long long))
++	    longfmt = 2;
++	}
+       if (c == 'l')
+ 	{
+ 	  c = *fmt++;
+@@ -1194,6 +1212,8 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,
+ 	}
+ 
+       c = *fmt++;
++      if (c == 'z')
++	c = *fmt++;
+       if (c == 'l')
+ 	c = *fmt++;
+       if (c == 'l')
diff --git a/0392-tests-add-z-modifier-printf-tests.patch b/0392-tests-add-z-modifier-printf-tests.patch
new file mode 100644
index 00000000..ce86dc4a
--- /dev/null
+++ b/0392-tests-add-z-modifier-printf-tests.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:33 +0800
+Subject: [PATCH] tests: add z modifier printf tests
+
+Add unit tests for %zd, %zu and %zx to verify size_t and ssize_t
+formatting matches system snprintf.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ tests/printf_unit_test.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/tests/printf_unit_test.c b/tests/printf_unit_test.c
+index 098c29fd9c..f2de187b03 100644
+--- a/tests/printf_unit_test.c
++++ b/tests/printf_unit_test.c
+@@ -20,6 +20,7 @@
+ #include <string.h>
+ #include <grub/test.h>
+ #include <grub/misc.h>
++#include <stdint.h>
+ 
+ #define MSG "printf test failed: %s, %s", real, expected
+ 
+@@ -73,6 +74,15 @@ printf_test (void)
+   grub_snprintf (real, sizeof (real), "%%0%dd ", 1);
+   snprintf (expected, sizeof (expected), "%%0%dd ", 1);
+   grub_test_assert (strcmp (real, expected) == 0, MSG);
++  grub_snprintf (real, sizeof (real), "%zd %zd %zd", (ssize_t) -1, (ssize_t) (SIZE_MAX >> 1), (ssize_t) 42);
++  snprintf (expected, sizeof (expected), "%zd %zd %zd", (ssize_t) -1, (ssize_t) (SIZE_MAX >> 1), (ssize_t) 42);
++  grub_test_assert (strcmp (real, expected) == 0, MSG);
++  grub_snprintf (real, sizeof (real), "%zu %zu %zu", (size_t) 0, (size_t) SIZE_MAX, (size_t) 42);
++  snprintf (expected, sizeof (expected), "%zu %zu %zu", (size_t) 0, (size_t) SIZE_MAX, (size_t) 42);
++  grub_test_assert (strcmp (real, expected) == 0, MSG);
++  grub_snprintf (real, sizeof (real), "%zx %zx %zx", (ssize_t) (SIZE_MAX >> 1), (size_t) SIZE_MAX, (size_t) 0xdeadbeefU);
++  snprintf (expected, sizeof (expected), "%zx %zx %zx", (ssize_t) (SIZE_MAX >> 1), (size_t) SIZE_MAX, (size_t) 0xdeadbeefU);
++  grub_test_assert (strcmp (real, expected) == 0, MSG);
+ }
+ 
+ GRUB_UNIT_TEST ("printf_unit_test", printf_test);
diff --git a/0393-util-grub-editenv-add-fs_envblk-open-helper.patch b/0393-util-grub-editenv-add-fs_envblk-open-helper.patch
new file mode 100644
index 00000000..893c4c71
--- /dev/null
+++ b/0393-util-grub-editenv-add-fs_envblk-open-helper.patch
@@ -0,0 +1,219 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:34 +0800
+Subject: [PATCH] util/grub-editenv: add fs_envblk open helper
+
+This patch adds the logic to locate and open an environment block that
+is stored in a reserved area on the device. It introduces the function
+fs_envblk_open() together with helper routines to read the block pointed
+to by the env_block variable, and to create the block on disk when it
+does not exist yet. When a block is created, the code records its
+location inside the file based envblk by setting env_block in block list
+syntax of offset plus size in sectors.
+
+The env_block variable acts as a link from the file envblk to the raw
+disk region so that later runs of grub-editenv can follow it and access
+the external block. The helper is exposed through a small ops table
+attached to fs_envblk so that later patches can call
+fs_envblk->ops->open() without touching core code again. At this stage
+variables are still stored in the file envblk and no redirection has
+been applied.
+
+In relation to this, the fs_envblk_spec table defines the file-system
+specific layout of the reserved raw blocks used for environment storage.
+It is prepared to facilitate integration in grub-editenv, with Btrfs to
+be added in the future once its reserved area is defined.
+
+An fs_envblk_init() helper is added to prepare it for using the ops with
+its associated data context if the feature is available. It is not used
+yet, but will be used later when a filesystem and its device are probed
+to initialize the fs_envblk handle and enable access to the feature.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Avnish Chouhan <avnish@linux.ibm.com>
+---
+ util/grub-editenv.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 170 insertions(+)
+
+diff --git a/util/grub-editenv.c b/util/grub-editenv.c
+index 948eec8a11..a544452e78 100644
+--- a/util/grub-editenv.c
++++ b/util/grub-editenv.c
+@@ -123,6 +123,176 @@ block, use `rm %s'."),
+   NULL, help_filter, NULL
+ };
+ 
++struct fs_envblk_spec {
++  const char *fs_name;
++  off_t offset;
++  size_t size;
++};
++typedef struct fs_envblk_spec fs_envblk_spec_t;
++
++static grub_envblk_t fs_envblk_open (grub_envblk_t envblk);
++
++struct fs_envblk_ops {
++  grub_envblk_t (*open) (grub_envblk_t);
++};
++typedef struct fs_envblk_ops fs_envblk_ops_t;
++
++struct fs_envblk {
++  fs_envblk_spec_t *spec;
++  fs_envblk_ops_t *ops;
++  const char *dev;
++};
++typedef struct fs_envblk *fs_envblk_t;
++
++static fs_envblk_ops_t fs_envblk_ops = {
++  .open = fs_envblk_open
++};
++
++/*
++ * fs_envblk_spec describes the file-system specific layout of reserved raw
++ * blocks used as environment blocks.
++ */
++static fs_envblk_spec_t fs_envblk_spec[] = {
++  { NULL, 0, 0 }
++};
++
++static fs_envblk_t fs_envblk = NULL;
++
++static void __attribute__ ((unused))
++fs_envblk_init (const char *fs_name, const char *dev)
++{
++  fs_envblk_spec_t *p;
++
++  if (fs_name == NULL || dev == NULL)
++    return;
++
++  for (p = fs_envblk_spec; p->fs_name != NULL; p++)
++    {
++      if (strcmp (fs_name, p->fs_name) == 0)
++	{
++	  if (fs_envblk == NULL)
++	    fs_envblk = xmalloc (sizeof (*fs_envblk));
++	  fs_envblk->spec = p;
++	  fs_envblk->dev = xstrdup (dev);
++	  fs_envblk->ops = &fs_envblk_ops;
++	  break;
++	}
++    }
++}
++
++static int
++read_env_block_var (const char *varname, const char *value, void *hook_data)
++{
++  grub_envblk_t *p_envblk = (grub_envblk_t *) hook_data;
++  off_t off;
++  size_t sz;
++  char *p, *buf;
++  FILE *fp;
++
++  if (p_envblk == NULL || fs_envblk == NULL)
++    return 1;
++
++  if (strcmp (varname, "env_block") != 0)
++    return 0;
++
++  off = strtol (value, &p, 10);
++  if (*p == '+')
++    sz = strtol (p + 1, &p, 10);
++  else
++    return 0;
++
++  if (*p != '\0' || sz == 0)
++    return 0;
++
++  off <<= GRUB_DISK_SECTOR_BITS;
++  sz <<= GRUB_DISK_SECTOR_BITS;
++
++  fp = grub_util_fopen (fs_envblk->dev, "rb");
++  if (fp == NULL)
++    grub_util_error (_("cannot open `%s': %s"), fs_envblk->dev, strerror (errno));
++
++  if (fseek (fp, off, SEEK_SET) < 0)
++    grub_util_error (_("cannot seek `%s': %s"), fs_envblk->dev, strerror (errno));
++
++  buf = xmalloc (sz);
++  if ((fread (buf, 1, sz, fp)) != sz)
++    grub_util_error (_("cannot read `%s': %s"), fs_envblk->dev, strerror (errno));
++
++  fclose (fp);
++
++  *p_envblk = grub_envblk_open (buf, sz);
++
++  return 1;
++}
++
++static void
++create_env_on_block (void)
++{
++  FILE *fp;
++  char *buf;
++  const char *device;
++  off_t offset;
++  size_t size;
++
++  if (fs_envblk == NULL)
++    return;
++
++  device = fs_envblk->dev;
++  offset = fs_envblk->spec->offset;
++  size = fs_envblk->spec->size;
++
++  fp = grub_util_fopen (device, "r+b");
++  if (fp == NULL)
++    grub_util_error (_("cannot open `%s': %s"), device, strerror (errno));
++
++  buf = xmalloc (size);
++  memcpy (buf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);
++  memset (buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1, '#', size - sizeof (GRUB_ENVBLK_SIGNATURE) + 1);
++
++  if (fseek (fp, offset, SEEK_SET) < 0)
++    grub_util_error (_("cannot seek `%s': %s"), device, strerror (errno));
++
++  if (fwrite (buf, 1, size, fp) != size)
++    grub_util_error (_("cannot write to `%s': %s"), device, strerror (errno));
++
++  grub_util_file_sync (fp);
++  free (buf);
++  fclose (fp);
++}
++
++static grub_envblk_t
++fs_envblk_open (grub_envblk_t envblk)
++{
++  grub_envblk_t envblk_on_block = NULL;
++  char *val;
++  off_t offset;
++  size_t size;
++
++  if (envblk == NULL)
++    return NULL;
++
++  offset = fs_envblk->spec->offset;
++  size = fs_envblk->spec->size;
++
++  grub_envblk_iterate (envblk, &envblk_on_block, read_env_block_var);
++
++  if (envblk_on_block != NULL && grub_envblk_size (envblk_on_block) == size)
++    return envblk_on_block;
++
++  create_env_on_block ();
++
++  offset = offset >> GRUB_DISK_SECTOR_BITS;
++  size =  (size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS;
++
++  val = xasprintf ("%lld+%zu", (long long) offset, size);
++  if (grub_envblk_set (envblk, "env_block", val) == 0)
++    grub_util_error ("%s", _("environment block too small"));
++  grub_envblk_iterate (envblk, &envblk_on_block, read_env_block_var);
++  free (val);
++
++  return envblk_on_block;
++}
++
+ static grub_envblk_t
+ open_envblk_file (const char *name)
+ {
diff --git a/0394-util-grub-editenv-add-fs_envblk-write-helper.patch b/0394-util-grub-editenv-add-fs_envblk-write-helper.patch
new file mode 100644
index 00000000..f94f747e
--- /dev/null
+++ b/0394-util-grub-editenv-add-fs_envblk-write-helper.patch
@@ -0,0 +1,91 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:35 +0800
+Subject: [PATCH] util/grub-editenv: add fs_envblk write helper
+
+This patch adds the function fs_envblk_write to update the reserved
+environment block on disk. The helper takes an in memory envblk buffer
+and writes it back to the device at the location defined by the
+fs_envblk specification. It performs size checks and uses file sync to
+ensure that the updated data is flushed.
+
+The helper is also added into the fs_envblk ops table, together with the
+open helper from the previous patch. With this change the basic input
+and output path for an external environment block is complete. The
+choice of which variables should be written externally will be handled
+by later patches.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Avnish Chouhan <avnish@linux.ibm.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/grub-editenv.c | 38 +++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 37 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub-editenv.c b/util/grub-editenv.c
+index a544452e78..f4b69bb19f 100644
+--- a/util/grub-editenv.c
++++ b/util/grub-editenv.c
+@@ -131,9 +131,11 @@ struct fs_envblk_spec {
+ typedef struct fs_envblk_spec fs_envblk_spec_t;
+ 
+ static grub_envblk_t fs_envblk_open (grub_envblk_t envblk);
++static void fs_envblk_write (grub_envblk_t envblk);
+ 
+ struct fs_envblk_ops {
+   grub_envblk_t (*open) (grub_envblk_t);
++  void (*write) (grub_envblk_t);
+ };
+ typedef struct fs_envblk_ops fs_envblk_ops_t;
+ 
+@@ -145,7 +147,8 @@ struct fs_envblk {
+ typedef struct fs_envblk *fs_envblk_t;
+ 
+ static fs_envblk_ops_t fs_envblk_ops = {
+-  .open = fs_envblk_open
++  .open = fs_envblk_open,
++  .write = fs_envblk_write
+ };
+ 
+ /*
+@@ -381,6 +384,39 @@ write_envblk (const char *name, grub_envblk_t envblk)
+   fclose (fp);
+ }
+ 
++static void
++fs_envblk_write (grub_envblk_t envblk)
++{
++  FILE *fp;
++  const char *device;
++  off_t offset;
++  size_t size;
++
++  if (envblk == NULL)
++    return;
++
++  device = fs_envblk->dev;
++  offset = fs_envblk->spec->offset;
++  size = fs_envblk->spec->size;
++
++  if (grub_envblk_size (envblk) > size)
++    grub_util_error ("%s", _("environment block too small"));
++
++  fp = grub_util_fopen (device, "r+b");
++
++  if (fp == NULL)
++    grub_util_error (_("cannot open `%s': %s"), device, strerror (errno));
++
++  if (fseek (fp, offset, SEEK_SET) < 0)
++    grub_util_error (_("cannot seek `%s': %s"), device, strerror (errno));
++
++  if (fwrite (grub_envblk_buffer (envblk), 1, grub_envblk_size (envblk), fp) != grub_envblk_size (envblk))
++    grub_util_error (_("cannot write to `%s': %s"), device, strerror (errno));
++
++  grub_util_file_sync (fp);
++  fclose (fp);
++}
++
+ static void
+ set_variables (const char *name, int argc, char *argv[])
+ {
diff --git a/0395-util-grub-editenv-wire-set_variables-to-optional-fs_.patch b/0395-util-grub-editenv-wire-set_variables-to-optional-fs_.patch
new file mode 100644
index 00000000..bf9820a3
--- /dev/null
+++ b/0395-util-grub-editenv-wire-set_variables-to-optional-fs_.patch
@@ -0,0 +1,118 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:36 +0800
+Subject: [PATCH] util/grub-editenv: wire set_variables to optional fs_envblk
+
+This patch changes set_variables() so that it can use an external
+environment block when one is present. The variable next_entry is
+written into the external block, env_block is treated as read only, and
+all other variables are written into the normal file based envblk.
+
+A cleanup step is added to handle cases where GRUB at runtime writes
+variables into the external block because file based updates are not
+safe on a copy on write filesystem such as Btrfs. For example, the
+savedefault command can update saved_entry, and on Btrfs GRUB will place
+that update in the external block instead of the file envblk. If an
+older copy remains in the external block, it would override the newer
+value from the file envblk when GRUB first loads the file and then
+applies the external block on top of it. To avoid this, whenever a
+variable is updated in the file envblk, any same named key in the
+external block is deleted.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Avnish Chouhan <avnish@linux.ibm.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/grub-editenv.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 56 insertions(+), 2 deletions(-)
+
+diff --git a/util/grub-editenv.c b/util/grub-editenv.c
+index f4b69bb19f..be844bf902 100644
+--- a/util/grub-editenv.c
++++ b/util/grub-editenv.c
+@@ -417,12 +417,35 @@ fs_envblk_write (grub_envblk_t envblk)
+   fclose (fp);
+ }
+ 
++struct var_lookup_ctx {
++  const char *varname;
++  bool found;
++};
++typedef struct var_lookup_ctx var_lookup_ctx_t;
++
++static int
++var_lookup_iter (const char *varname, const char *value __attribute__ ((unused)), void *hook_data)
++{
++  var_lookup_ctx_t *ctx = (var_lookup_ctx_t *) hook_data;
++
++  if (grub_strcmp (ctx->varname, varname) == 0)
++    {
++      ctx->found = true;
++      return 1;
++    }
++  return 0;
++}
++
+ static void
+ set_variables (const char *name, int argc, char *argv[])
+ {
+   grub_envblk_t envblk;
++  grub_envblk_t envblk_on_block = NULL;
+ 
+   envblk = open_envblk_file (name);
++  if (fs_envblk != NULL)
++    envblk_on_block = fs_envblk->ops->open (envblk);
++
+   while (argc)
+     {
+       char *p;
+@@ -433,15 +456,46 @@ set_variables (const char *name, int argc, char *argv[])
+ 
+       *(p++) = 0;
+ 
+-      if (! grub_envblk_set (envblk, argv[0], p))
+-        grub_util_error ("%s", _("environment block too small"));
++      if ((strcmp (argv[0], "next_entry") == 0) && envblk_on_block != NULL)
++	{
++	  if (grub_envblk_set (envblk_on_block, argv[0], p) == 0)
++	    grub_util_error ("%s", _("environment block too small"));
++	  goto next;
++	}
+ 
++      if (strcmp (argv[0], "env_block") == 0)
++	{
++	  grub_util_warn (_("can't set env_block as it's read-only"));
++	  goto next;
++	}
++
++      if (grub_envblk_set (envblk, argv[0], p) == 0)
++	grub_util_error ("%s", _("environment block too small"));
++
++      if (envblk_on_block != NULL)
++	{
++	  var_lookup_ctx_t ctx = {
++	    .varname = argv[0],
++	    .found = false
++	  };
++
++	  grub_envblk_iterate (envblk_on_block, &ctx, var_lookup_iter);
++	  if (ctx.found == true)
++	    grub_envblk_delete (envblk_on_block, argv[0]);
++	}
++ next:
+       argc--;
+       argv++;
+     }
+ 
+   write_envblk (name, envblk);
+   grub_envblk_close (envblk);
++
++  if (envblk_on_block != NULL)
++    {
++      fs_envblk->ops->write (envblk_on_block);
++      grub_envblk_close (envblk_on_block);
++    }
+ }
+ 
+ static void
diff --git a/0396-util-grub-editenv-wire-unset_variables-to-optional-f.patch b/0396-util-grub-editenv-wire-unset_variables-to-optional-f.patch
new file mode 100644
index 00000000..4b517b39
--- /dev/null
+++ b/0396-util-grub-editenv-wire-unset_variables-to-optional-f.patch
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:37 +0800
+Subject: [PATCH] util/grub-editenv: wire unset_variables to optional fs_envblk
+
+This patch updates unset_variables() so that removals are also applied
+to the external environment block when it is present. The code opens the
+external block, deletes the same named keys there, and then writes the
+external block back using fs_envblk_write(). The file based envblk is
+still updated and written as before.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Avnish Chouhan <avnish@linux.ibm.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/grub-editenv.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/util/grub-editenv.c b/util/grub-editenv.c
+index be844bf902..7ff1da9b40 100644
+--- a/util/grub-editenv.c
++++ b/util/grub-editenv.c
+@@ -502,18 +502,32 @@ static void
+ unset_variables (const char *name, int argc, char *argv[])
+ {
+   grub_envblk_t envblk;
++  grub_envblk_t envblk_on_block = NULL;
+ 
+   envblk = open_envblk_file (name);
++
++  if (fs_envblk != NULL)
++    envblk_on_block = fs_envblk->ops->open (envblk);
++
+   while (argc)
+     {
+       grub_envblk_delete (envblk, argv[0]);
+ 
++      if (envblk_on_block != NULL)
++	grub_envblk_delete (envblk_on_block, argv[0]);
++
+       argc--;
+       argv++;
+     }
+ 
+   write_envblk (name, envblk);
+   grub_envblk_close (envblk);
++
++  if (envblk_on_block != NULL)
++    {
++      fs_envblk->ops->write (envblk_on_block);
++      grub_envblk_close (envblk_on_block);
++    }
+ }
+ 
+ struct get_int_value_params {
diff --git a/0397-util-grub-editenv-wire-list_variables-to-optional-fs.patch b/0397-util-grub-editenv-wire-list_variables-to-optional-fs.patch
new file mode 100644
index 00000000..5687886d
--- /dev/null
+++ b/0397-util-grub-editenv-wire-list_variables-to-optional-fs.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:38 +0800
+Subject: [PATCH] util/grub-editenv: wire list_variables to optional fs_envblk
+
+This patch updates list_variables() so that it also prints entries from
+the external environment block when one is present. The function first
+lists all variables from the file based envblk, then iterates over the
+external envblk and prints those as well.
+
+The output format remains the same as before. The change makes it
+possible to inspect variables regardless of whether they are stored in
+the file envblk or in the reserved block.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Avnish Chouhan <avnish@linux.ibm.com>
+Reviewed-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/grub-editenv.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/util/grub-editenv.c b/util/grub-editenv.c
+index 7ff1da9b40..170d8f139a 100644
+--- a/util/grub-editenv.c
++++ b/util/grub-editenv.c
+@@ -358,10 +358,17 @@ static void
+ list_variables (const char *name)
+ {
+   grub_envblk_t envblk;
++  grub_envblk_t envblk_on_block = NULL;
+ 
+   envblk = open_envblk_file (name);
++  grub_envblk_iterate (envblk, &envblk_on_block, read_env_block_var);
+   grub_envblk_iterate (envblk, NULL, print_var);
+   grub_envblk_close (envblk);
++  if (envblk_on_block != NULL)
++    {
++      grub_envblk_iterate (envblk_on_block, NULL, print_var);
++      grub_envblk_close (envblk_on_block);
++    }
+ }
+ 
+ static void
diff --git a/0398-util-grub-editenv-add-probe-call-for-external-envblk.patch b/0398-util-grub-editenv-add-probe-call-for-external-envblk.patch
new file mode 100644
index 00000000..9d583168
--- /dev/null
+++ b/0398-util-grub-editenv-add-probe-call-for-external-envblk.patch
@@ -0,0 +1,176 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:39 +0800
+Subject: [PATCH] util/grub-editenv: add probe call for external envblk
+
+This patch adds the probe_fs_envblk() function to identify the root
+filesystem and invoke fs_envblk_init() with the probed filesystem type
+and device. This checks if the feature is available and initializes the
+handle, fs_envblk, to access the external environment block. It avoids
+configurations with diskfilter or cryptodisk where filesystem blocks may
+be remapped or encrypted.
+
+The probe is only invoked when grub-editenv is working on the default
+environment file path. This restriction ensures that probing and
+possible raw device access are not triggered for arbitrary user supplied
+paths, but only for the standard grubenv file. In that case the code
+checks if the filename equals DEFAULT_ENVBLK_PATH and then calls
+probe_fs_envblk with fs_envblk_spec. The result is stored in the global
+fs_envblk handle. At this stage the external environment block is only
+detected and recorded, and the behavior of grub-editenv is unchanged.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Avnish Chouhan <avnish@linux.ibm.com>
+---
+ util/grub-editenv.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 113 insertions(+), 2 deletions(-)
+
+diff --git a/util/grub-editenv.c b/util/grub-editenv.c
+index 170d8f139a..201dc7ccd4 100644
+--- a/util/grub-editenv.c
++++ b/util/grub-editenv.c
+@@ -23,8 +23,11 @@
+ #include <grub/util/misc.h>
+ #include <grub/lib/envblk.h>
+ #include <grub/i18n.h>
+-#include <grub/emu/hostfile.h>
++#include <grub/emu/hostdisk.h>
+ #include <grub/util/install.h>
++#include <grub/emu/getroot.h>
++#include <grub/fs.h>
++#include <grub/crypto.h>
+ 
+ #include <stdio.h>
+ #include <unistd.h>
+@@ -161,7 +164,7 @@ static fs_envblk_spec_t fs_envblk_spec[] = {
+ 
+ static fs_envblk_t fs_envblk = NULL;
+ 
+-static void __attribute__ ((unused))
++static void
+ fs_envblk_init (const char *fs_name, const char *dev)
+ {
+   fs_envblk_spec_t *p;
+@@ -582,6 +585,111 @@ incr_variables (const char *name, int argc, char *argv[])
+   grub_envblk_close (envblk);
+ }
+ 
++static bool
++is_abstraction (grub_device_t dev)
++{
++  if (dev == NULL || dev->disk == NULL)
++    return false;
++
++  if (dev->disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID ||
++      dev->disk->dev->id == GRUB_DISK_DEVICE_CRYPTODISK_ID)
++    return true;
++
++  return false;
++}
++
++static void
++probe_fs_envblk (fs_envblk_spec_t *spec)
++{
++  char **grub_devices = NULL;
++  char **curdev, **curdrive;
++  size_t ndev = 0;
++  char **grub_drives = NULL;
++  grub_device_t grub_dev = NULL;
++  grub_fs_t grub_fs = NULL;
++  bool have_abstraction = false;
++
++  grub_util_biosdisk_init (DEFAULT_DEVICE_MAP);
++  grub_init_all ();
++  grub_gcry_init_all ();
++
++  grub_lvm_fini ();
++  grub_mdraid09_fini ();
++  grub_mdraid1x_fini ();
++  grub_diskfilter_fini ();
++  grub_diskfilter_init ();
++  grub_mdraid09_init ();
++  grub_mdraid1x_init ();
++  grub_lvm_init ();
++
++  grub_devices = grub_guess_root_devices (DEFAULT_DIRECTORY);
++
++  if (grub_devices == NULL || grub_devices[0] == NULL)
++    {
++      grub_util_warn (_("cannot find a device for %s (is /dev mounted?)"), DEFAULT_DIRECTORY);
++      goto cleanup;
++    }
++
++  for (curdev = grub_devices; *curdev != NULL; curdev++, ndev++)
++    grub_util_pull_device (*curdev);
++
++  grub_drives = xcalloc ((ndev + 1), sizeof (grub_drives[0]));
++
++  for (curdev = grub_devices, curdrive = grub_drives; *curdev != NULL; curdev++,
++       curdrive++)
++    {
++      *curdrive = grub_util_get_grub_dev (*curdev);
++      if (*curdrive == NULL)
++	{
++	  grub_util_warn (_("cannot find a GRUB drive for %s.  Check your device.map"),
++			  *curdev);
++	  goto cleanup;
++	}
++    }
++  *curdrive = NULL;
++
++  grub_dev = grub_device_open (grub_drives[0]);
++  if (grub_dev == NULL)
++    {
++      grub_util_warn (_("cannot open device %s: %s"), grub_drives[0], grub_errmsg);
++      grub_errno = GRUB_ERR_NONE;
++      goto cleanup;
++    }
++
++  grub_fs = grub_fs_probe (grub_dev);
++  if (grub_fs == NULL)
++    {
++      grub_util_warn (_("cannot probe fs for %s: %s"), grub_drives[0], grub_errmsg);
++      grub_errno = GRUB_ERR_NONE;
++      goto cleanup;
++    }
++
++  have_abstraction = is_abstraction (grub_dev);
++  for (curdrive = grub_drives + 1; *curdrive != NULL && have_abstraction == false; curdrive++)
++    {
++      grub_device_t dev = grub_device_open (*curdrive);
++
++      if (dev == NULL)
++	continue;
++      have_abstraction = is_abstraction (dev);
++      grub_device_close (dev);
++    }
++
++  if (have_abstraction == false)
++    fs_envblk_init (grub_fs->name, grub_devices[0]);
++
++ cleanup:
++  if (grub_devices != NULL)
++    for (curdev = grub_devices; *curdev != NULL; curdev++)
++      free (*curdev);
++  free (grub_devices);
++  free (grub_drives);
++  grub_device_close (grub_dev);
++  grub_gcry_fini_all ();
++  grub_fini_all ();
++  grub_util_biosdisk_fini ();
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -613,6 +721,9 @@ main (int argc, char *argv[])
+       command  = argv[curindex++];
+     }
+ 
++  if (strcmp (filename, DEFAULT_ENVBLK_PATH) == 0)
++    probe_fs_envblk (fs_envblk_spec);
++
+   if (strcmp (command, "create") == 0)
+     grub_util_create_envblk_file (filename);
+   else if (strcmp (command, "list") == 0)
diff --git a/0399-btrfs-add-environment-block-to-reserved-header-area.patch b/0399-btrfs-add-environment-block-to-reserved-header-area.patch
new file mode 100644
index 00000000..dd877089
--- /dev/null
+++ b/0399-btrfs-add-environment-block-to-reserved-header-area.patch
@@ -0,0 +1,93 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:40 +0800
+Subject: [PATCH] btrfs: add environment block to reserved header area
+
+This patch reserves space for the GRUB environment block inside the
+Btrfs header. The block is placed at an offset of GRUB_ENV_BTRFS_OFFSET
+, 256 KiB from the start of the device, and occupies one sector. To
+protect the space, overflow guard sectors are placed before and after
+the reserved block.
+
+The Btrfs header already defines regions for bootloader use. By adding
+this entry, GRUB gains a fixed and safe location to store the
+environment block without conflicting with other structures in the
+header.
+
+Add Btrfs and its reserved area information to the fs_envblk_spec table.
+With the groundworks done in previous patches, the function is now
+complete and working in grub-editenv.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+---
+ grub-core/fs/btrfs.c | 10 +++++++++-
+ include/grub/fs.h    |  2 ++
+ util/grub-editenv.c  |  9 ++++++++-
+ 3 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
+index 3228e17886..261c413e9f 100644
+--- a/grub-core/fs/btrfs.c
++++ b/grub-core/fs/btrfs.c
+@@ -2650,11 +2650,16 @@ struct embed_region {
+  * https://btrfs.wiki.kernel.org/index.php/Manpage/btrfs(5)#BOOTLOADER_SUPPORT
+  * The first 1 MiB on each device is unused with the exception of primary
+  * superblock that is on the offset 64 KiB and spans 4 KiB.
++ *
++ * Note: If this table is modified, also update
++ * util/grub-editenv.c::fs_envblk_spec, which describes the file-system
++ * specific layout of reserved raw blocks used as environment blocks so that
++ * both stay consistent.
+  */
+ 
+ static const struct {
+   struct embed_region available;
+-  struct embed_region used[6];
++  struct embed_region used[9];
+ } btrfs_head = {
+   .available = {0, GRUB_DISK_KiB_TO_SECTORS (1024)}, /* The first 1 MiB. */
+   .used = {
+@@ -2662,6 +2667,9 @@ static const struct {
+     {GRUB_DISK_KiB_TO_SECTORS (64) - 1, 1},                        /* Overflow guard. */
+     {GRUB_DISK_KiB_TO_SECTORS (64), GRUB_DISK_KiB_TO_SECTORS (4)}, /* 4 KiB superblock. */
+     {GRUB_DISK_KiB_TO_SECTORS (68), 1},                            /* Overflow guard. */
++    {(GRUB_ENV_BTRFS_OFFSET >> GRUB_DISK_SECTOR_BITS) - 1, 1},     /* Overflow guard. */
++    {(GRUB_ENV_BTRFS_OFFSET >> GRUB_DISK_SECTOR_BITS), 1},         /* Environment Block. */
++    {(GRUB_ENV_BTRFS_OFFSET >> GRUB_DISK_SECTOR_BITS) + 1, 1},     /* Overflow guard. */
+     {GRUB_DISK_KiB_TO_SECTORS (1024) - 1, 1},                      /* Overflow guard. */
+     {0, 0}                                                         /* Array terminator. */
+   }
+diff --git a/include/grub/fs.h b/include/grub/fs.h
+index df4c93b16f..89e4d2b9bc 100644
+--- a/include/grub/fs.h
++++ b/include/grub/fs.h
+@@ -132,4 +132,6 @@ grub_fs_unregister (grub_fs_t fs)
+ 
+ grub_fs_t EXPORT_FUNC(grub_fs_probe) (grub_device_t device);
+ 
++#define GRUB_ENV_BTRFS_OFFSET (256 * 1024)
++
+ #endif /* ! GRUB_FS_HEADER */
+diff --git a/util/grub-editenv.c b/util/grub-editenv.c
+index 201dc7ccd4..3c3f9d09f3 100644
+--- a/util/grub-editenv.c
++++ b/util/grub-editenv.c
+@@ -156,9 +156,16 @@ static fs_envblk_ops_t fs_envblk_ops = {
+ 
+ /*
+  * fs_envblk_spec describes the file-system specific layout of reserved raw
+- * blocks used as environment blocks.
++ * blocks used as environment blocks. At present only Btrfs is supported. Other
++ * file-systems may be added if they provide a similar facility and avoid the
++ * limitation of writing to COW.
++ *
++ * Note: If this table is modified, also update
++ * grub-core/fs/btrfs.c::btrfs_head, which defines the layout in the Btrfs
++ * header and exports GRUB_ENV_BTRFS_OFFSET, so that both stay consistent.
+  */
+ static fs_envblk_spec_t fs_envblk_spec[] = {
++  { "btrfs", GRUB_ENV_BTRFS_OFFSET, GRUB_DISK_SECTOR_SIZE },
+   { NULL, 0, 0 }
+ };
+ 
diff --git a/0400-00_header.in-wire-grub.cfg-to-use-env_block-when-pre.patch b/0400-00_header.in-wire-grub.cfg-to-use-env_block-when-pre.patch
new file mode 100644
index 00000000..a807bb91
--- /dev/null
+++ b/0400-00_header.in-wire-grub.cfg-to-use-env_block-when-pre.patch
@@ -0,0 +1,82 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:41 +0800
+Subject: [PATCH] 00_header.in: wire grub.cfg to use env_block when present
+
+This patch extends the generated grub.cfg so that it can use the
+external environment block when the variable env_block is defined.
+During boot, if env_block is set, grub.cfg builds a device path for it,
+exports the variable, and then loads its contents in addition to the
+normal grubenv file.
+
+When GRUB writes variables such as next_entry or saved_entry, the save
+commands are changed to write into env_block if it is set, and to fall
+back to the grubenv file otherwise. In this way the external environment
+block is used automatically, and existing commands like savedefault or
+save_env do not need to change.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/grub.d/00_header.in | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index 3e1b77265d..a5d43929b8 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -58,6 +58,13 @@ if [ -f \${config_directory}/grubenv ]; then
+ elif [ -s \$prefix/grubenv ]; then
+   load_env
+ fi
++
++if [ "\${env_block}" ] ; then
++  set env_block="(\${root})\${env_block}"
++  export env_block
++  load_env -f "\${env_block}"
++fi
++
+ EOF
+ if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then
+     cat <<EOF
+@@ -66,7 +73,11 @@ if cmostest $GRUB_BUTTON_CMOS_ADDRESS ; then
+ elif [ "\${next_entry}" ] ; then
+    set default="\${next_entry}"
+    set next_entry=
+-   save_env next_entry
++   if [ "\${env_block}" ] ; then
++     save_env -f "\${env_block}" next_entry
++   else
++     save_env next_entry
++   fi
+    set boot_once=true
+ else
+    set default="${GRUB_DEFAULT}"
+@@ -77,7 +88,11 @@ else
+ if [ "\${next_entry}" ] ; then
+    set default="\${next_entry}"
+    set next_entry=
+-   save_env next_entry
++   if [ "\${env_block}" ] ; then
++     save_env -f "\${env_block}" next_entry
++   else
++     save_env next_entry
++   fi
+    set boot_once=true
+ else
+    set default="${GRUB_DEFAULT}"
+@@ -105,7 +120,12 @@ fi
+ function savedefault {
+   if [ -z "\${boot_once}" ]; then
+     saved_entry="\${chosen}"
+-    save_env saved_entry
++    if [ "\${env_block}" ] ; then
++      save_env -f "\${env_block}" saved_entry
++    else
++      save_env saved_entry
++    fi
++
+   fi
+ }
+ 
diff --git a/0401-btrfs-update-doc-link-for-bootloader-support.patch b/0401-btrfs-update-doc-link-for-bootloader-support.patch
new file mode 100644
index 00000000..81f26241
--- /dev/null
+++ b/0401-btrfs-update-doc-link-for-bootloader-support.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 17 Oct 2025 17:01:43 +0800
+Subject: [PATCH] btrfs: update doc link for bootloader support
+
+The old wiki link is obsolete and no longer updated, change it to the
+current documentation.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/btrfs.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
+index 261c413e9f..2222c57abd 100644
+--- a/grub-core/fs/btrfs.c
++++ b/grub-core/fs/btrfs.c
+@@ -2647,7 +2647,8 @@ struct embed_region {
+ };
+ 
+ /*
+- * https://btrfs.wiki.kernel.org/index.php/Manpage/btrfs(5)#BOOTLOADER_SUPPORT
++ * https://btrfs.readthedocs.io/en/latest/btrfs-man5.html#man-btrfs5-bootloader-support
++ * or invoke "man 5 btrfs" and visit the "bootloader support" subsection.
+  * The first 1 MiB on each device is unused with the exception of primary
+  * superblock that is on the offset 64 KiB and spans 4 KiB.
+  *
diff --git a/0402-docs-add-Btrfs-env-block-and-special-env-vars.patch b/0402-docs-add-Btrfs-env-block-and-special-env-vars.patch
new file mode 100644
index 00000000..11cf789d
--- /dev/null
+++ b/0402-docs-add-Btrfs-env-block-and-special-env-vars.patch
@@ -0,0 +1,93 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Mon, 27 Oct 2025 11:18:45 -0600
+Subject: [PATCH] docs: add Btrfs env block and special env vars
+
+Update grub.texi to describe the external environment block in the
+reserved area of Btrfs header used for grub-reboot and savedefault,
+and add a section documenting the saved_entry, next_entry, and
+env_block variables.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ docs/grub.texi | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 55 insertions(+)
+
+diff --git a/docs/grub.texi b/docs/grub.texi
+index 531e847f32..d669972337 100644
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -3265,6 +3265,7 @@ GRUB.  Others may be used freely in GRUB configuration files.
+ @menu
+ * Special environment variables::
+ * Environment block::
++* Special environment block variables::
+ @end menu
+ 
+ 
+@@ -3881,9 +3882,63 @@ For safety reasons, this storage is only available when installed on a plain
+ disk (no LVM or RAID), using a non-checksumming filesystem (no ZFS), and
+ using BIOS or EFI functions (no ATA, USB or IEEE1275).
+ 
++On Btrfs filesystems, a reserved area in the filesystem header may be used to
++store the environment block. This static block avoids the problems of updating
++a normal file on a copy-on-write filesystem, where writing raw block is not
++stable and requires metadata update. The reserved area provides a fixed
++location that GRUB can update directly, allowing commands such as
++@command{grub-reboot} and @samp{GRUB_SAVEDEFAULT} to function correctly on
++Btrfs volumes.
++
+ @command{grub2-mkconfig} uses this facility to implement
+ @samp{GRUB_SAVEDEFAULT} (@pxref{Simple configuration}).
+ 
++@node Special environment block variables
++@section Special environment block variables
++
++These special variables are usually written to the environment block
++(@pxref{Environment block}) to customize the behavior of @file{grub.cfg}
++generated by @command{grub-mkconfig}.
++
++@menu
++* saved_entry::
++* next_entry::
++* env_block::
++@end menu
++
++@node saved_entry
++@subsection saved_entry
++
++The @var{saved_entry} variable sets the default boot entry in @file{grub.cfg}
++created by @command{grub-mkconfig}. It can be set with
++@command{grub-set-default} to choose a default entry, or at runtime with the
++@code{savedefault} function in grub.cfg to save the current entry as the new
++default. This may require write access by GRUB.
++
++@node next_entry
++@subsection next_entry
++
++The @var{next_entry} variable sets the boot entry for the next boot only. After
++it is used, GRUB clears the value so it is not reused. This requires write
++access to the environment block (@pxref{Environment block}) at runtime. The
++@command{grub-reboot} command is usually used instead of changing this variable
++directly.
++
++@node env_block
++@subsection env_block
++
++If the filesystem is Btrfs and the disk is not an abstracted device such as
++LVM, RAID, or encryption, the reserved space in the Btrfs header can be used as
++the environment block (@pxref{Environment block}). This provides a fixed raw
++block that GRUB can reliably write to. The @var{env_block} records this
++location in GRUB blocklist syntax (@pxref{Block list syntax}) so that
++@command{grub-editenv} and @file{grub.cfg} know how to access and use the
++external raw block.
++
++This variable is initialized when @file{grubenv} is first created by
++@command{grub-editenv} and is treated as read-only to avoid being overwritten
++with an unpredictable value.
++
+ @node Modules
+ @chapter Modules
+ 
diff --git a/0403-kern-fs-Honour-file-read_hook-in-grub_fs_blocklist_r.patch b/0403-kern-fs-Honour-file-read_hook-in-grub_fs_blocklist_r.patch
new file mode 100644
index 00000000..6aa5d83e
--- /dev/null
+++ b/0403-kern-fs-Honour-file-read_hook-in-grub_fs_blocklist_r.patch
@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
+Date: Thu, 29 Aug 2024 13:01:02 +0200
+Subject: [PATCH] kern/fs: Honour file->read_hook() in grub_fs_blocklist_read()
+
+Unlike files accessed via a normal file system, the file->read_hook() is
+not honoured when using blocklist notation.
+
+This means that when trying to use a dedicated, 1 KiB, raw partition
+for the environment block and hence does something like
+
+  save_env --file=(hd0,gpt9)0+2 X Y Z
+
+this fails with "sparse file not allowed", which is rather unexpected,
+as I've explicitly said exactly which blocks should be used. Adding
+a little debugging reveals that grub_file_size(file) is 1024 as expected,
+but total_length is 0, simply because the callback was never invoked, so
+blocklists is an empty list.
+
+Fix that by honouring the ->read_hook() set by the caller, also when
+a "file" is specified with blocklist notation.
+
+Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
+Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/fs.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c
+index f25bace620..9f6f4ef9da 100644
+--- a/grub-core/kern/fs.c
++++ b/grub-core/kern/fs.c
+@@ -216,12 +216,15 @@ grub_fs_blocklist_read (grub_file_t file, char *buf, grub_size_t len)
+   grub_disk_addr_t sector;
+   grub_off_t offset;
+   grub_ssize_t ret = 0;
++  grub_disk_t disk = file->device->disk;
+ 
+   if (len > file->size - file->offset)
+     len = file->size - file->offset;
+ 
+   sector = (file->offset >> GRUB_DISK_SECTOR_BITS);
+   offset = (file->offset & (GRUB_DISK_SECTOR_SIZE - 1));
++  disk->read_hook = file->read_hook;
++  disk->read_hook_data = file->read_hook_data;
+   for (p = file->data; p->length && len > 0; p++)
+     {
+       if (sector < p->length)
+@@ -233,9 +236,12 @@ grub_fs_blocklist_read (grub_file_t file, char *buf, grub_size_t len)
+ 	       >> GRUB_DISK_SECTOR_BITS) > p->length - sector)
+ 	    size = ((p->length - sector) << GRUB_DISK_SECTOR_BITS) - offset;
+ 
+-	  if (grub_disk_read (file->device->disk, p->offset + sector, offset,
++	  if (grub_disk_read (disk, p->offset + sector, offset,
+ 			      size, buf) != GRUB_ERR_NONE)
+-	    return -1;
++	    {
++	      ret = -1;
++	      break;
++	    }
+ 
+ 	  ret += size;
+ 	  len -= size;
+@@ -245,6 +251,8 @@ grub_fs_blocklist_read (grub_file_t file, char *buf, grub_size_t len)
+       else
+ 	sector -= p->length;
+     }
++  disk->read_hook = NULL;
++  disk->read_hook_data = NULL;
+ 
+   return ret;
+ }
diff --git a/0404-util-grub.d-00_header.in-Prefer-dev-instead-of-root-.patch b/0404-util-grub.d-00_header.in-Prefer-dev-instead-of-root-.patch
new file mode 100644
index 00000000..efe9389e
--- /dev/null
+++ b/0404-util-grub.d-00_header.in-Prefer-dev-instead-of-root-.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa@fedoraproject.org>
+Date: Wed, 26 Nov 2025 08:20:26 -0500
+Subject: [PATCH] util/grub.d/00_header.in: Prefer $dev instead of $root for
+ $env_block
+
+In UEFI environments where GRUB loads a stub grub.cfg on the EFI
+System Partition (ESP) that points to the real one on the operating
+system volume, the $root value is set to the ESP instead of the
+operating system volume.
+
+This is particularly problematic for setups where the operating
+system boot data is on a Btrfs volume and the external environment
+block in the Btrfs bootloader space is used for grubenv data.
+
+Using $dev in its place resolves this problem, since the stub
+grub.cfg populates this variable. Use it if it exists, and
+fall back to $root accordingly.
+
+This is unlikely to be upstreamable, as it depends on the method
+Fedora Linux and derivatives use to load the GRUB configuration.
+
+Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
+---
+ util/grub.d/00_header.in | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index a5d43929b8..01f1f4144e 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -60,7 +60,11 @@ elif [ -s \$prefix/grubenv ]; then
+ fi
+ 
+ if [ "\${env_block}" ] ; then
+-  set env_block="(\${root})\${env_block}"
++  if [ "\${dev}" ]; then
++    set env_block="(\${dev})\${env_block}"
++  else
++    set env_block="(\${root})\${env_block}"
++  fi
+   export env_block
+   load_env -f "\${env_block}"
+ fi
diff --git a/0405-grub.d-Support-the-external-environment-block-for-au.patch b/0405-grub.d-Support-the-external-environment-block-for-au.patch
new file mode 100644
index 00000000..c75926a0
--- /dev/null
+++ b/0405-grub.d-Support-the-external-environment-block-for-au.patch
@@ -0,0 +1,89 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa@fedoraproject.org>
+Date: Wed, 26 Nov 2025 08:37:57 -0500
+Subject: [PATCH] grub.d: Support the external environment block for automatic
+ hidden menu
+
+This allows the automatic hidden menu (and boot counting) mechanism
+to use an external environment block if it exists and is configured
+to be used.
+
+This is particularly important for supporting this mechanism on
+systems with the operating system boot data on a Btrfs volume.
+
+This is unlikely to be upstreamable, as it depends on Fedora's GRUB
+hidden menu and boot counting patch sets.
+
+Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
+---
+ util/grub.d/08_fallback_counting.in  | 6 +++++-
+ util/grub.d/10_reset_boot_success.in | 6 +++++-
+ util/grub.d/12_menu_auto_hide.in     | 6 +++++-
+ util/grub.d/14_menu_show_once.in     | 6 +++++-
+ 4 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/util/grub.d/08_fallback_counting.in b/util/grub.d/08_fallback_counting.in
+index 2e2c3ff7d3..272cdb6533 100644
+--- a/util/grub.d/08_fallback_counting.in
++++ b/util/grub.d/08_fallback_counting.in
+@@ -19,6 +19,10 @@ if [ -n "\${boot_counter}" -a "\${boot_success}" = "0" ]; then
+   else
+     decrement boot_counter
+   fi
+-  save_env boot_counter
++  if [ "\${env_block}" ]; then
++    save_env -f "\${env_block}" boot_counter
++  else
++    save_env boot_counter
++  fi
+ fi
+ EOF
+diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in
+index e73f4137b3..ca04f9b699 100644
+--- a/util/grub.d/10_reset_boot_success.in
++++ b/util/grub.d/10_reset_boot_success.in
+@@ -21,5 +21,9 @@ elif [ "\${boot_indeterminate}" = "1" ]; then
+ fi
+ # Reset boot_success for current boot 
+ set boot_success=0
+-save_env boot_success boot_indeterminate
++if [ "\${env_block}" ]; then
++  save_env -f "\${env_block}" boot_success boot_indeterminate
++else
++  save_env boot_success boot_indeterminate
++fi
+ EOF
+diff --git a/util/grub.d/12_menu_auto_hide.in b/util/grub.d/12_menu_auto_hide.in
+index 6a7c0fa0d4..c2c207232e 100644
+--- a/util/grub.d/12_menu_auto_hide.in
++++ b/util/grub.d/12_menu_auto_hide.in
+@@ -16,7 +16,11 @@ cat << EOF
+ if [ x\$feature_timeout_style = xy ] ; then
+   if [ "\${menu_show_once}" ]; then
+     unset menu_show_once
+-    save_env menu_show_once
++    if [ "\${env_block}" ]; then
++      save_env -f "\${env_block}" menu_show_once
++    else
++      save_env menu_show_once
++    fi
+     set timeout_style=menu
+     set timeout=60
+   elif [ "\${menu_auto_hide}" -a "\${menu_hide_ok}" = "1" ]; then
+diff --git a/util/grub.d/14_menu_show_once.in b/util/grub.d/14_menu_show_once.in
+index 1cd7f36142..41b37b5ec7 100755
+--- a/util/grub.d/14_menu_show_once.in
++++ b/util/grub.d/14_menu_show_once.in
+@@ -7,7 +7,11 @@ if [ x\$feature_timeout_style = xy ]; then
+     set timeout_style=menu
+     set timeout="\${menu_show_once_timeout}"
+     unset menu_show_once_timeout
+-    save_env menu_show_once_timeout
++    if [ "\${env_block}" ]; then
++      save_env -f "\${env_block}" menu_show_once_timeout
++    else
++      save_env menu_show_once_timeout
++    fi
+   fi
+ fi
+ EOF
diff --git a/0406-grub-editenv-Make-automatic-hidden-menu-and-boot-cou.patch b/0406-grub-editenv-Make-automatic-hidden-menu-and-boot-cou.patch
new file mode 100644
index 00000000..92b053bf
--- /dev/null
+++ b/0406-grub-editenv-Make-automatic-hidden-menu-and-boot-cou.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa@fedoraproject.org>
+Date: Wed, 26 Nov 2025 08:48:10 -0500
+Subject: [PATCH] grub-editenv: Make automatic hidden menu and boot counting
+ use envblk when available
+
+This ensures the automatic hidden menu and boot counting settings
+are set in the right place when an external environment block is used.
+
+This is unlikely to be upstreamable, as it depends on Fedora's GRUB
+hidden menu and boot counting patch sets.
+
+Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
+---
+ util/grub-editenv.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub-editenv.c b/util/grub-editenv.c
+index 3c3f9d09f3..48611e4e17 100644
+--- a/util/grub-editenv.c
++++ b/util/grub-editenv.c
+@@ -473,7 +473,13 @@ set_variables (const char *name, int argc, char *argv[])
+ 
+       *(p++) = 0;
+ 
+-      if ((strcmp (argv[0], "next_entry") == 0) && envblk_on_block != NULL)
++      if (((strcmp (argv[0], "next_entry") == 0) ||
++           (strcmp (argv[0], "boot_counter") == 0) ||
++           (strcmp (argv[0], "boot_indeterminate") == 0) ||
++           (strcmp (argv[0], "boot_success") == 0) ||
++           (strcmp (argv[0], "menu_show_once") == 0) ||
++           (strcmp (argv[0], "menu_show_once_timeout") == 0))
++          && envblk_on_block != NULL)
+ 	{
+ 	  if (grub_envblk_set (envblk_on_block, argv[0], p) == 0)
+ 	    grub_util_error ("%s", _("environment block too small"));
diff --git a/0407-Increase-EFI-max-allocation-to-max-usable-address.patch b/0407-Increase-EFI-max-allocation-to-max-usable-address.patch
new file mode 100644
index 00000000..a1297e44
--- /dev/null
+++ b/0407-Increase-EFI-max-allocation-to-max-usable-address.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Fri, 28 Nov 2025 11:30:19 -0600
+Subject: [PATCH] Increase EFI max allocation to max usable address
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ include/grub/x86_64/efi/memory.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/grub/x86_64/efi/memory.h b/include/grub/x86_64/efi/memory.h
+index e81cfb3221..547e3f82f8 100644
+--- a/include/grub/x86_64/efi/memory.h
++++ b/include/grub/x86_64/efi/memory.h
+@@ -3,7 +3,7 @@
+ 
+ #if defined (__code_model_large__)
+ #define GRUB_EFI_MAX_USABLE_ADDRESS __UINTPTR_MAX__
+-#define GRUB_EFI_MAX_ALLOCATION_ADDRESS 0x7fffffff
++#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS
+ #else
+ #define GRUB_EFI_MAX_USABLE_ADDRESS 0x7fffffff
+ #define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS
diff --git a/20-grub.install b/20-grub.install
index bc55a14b..e402a4ce 100755
--- a/20-grub.install
+++ b/20-grub.install
@@ -19,6 +19,9 @@ MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID
 # If ${BOOT_DIR_ABS} exists, some other boot loader is active.
 [[ -d "${BOOT_DIR_ABS}" ]] && exit 0
 
+# UKIs are BLS type 2 entries, 90-uki-copy.install takes care of them
+[ "x$KERNEL_INSTALL_LAYOUT" != "xuki" ] || exit 0
+
 BLS_DIR="/boot/loader/entries"
 
 mkbls() {
@@ -29,6 +32,7 @@ mkbls() {
     local debugname=""
     local debugid=""
     local flavor=""
+    local devicetree_entry=""
 
     if [[ "$kernelver" == *\+* ]] ; then
         local flavor=-"${kernelver##*+}"
@@ -38,6 +42,12 @@ mkbls() {
         fi
     fi
 
+    # Define devicetree_entry if the user defined GRUB_DEVICETREE
+    # in /etc/default/grub, otherwise leave it empty
+    if [ -n "$GRUB_DEVICETREE" ] ; then
+        local devicetree_entry="devicetree /dtb-${kernelver}/$GRUB_DEVICETREE"
+    fi
+
     cat <<EOF
 title ${NAME} (${kernelver}) ${VERSION}${debugname}
 version ${kernelver}${debugid}
@@ -47,6 +57,7 @@ options ${kernelopts}
 grub_users \$grub_users
 grub_arg --unrestricted
 grub_class ${ID}
+${devicetree_entry}
 EOF
 }
 
@@ -54,35 +65,44 @@ EOF
 case "$COMMAND" in
     add)
         if [[ "${KERNEL_DIR}" != "/boot" ]]; then
+            # rename to match the name used in the pseudo-BLS snippet above
+            cp --remove-destination --preserve=timestamps -T "${KERNEL_IMAGE}" "/boot/vmlinuz-${KERNEL_VERSION}"
+            command -v restorecon &>/dev/null && \
+                restorecon -R "/boot/vmlinuz-${KERNEL_VERSION}"
+
             for i in \
-                "$KERNEL_IMAGE" \
                     "$KERNEL_DIR"/System.map \
                     "$KERNEL_DIR"/config \
                     "$KERNEL_DIR"/zImage.stub \
                     "$KERNEL_DIR"/dtb
             do
                 [[ -e "$i" ]] || continue
-                rm -f "/boot/${i##*/}-${KERNEL_VERSION}"
-                cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
+                cp --remove-destination --preserve=timestamps -rT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
                 command -v restorecon &>/dev/null && \
                     restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}"
             done
             # hmac is .vmlinuz-<version>.hmac so needs a special treatment
             i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
             if [[ -e "$i" ]]; then
-                rm -f "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
-                cp -a "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
+                cp --remove-destination --preserve=timestamps "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
                 command -v restorecon &>/dev/null && \
                     restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
             fi
+            # OLD method using gzip'd file (will be deprecated and removed in the future)
             # symvers is symvers-<version>.gz symlink, needs a special treatment
             i="$KERNEL_DIR/symvers.gz"
             if [[ -e "$i" ]]; then
-                rm -f "/boot/symvers-${KERNEL_VERSION}.gz"
-                ln -s "$i" "/boot/symvers-${KERNEL_VERSION}.gz"
+                ln -fs "$i" "/boot/symvers-${KERNEL_VERSION}.gz"
                 command -v restorecon &>/dev/null && \
                     restorecon "/boot/symvers-${KERNEL_VERSION}.gz"
             fi
+            # symvers is symvers-<version>.xz symlink, needs a special treatment
+            i="$KERNEL_DIR/symvers.xz"
+            if [[ -e "$i" ]]; then
+                ln -fs "$i" "/boot/symvers-${KERNEL_VERSION}.xz"
+                command -v restorecon &>/dev/null && \
+                    restorecon "/boot/symvers-${KERNEL_VERSION}.xz"
+            fi
         fi
 
         if [[ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]] || [[ ! -f /sbin/new-kernel-pkg ]]; then
@@ -130,7 +150,11 @@ case "$COMMAND" in
                 sed -i -e "s,^initrd.*,initrd ${BOOTPREFIX}${INITRD},g" "${BLS_TARGET}"
             fi
 
-            if [[ "$KERNEL_VERSION" == *\+* ]] && [ "x$GRUB_DEFAULT_TO_DEBUG" != "xtrue" ]; then
+            if ( [[ "$KERNEL_VERSION" != *${GRUB_DEFAULT_KERNEL_TYPE}* ]] && \
+                     [ "x$GRUB_NON_STANDARD_KERNEL" == "xtrue" ] ) || \
+                   ( echo "$KERNEL_VERSION" | grep -E -q "64k|auto|rt|uki" && \
+                     [ "x$GRUB_NON_STANDARD_KERNEL" != "xtrue" ] ) || \
+                   ( [[ "$KERNEL_VERSION" == *debug* ]] && [ "x$GRUB_DEFAULT_TO_DEBUG" != "xtrue" ] ); then
                 GRUB_UPDATE_DEFAULT_KERNEL=false
             fi
 
@@ -140,7 +164,7 @@ case "$COMMAND" in
 
             if [ "x$GRUB_LINUX_MAKE_DEBUG" = "xtrue" ]; then
                 BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
-                cp -aT  "${BLS_TARGET}" "${BLS_DEBUG}"
+                cp --preserve=timestamps -T  "${BLS_TARGET}" "${BLS_DEBUG}"
                 TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
                 OPTIONS="$(echo "${BOOT_OPTIONS[*]} ${GRUB_CMDLINE_LINUX_DEBUG}" | sed -e 's/\//\\\//g')"
                 sed -i -e "s/^title.*/title ${TITLE}${GRUB_LINUX_DEBUG_TITLE_POSTFIX}/" "${BLS_DEBUG}"
@@ -150,7 +174,7 @@ case "$COMMAND" in
                 fi
             fi
             if [ -n "$NEWDEFAULT" ]; then
-                grub2-editenv - set "saved_entry=${NEWDEFAULT}"
+                grub2-editenv - set "tmp_saved_entry=${NEWDEFAULT}"
             fi
 
             # this probably isn't the best place to do this, but it will do for now.
@@ -169,7 +193,11 @@ case "$COMMAND" in
         exit 77
         ;;
     remove)
-
+        # If the boot entry type is type2, we are not removing the BLS entry
+        if [[ "x${KERNEL_INSTALL_BOOT_ENTRY_TYPE}" = "xtype2" ]]; then
+            [ "${KERNEL_INSTALL_VERBOSE}" -gt 0 ] && echo "The boot entry type is type2. Skip removing BLS entry."
+            exit 0
+        fi
         if [[ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]] || [[ ! -f /sbin/new-kernel-pkg ]]; then
             BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
             BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
diff --git a/95-set-boot-entry.install b/95-set-boot-entry.install
new file mode 100755
index 00000000..9f92f9f4
--- /dev/null
+++ b/95-set-boot-entry.install
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+[[ -f /etc/default/grub ]] && . /etc/default/grub
+[[ -f /etc/os-release ]] && . /etc/os-release
+
+COMMAND="$1"
+KERNEL_VERSION="$2"
+BOOT_DIR_ABS="$3"
+KERNEL_IMAGE="$4"
+
+case "$COMMAND" in
+    add)
+        if [[ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]] || [[ ! -f /sbin/new-kernel-pkg ]]; then
+            entry=$(grub2-editenv list | grep tmp_saved_entry)
+            if [ -n "$entry" ]; then
+                BLS_ID=${entry##tmp_saved_entry=}
+                BLS_DIR="/boot/loader/entries"
+                BLS_TARGET="${BLS_DIR}/${BLS_ID}.conf"
+
+                LINUX="$(grep '^linux[ \t]' "${BLS_TARGET}" | sed -e 's,^linux[ \t]*,,' | awk '{print $1}')"
+                INITRD="$(grep '^initrd[ \t]' "${BLS_TARGET}" | sed -e 's,^initrd[ \t]*,,' | awk '{print $1}')"
+
+                ROOTPREFIX=""
+                [ -z "$(grub2-mkrelpath /boot)" ] && ROOTPREFIX="/boot"
+
+                if [ -e "${ROOTPREFIX}${LINUX}" -a -n "${INITRD}" ]; then
+                    if [ ! -e "${ROOTPREFIX}${INITRD}" ]; then
+                        echo "Error: ${ROOTPREFIX}${INITRD} not found."
+                        exit 1
+                    fi
+                    if ! lsinitrd ${ROOTPREFIX}${INITRD} > /dev/null; then
+                        echo "Error: ${ROOTPREFIX}${INITRD} appears to be corrupt."
+                        exit 1
+                    fi
+                fi
+
+                grub2-editenv - unset "tmp_saved_entry"
+                grub2-editenv - set "saved_entry=$BLS_ID"
+            fi
+        fi
+    ;;
+    *)
+        ;;
+esac
diff --git a/99-grub-mkconfig.install b/99-grub-mkconfig.install
index d9686b51..1a5fed8c 100755
--- a/99-grub-mkconfig.install
+++ b/99-grub-mkconfig.install
@@ -4,38 +4,31 @@ if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; then
     exit 0
 fi
 
-# PV and PVH Xen DomU guests boot with pygrub that doesn't have BLS support,
-# also Xen Dom0 use the menuentries from 20_linux_xen and not the ones from
-# 10_linux. So BLS support needs to be disabled for both Xen Dom0 and DomU.
-if [[ -e /sys/hypervisor/type ]] && grep -q "^xen$" /sys/hypervisor/type; then
+# Run grub2-mkconfig if ENABLE_BLSCFG is false
+if grep -sq '^GRUB_ENABLE_BLSCFG="*false"*\s*$' /etc/default/grub; then
     RUN_MKCONFIG=true
     DISABLE_BLS=true
 fi
 
-ARCH=$(uname -m)
-# Older ppc64le OPAL firmware (petitboot version < 1.8.0) don't have BLS support
-# so grub2-mkconfig has to be run to generate a config with menuentry commands.
-if [[ $ARCH = "ppc64le" ]] && [ -d /sys/firmware/opal ]; then
-
-    petitboot_path="/sys/firmware/devicetree/base/ibm,firmware-versions/petitboot"
-
-    if test -e ${petitboot_path}; then
-        read -r -d '' petitboot_version < ${petitboot_path}
-        petitboot_version="$(echo ${petitboot_version//v})"
-        major_version="$(echo ${petitboot_version} | cut -d . -f1)"
-        minor_version="$(echo ${petitboot_version} | cut -d . -f2)"
-
-        if test -z ${petitboot_version} || test ${major_version} -lt 1 || \
-           test ${major_version} -eq 1 -a ${minor_version} -lt 8; then
-            RUN_MKCONFIG=true
-        fi
-    else
+# PV and PVH Xen DomU guests boot with pygrub that doesn't have BLS support,
+# also Xen Dom0 use the menuentries from 20_linux_xen and not the ones from
+# 10_linux. So BLS support needs to be disabled for both Xen Dom0 and DomU.
+if [[ -e /sys/hypervisor/type ]] && grep -q "^xen$" /sys/hypervisor/type; then
+    if [ ! -e /sys/hypervisor/guest_type ] || ! grep -q "^HVM$" /sys/hypervisor/guest_type; then
         RUN_MKCONFIG=true
+        DISABLE_BLS=true
     fi
 fi
 
+ARCH=$(uname -m)
+# Older ppc64le OPAL firmware don't have BLS support so grub2-mkconfig has to be
+# run to generate a config with menuentry commands.
+if [[ $ARCH = "ppc64le" ]] && [ -d /sys/firmware/opal ]; then
+    RUN_MKCONFIG=true
+fi
+
 if [[ $DISABLE_BLS = "true" ]]; then
-    if grep -q '^GRUB_ENABLE_BLSCFG="*true"*\s*$' /etc/default/grub; then
+    if grep -sq '^GRUB_ENABLE_BLSCFG="*true"*\s*$' /etc/default/grub; then
 	sed -i 's/^GRUB_ENABLE_BLSCFG=.*/GRUB_ENABLE_BLSCFG=false/' /etc/default/grub
     fi
 fi
diff --git a/README.do-rebase b/README.do-rebase
new file mode 100644
index 00000000..42b7716b
--- /dev/null
+++ b/README.do-rebase
@@ -0,0 +1,21 @@
+do-rebase script
+================
+
+The `do-rebase` is a useful script that helps the developers to take patches from
+a remote repository & branch, apply those and create a commit. Although this sounds like
+easy steps, each may take time and it is prone to errors (as any manual work).
+
+To see in action, supposed you have a one or more patches for `f42` release that fixes (or
+enhances) a bug at the repository `git@github.com:someuser/grub2.git` with branch
+name `hotfix`; the way to call the script is by
+
+    $ ./do-rebase --dist=f42 --repo=git@github.com:someuser/grub2.git --branch=hotfix
+
+the script will then fetch the repository in a separate directory (`.rhboot.git`), compare
+those `hotfix` commits that has not been merged in `master` (`git format-patch master..hotfix`
+on the `.rhboot.git` repo), replace these with the ones in current working dir, finally create
+a commit that you can of course amend.
+
+The script supports other useful options: `--amend --commit --nocommit --bumpspec --nobumpspec --pkgtool=<PACKAGE_TOOL>`.
+Worth mentioning that you do not have to specify a --pkgtool option: it is infered from the --dist parameter but in
+case you want to override it, the options is there.
diff --git a/bootstrap b/bootstrap
index 5b08e7e2..c6d434da 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2019-01-04.17; # UTC
+scriptversion=2024-07-10.18; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2019 Free Software Foundation, Inc.
+# Copyright (C) 2003-2022 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ PERL="${PERL-perl}"
 
 me=$0
 
-default_gnulib_url=git://git.sv.gnu.org/gnulib
+default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git
 
 usage() {
   cat <<EOF
@@ -71,7 +71,9 @@ Options:
  --no-git                 do not use git to update gnulib.  Requires that
                           --gnulib-srcdir point to a correct gnulib snapshot
  --skip-po                do not download po files
-
+EOF
+  bootstrap_print_option_usage_hook
+  cat <<EOF
 If the file $me.conf exists in the same directory as this script, its
 contents are read as shell variables to configure the bootstrap.
 
@@ -113,6 +115,12 @@ Running without arguments will suffice in most cases.
 EOF
 }
 
+copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'`
+copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law."
+
 # warnf_ FORMAT-STRING ARG1...
 warnf_ ()
 {
@@ -154,6 +162,18 @@ gnulib_files=
 : ${AUTOPOINT=autopoint}
 : ${AUTORECONF=autoreconf}
 
+# A function to be called for each unrecognized option.  Returns 0 if
+# the option in $1 has been processed by the function.  Returns 1 if
+# the option has not been processed by the function.  Override it via
+# your own definition in bootstrap.conf
+
+bootstrap_option_hook() { return 1; }
+
+# A function to be called in order to print the --help information
+# corresponding to user-defined command-line options.
+
+bootstrap_print_option_usage_hook() { :; }
+
 # A function to be called right after gnulib-tool is run.
 # Override it via your own definition in bootstrap.conf.
 bootstrap_post_import_hook() { :; }
@@ -166,11 +186,11 @@ bootstrap_epilogue() { :; }
 # specified directory.  Fill in the first %s with the destination
 # directory and the second with the domain name.
 po_download_command_format=\
-"wget --mirror --level=1 -nd -q -A.po -P '%s' \
+"wget --mirror --level=1 -nd -nv -A.po -P '%s' \
  https://translationproject.org/latest/%s/"
 
 # Prefer a non-empty tarname (4th argument of AC_INIT if given), else
-# fall back to the package name (1st argument with munging)
+# fall back to the package name (1st argument with munging).
 extract_package_name='
   /^AC_INIT(\[*/{
      s///
@@ -187,8 +207,11 @@ extract_package_name='
      p
   }
 '
-package=$(sed -n "$extract_package_name" configure.ac) \
-  || die 'cannot find package name in configure.ac'
+package=$(${AUTOCONF:-autoconf} --trace AC_INIT:\$4 configure.ac 2>/dev/null)
+if test -z "$package"; then
+  package=$(sed -n "$extract_package_name" configure.ac) \
+      || die 'cannot find package name in configure.ac'
+fi
 gnulib_name=lib$package
 
 build_aux=build-aux
@@ -290,62 +313,6 @@ find_tool ()
   eval "export $find_tool_envvar"
 }
 
-# Override the default configuration, if necessary.
-# Make sure that bootstrap.conf is sourced from the current directory
-# if we were invoked as "sh bootstrap".
-case "$0" in
-  */*) test -r "$0.conf" && . "$0.conf" ;;
-  *) test -r "$0.conf" && . ./"$0.conf" ;;
-esac
-
-if test "$vc_ignore" = auto; then
-  vc_ignore=
-  test -d .git && vc_ignore=.gitignore
-  test -d CVS && vc_ignore="$vc_ignore .cvsignore"
-fi
-
-if test x"$gnulib_modules$gnulib_files$gnulib_extra_files" = x; then
-  use_gnulib=false
-else
-  use_gnulib=true
-fi
-
-# Translate configuration into internal form.
-
-# Parse options.
-
-for option
-do
-  case $option in
-  --help)
-    usage
-    exit;;
-  --gnulib-srcdir=*)
-    GNULIB_SRCDIR=${option#--gnulib-srcdir=};;
-  --skip-po)
-    SKIP_PO=t;;
-  --force)
-    checkout_only_file=;;
-  --copy)
-    copy=true;;
-  --bootstrap-sync)
-    bootstrap_sync=true;;
-  --no-bootstrap-sync)
-    bootstrap_sync=false;;
-  --no-git)
-    use_git=false;;
-  *)
-    die "$option: unknown option";;
-  esac
-done
-
-$use_git || test -d "$GNULIB_SRCDIR" \
-  || die "Error: --no-git requires --gnulib-srcdir"
-
-if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
-  die "Bootstrapping from a non-checked-out distribution is risky."
-fi
-
 # Strip blank and comment lines to leave significant entries.
 gitignore_entries() {
   sed '/^#/d; /^$/d' "$@"
@@ -387,6 +354,137 @@ insert_vc_ignore() {
   insert_if_absent "$vc_ignore_file" "$pattern"
 }
 
+symlink_to_dir()
+{
+  src=$1/$2
+  dst=${3-$2}
+
+  test -f "$src" && {
+
+    # If the destination directory doesn't exist, create it.
+    # This is required at least for "lib/uniwidth/cjk.h".
+    dst_dir=$(dirname "$dst")
+    if ! test -d "$dst_dir"; then
+      mkdir -p "$dst_dir"
+
+      # If we've just created a directory like lib/uniwidth,
+      # tell version control system(s) it's ignorable.
+      # FIXME: for now, this does only one level
+      parent=$(dirname "$dst_dir")
+      for dot_ig in x $vc_ignore; do
+        test $dot_ig = x && continue
+        ig=$parent/$dot_ig
+        insert_vc_ignore $ig "${dst_dir##*/}"
+      done
+    fi
+
+    if $copy; then
+      {
+        test ! -h "$dst" || {
+          echo "$me: rm -f $dst" &&
+          rm -f "$dst"
+        }
+      } &&
+      test -f "$dst" &&
+      cmp -s "$src" "$dst" || {
+        echo "$me: cp -fp $src $dst" &&
+        cp -fp "$src" "$dst"
+      }
+    else
+      # Leave any existing symlink alone, if it already points to the source,
+      # so that broken build tools that care about symlink times
+      # aren't confused into doing unnecessary builds.  Conversely, if the
+      # existing symlink's timestamp is older than the source, make it afresh,
+      # so that broken tools aren't confused into skipping needed builds.  See
+      # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>.
+      test -h "$dst" &&
+      src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
+      dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
+      test "$src_i" = "$dst_i" &&
+      both_ls=$(ls -dt "$src" "$dst") &&
+      test "X$both_ls" = "X$dst$nl$src" || {
+        dot_dots=
+        case $src in
+        /*) ;;
+        *)
+          case /$dst/ in
+          *//* | */../* | */./* | /*/*/*/*/*/)
+             die "invalid symlink calculation: $src -> $dst";;
+          /*/*/*/*/)    dot_dots=../../../;;
+          /*/*/*/)      dot_dots=../../;;
+          /*/*/)        dot_dots=../;;
+          esac;;
+        esac
+
+        echo "$me: ln -fs $dot_dots$src $dst" &&
+        ln -fs "$dot_dots$src" "$dst"
+      }
+    fi
+  }
+}
+
+# Override the default configuration, if necessary.
+# Make sure that bootstrap.conf is sourced from the current directory
+# if we were invoked as "sh bootstrap".
+case "$0" in
+  */*) test -r "$0.conf" && . "$0.conf" ;;
+  *) test -r "$0.conf" && . ./"$0.conf" ;;
+esac
+
+if test "$vc_ignore" = auto; then
+  vc_ignore=
+  test -d .git && vc_ignore=.gitignore
+  test -d CVS && vc_ignore="$vc_ignore .cvsignore"
+fi
+
+if test x"$gnulib_modules$gnulib_files$gnulib_extra_files" = x; then
+  use_gnulib=false
+else
+  use_gnulib=true
+fi
+
+# Translate configuration into internal form.
+
+# Parse options.
+
+for option
+do
+  case $option in
+  --help)
+    usage
+    exit;;
+  --version)
+    set -e
+    echo "bootstrap $scriptversion"
+    echo "$copyright"
+    exit 0
+    ;;
+  --gnulib-srcdir=*)
+    GNULIB_SRCDIR=${option#--gnulib-srcdir=};;
+  --skip-po)
+    SKIP_PO=t;;
+  --force)
+    checkout_only_file=;;
+  --copy)
+    copy=true;;
+  --bootstrap-sync)
+    bootstrap_sync=true;;
+  --no-bootstrap-sync)
+    bootstrap_sync=false;;
+  --no-git)
+    use_git=false;;
+  *)
+    bootstrap_option_hook $option || die "$option: unknown option";;
+  esac
+done
+
+$use_git || test -d "$GNULIB_SRCDIR" \
+  || die "Error: --no-git requires --gnulib-srcdir"
+
+if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
+  die "Bootstrapping from a non-checked-out distribution is risky."
+fi
+
 # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
 found_aux_dir=no
 grep '^[	 ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
@@ -665,9 +763,25 @@ if $use_gnulib; then
       shallow=
       if test -z "$GNULIB_REVISION"; then
         git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+        git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
+          || cleanup_gnulib
+      else
+        git fetch -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+        mkdir -p "$gnulib_path"
+        # Only want a shallow checkout of $GNULIB_REVISION, but git does not
+        # support cloning by commit hash. So attempt a shallow fetch by commit
+        # hash to minimize the amount of data downloaded and changes needed to
+        # be processed, which can drastically reduce download and processing
+        # time for checkout. If the fetch by commit fails, a shallow fetch can
+        # not be performed because we do not know what the depth of the commit
+        # is without fetching all commits. So fallback to fetching all commits.
+        git -C "$gnulib_path" init
+        git -C "$gnulib_path" remote add origin ${GNULIB_URL:-$default_gnulib_url}
+        git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" \
+          || git -C "$gnulib_path" fetch origin \
+          || cleanup_gnulib
+        git -C "$gnulib_path" reset --hard FETCH_HEAD
       fi
-      git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
-        || cleanup_gnulib
 
       trap - 1 2 13 15
     fi
@@ -784,75 +898,6 @@ case $SKIP_PO in
   fi;;
 esac
 
-symlink_to_dir()
-{
-  src=$1/$2
-  dst=${3-$2}
-
-  test -f "$src" && {
-
-    # If the destination directory doesn't exist, create it.
-    # This is required at least for "lib/uniwidth/cjk.h".
-    dst_dir=$(dirname "$dst")
-    if ! test -d "$dst_dir"; then
-      mkdir -p "$dst_dir"
-
-      # If we've just created a directory like lib/uniwidth,
-      # tell version control system(s) it's ignorable.
-      # FIXME: for now, this does only one level
-      parent=$(dirname "$dst_dir")
-      for dot_ig in x $vc_ignore; do
-        test $dot_ig = x && continue
-        ig=$parent/$dot_ig
-        insert_vc_ignore $ig "${dst_dir##*/}"
-      done
-    fi
-
-    if $copy; then
-      {
-        test ! -h "$dst" || {
-          echo "$me: rm -f $dst" &&
-          rm -f "$dst"
-        }
-      } &&
-      test -f "$dst" &&
-      cmp -s "$src" "$dst" || {
-        echo "$me: cp -fp $src $dst" &&
-        cp -fp "$src" "$dst"
-      }
-    else
-      # Leave any existing symlink alone, if it already points to the source,
-      # so that broken build tools that care about symlink times
-      # aren't confused into doing unnecessary builds.  Conversely, if the
-      # existing symlink's timestamp is older than the source, make it afresh,
-      # so that broken tools aren't confused into skipping needed builds.  See
-      # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>.
-      test -h "$dst" &&
-      src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
-      dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
-      test "$src_i" = "$dst_i" &&
-      both_ls=$(ls -dt "$src" "$dst") &&
-      test "X$both_ls" = "X$dst$nl$src" || {
-        dot_dots=
-        case $src in
-        /*) ;;
-        *)
-          case /$dst/ in
-          *//* | */../* | */./* | /*/*/*/*/*/)
-             die "invalid symlink calculation: $src -> $dst";;
-          /*/*/*/*/)    dot_dots=../../../;;
-          /*/*/*/)      dot_dots=../../;;
-          /*/*/)        dot_dots=../;;
-          esac;;
-        esac
-
-        echo "$me: ln -fs $dot_dots$src $dst" &&
-        ln -fs "$dot_dots$src" "$dst"
-      }
-    fi
-  }
-}
-
 version_controlled_file() {
   parent=$1
   file=$2
@@ -970,7 +1015,7 @@ bootstrap_post_import_hook \
 # Uninitialized submodules are listed with an initial dash.
 if $use_git && git submodule | grep '^-' >/dev/null; then
   die "some git submodules are not initialized. "     \
-      "Run 'git submodule init' and bootstrap again."
+      "Run 'git submodule update --init' and bootstrap again."
 fi
 
 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
@@ -1064,7 +1109,7 @@ bootstrap_epilogue
 
 echo "$0: done.  Now you can run './configure'."
 
-# Local variables:
+# Local Variables:
 # eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
diff --git a/bootstrap.conf b/bootstrap.conf
index 6b043fc3..7a7813d2 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2019 Free Software Foundation, Inc.
+# Copyright (C) 2006-2022 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,11 +16,10 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263
+GNULIB_REVISION=9f48fb992a3d7e96610c4ce8be969cff2d61a01b
 
 # gnulib modules used by this package.
-# mbswidth is used by gnulib-fix-width.diff's changes to argp rather than
-# directly.
+# mbswidth is used by fix-width.diff's changes to argp rather than directly.
 gnulib_modules="
   argp
   base64
@@ -35,6 +34,7 @@ gnulib_modules="
   realloc-gnu
   regex
   save-cwd
+  stdbool
 "
 
 gnulib_tool_option_extras="\
@@ -66,10 +66,11 @@ SKIP_PO=t
 
 # Build prerequisites
 buildreq="\
-autoconf   2.63
-automake   1.11
-gettext    0.18.3
+autoconf   2.64
+automake   1.14
+gettext    -
 git        1.5.5
+patch      -
 tar        -
 "
 
@@ -79,11 +80,12 @@ cp -a INSTALL INSTALL.grub
 
 bootstrap_post_import_hook () {
   set -e
-  for patchname in fix-base64 fix-null-deref fix-null-state-deref fix-regcomp-uninit-token \
-      fix-regexec-null-deref fix-uninit-structure fix-unused-value fix-width no-abort; do
-    patch -d grub-core/lib/gnulib -p2 \
-      < "grub-core/lib/gnulib-patches/$patchname.patch"
-  done
+
+  # Instead of patching our gnulib and therefore maintaining a fork, submit
+  # changes to gnulib and update the hash above when they've merged.  Do not
+  # add new patches here.
+  patch -d grub-core/lib/gnulib -p2 < grub-core/lib/gnulib-patches/fix-width.patch
+
   for patchname in \
       0001-Support-POTFILES-shell \
       0002-Handle-gettext_printf-shell-function \
diff --git a/do-rebase b/do-rebase
index 685cef68..8af199e2 100755
--- a/do-rebase
+++ b/do-rebase
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 set -u
+
 shopt -qu globstar
 shopt -qs expand_aliases
 export LC_COLLATE=C
@@ -18,24 +19,33 @@ usage()
 		exec 1>&2
 		retcode=$1
 	fi
-	echo usage: "do-rebase [OPTIONS] [--dist RELEASEVER | RELEASEVER ] [GITREPO]"
-	echo OPTIONS: --dist=RELEASEVER --repo=REPO --amend --nocommit --nobumpspec
-	exit $retcode
+	echo usage: "do-rebase [OPTIONS] --dist=<RELEASE_VER> --repo=<REPOSITORY> --branch=<BRANCH>"
+	echo OPTIONS: "--amend --commit --nocommit --bumpspec --nobumpspec"
+	exit "$retcode"
 }
 
-if ! git status | grep -q 'nothing to commit, working .* clean' ; then
+on_error() {
+    exec 1>&2
+    echo "An error occurred. Exiting..."
+    git reset --hard
+    exit 1
+}
+
+trap 'on_error' ERR
+
+# Check if the working directory is clean (no changes)
+if ! git diff-index --quiet HEAD --; then
 	echo "Working directory is not clean, cannot rebase." 1>&2
 	exit 1
 fi
 
-gitrepo="git@github.com:rhboot/grub2.git"
+gitrepo=""
+branch=""
 releasever=""
 amend=""
 commit=1
 bumpspec=1
 
-declare -a savedargs
-savedargs=()
 while [ $# -gt 0 ]; do
 	case $1 in
 	--help|-h|--usage|-?|-u)
@@ -55,6 +65,13 @@ while [ $# -gt 0 ]; do
 		shift
 		gitrepo=$1
 		;;
+	--branch=*)
+		  branch=${1##--branch=}
+		  ;;
+	--branch)
+		  shift
+		  branch=$1
+		  ;;
 	--amend)
 		amend="--amend"
 		;;
@@ -74,93 +91,44 @@ while [ $# -gt 0 ]; do
 		bumpspec=0
 		;;
 	*)
-		savedargs[${#savedargs[@]}]="$1"
+    echo "Unknown parameter $1"
 		;;
 	esac
 	shift
 done
-set -- "${savedargs[@]}"
 
-if [ -z "${releasever}" -a $# -gt 0 ]; then
-	releasever=$1
-	shift
-else
-	dist=$(git status | grep "On branch" | cut -d\  -f3-)
-	if [ -z "$dist" ]; then
-		echo "Could not figure out distro release version" 1>&2
-		usage 1
-	fi
-	case "$(eval echo \${dist})" in
-	.fc*)
-		releasever=$(echo ${dist} | \
-			sed 's/^\.fc\([[:digit:]]\+\)$/fedora-\1/')
-		;;
-	.*)
-		releasever=$(echo $dist | \
-			sed 's/^\.\([[:alpha:]]\+\)\([[:digit:]]\+\)$/\1-\2/')
-		;;
-	rhel*)
-		releasever=${dist}
-		dist=.el${releasever##rhel-}
-		;;
-	esac
-	if [ -z "${releasever}" -o "${releasever}" = "${dist}" ]; then
-		echo "Could not figure out distro release version" 1>&2
-		usage 1
-	fi
+# check must params
+if [ -z "$releasever" ] || [ -z "$gitrepo" ] || [ -z "$branch" ]; then
+    usage
 fi
 
-if [ -z "$releasever" ]; then
-	echo "Could not figure out distro release version" 1>&2
-	usage 1
-fi
-
-if [ -n "${1:-}" ]; then
-	gitrepo=$1
-	shift
-fi
-
-if [ $# -ge 1 ]; then
-	echo "Unknown argument \"$1\"" 1>&2
-	usage 1
-fi
-
-if [ ! -d $PWD/.rhboot.git ]; then
+if [ ! -d "$PWD/.rhboot.git" ]; then
 	othergit init
 	othergit config core.abbrev 11
-	if ! othergit remote add \
-		 rhboot $gitrepo \
-		  >/dev/null 2>&1 ; then
+	if ! othergit remote add rhboot "$gitrepo" >/dev/null 2>&1 ; then
 		echo "Could not add remote: rhboot" 1>&2
 		exit 1
 	fi
 elif othergit remote show -n rhboot | grep -q "URL: github$" ; then
-	if ! othergit remote add \
-		 rhboot $gitrepo \
-		  >/dev/null 2>&1 ; then
+	if ! othergit remote add rhboot "$gitrepo" >/dev/null 2>&1 ; then
 		echo "Could not add remote: rhboot" 1>&2
 		exit 1
 	fi
 else
-	othergit remote set-url rhboot ${gitrepo}
+	othergit remote set-url rhboot "${gitrepo}"
 fi
 
 othergit fetch rhboot
-remote=$(othergit branch --list -r "rhboot/${releasever}" 2>/dev/null)
-if [ "${remote}" != "  rhboot/${releasever}" ]; then
-	echo branch \"${releasever}\" does not appear to exist 1>&2
-	exit 1
-fi
 
 unset LC_ALL
 git rm -q 0*.patch
 
-fedpkg sources
+fedpkg --release "$releasever" sources
 
 > grub.patches
-patches=$(formatpatch refs/remotes/rhboot/master..refs/remotes/rhboot/${releasever})
+patches=$(formatpatch refs/remotes/rhboot/master..refs/remotes/rhboot/"${branch}")
 for x in $patches ; do
-	echo Patch$(echo ${x} | cut -d- -f1): ${x} >> grub.patches
+	echo "Patch$(echo "${x}" | cut -d- -f1): ${x}" >> grub.patches
 done
 if [[ -z "$amend" && ${bumpspec} -gt 0 ]] || [[ ${bumpspec} -ge 2 ]] ;  then
     rpmdev-bumpspec -c "- Rebased to newer upstream for ${releasever}" grub2.spec
@@ -168,7 +136,7 @@ fi
 git add 0*.patch grub2.spec grub.patches
 if [[ ${commit} -eq 1 ]] ; then
   if [ -z "$amend" ]; then
-    fedpkg commit -s -c
+    fedpkg --release "$releasever" commit -s -c
   else
     git commit --amend
   fi
diff --git a/do-sync b/do-sync
new file mode 100755
index 00000000..bfb2371c
--- /dev/null
+++ b/do-sync
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+set -o nounset
+set -o errexit
+
+usage() {
+    echo "Usage $0 <pkgtool>:<dist_git_branch>:<git_branch>:<git_base_commit>"
+    echo "Generates a (rhboot) grub2 branch which contains latest patches from dist-git based on specific Fedora/RHEL version"
+    echo "Command expects a single parameter delimited with colons, with the following meanings:"
+    echo "    pkgtool: Package tool, e.g. fedpkg, rhpkg, etc."
+    echo "    dist_git_branch: The dist-git branch/release to sync"
+    echo "    git_branch: The git branch/release to sync"
+    echo "    git_base_commit: base commit where git_branch is based on"
+    echo
+    echo "Examples:"
+    echo
+    echo "    $0 fedpkg:rawhide:fedora-43:grub-2.12"
+    echo "    $0 fedpkg:f42:fedora-42:grub-2.12"
+    echo "    $0 fedpkg:f41:fedora-41:grub-2.12"
+    echo "    $0 fedpkg:f40:fedora-40:grub-2.12"
+    echo
+    echo "Also handles RHEL branches:"
+    echo
+    echo "    $0 rhpkg:rhel-10-main:rhel-10-main:grub-2.12"
+    echo "    $0 rhpkg:rhel-9-main:rhel-9-main:grub-2.06"
+    echo "    $0 rhpkg:rhel-8-main:rhel-8-main:f28-branchpoint"
+    exit 1
+}
+
+# check params
+[ $# -eq 1 ] || usage
+
+args=$1
+
+pkgtool=$(echo "$args" | awk -F ':' '{print $1}')
+dist_git_branch=$(echo "$args" | awk -F ':' '{print $2}')
+git_branch=$(echo "$args" | awk -F ':' '{print $3}')
+git_base_commit=$(echo "$args" | awk -F ':' '{print $4}')
+
+# working dirs
+dist_git_dir=/tmp/grub/dist-git
+git_dir=/tmp/grub/git
+
+rm -rf $dist_git_dir $git_dir
+mkdir -p $dist_git_dir $git_dir
+
+
+pushd $dist_git_dir > /dev/null
+{
+    # clone grub2 package anonymously
+    $pkgtool clone -a grub2 . 2>/dev/null
+
+    # create a local branch, all fine if already exists
+    git checkout -q -b "$dist_git_branch" origin/"$dist_git_branch" 2> /dev/null || true
+}
+popd > /dev/null
+
+
+pushd $git_dir > /dev/null
+{
+    git clone -q git@github.com:rhboot/grub2.git . 2>/dev/null
+
+    dist_git_sync_branch=${git_branch}-dist-git-$(date +"%Y-%m-%d-%H_%M_%S")
+    git checkout -q -b "$dist_git_sync_branch" "$git_base_commit"
+    while read -r line; do
+        p=$(echo "$line" | awk '{print $2}')
+        git am -q "$dist_git_dir/$p" 2>/dev/null
+    done < $dist_git_dir/grub.patches
+
+    # brach current git_branch based on upstream git_branch
+    git branch -D "$git_branch" 2>/dev/null || true
+    git checkout -q -b "$git_branch" origin/"$git_branch"
+
+    missing_commits=$(git cherry "${git_branch}" "${dist_git_sync_branch}" | grep ^+ | wc -l)
+    if [[ $missing_commits -eq 0 ]]; then
+        echo "Branch $git_branch is up-to-date, no need to sync"
+    else
+        echo "Missing commits ($missing_commits) which would be integrated in final branch"
+        git cherry "$git_branch" "$dist_git_sync_branch" -v | grep ^+
+        # finally cherry pick those missing patches
+        git cherry "$git_branch" "$dist_git_sync_branch" 2>/dev/null | grep ^+ | sed 's/\+ //' | xargs git cherry-pick 2>/dev/null
+
+        echo "Pushing latest commits"
+        cd "$git_dir"
+        git push -v origin "$git_branch"
+    fi
+}
+popd > /dev/null
+
diff --git a/gen_grub_cfgstub b/gen_grub_cfgstub
new file mode 100644
index 00000000..8f77c0f5
--- /dev/null
+++ b/gen_grub_cfgstub
@@ -0,0 +1,26 @@
+#!/bin/sh
+set -eu
+
+if [ $# -ne 2 ]
+  then
+    echo "Missing argument"
+    echo "Usage: script.sh GRUB_HOME EFI_HOME"
+    exit 1
+fi
+
+GRUB_HOME=$1
+EFI_HOME=$2
+
+# create a stub grub2 config in EFI
+BOOT_UUID=$(grub2-probe --target=fs_uuid "${GRUB_HOME}")
+GRUB_DIR=$(grub2-mkrelpath "${GRUB_HOME}")
+
+cat << EOF > "${EFI_HOME}"/grub.cfg.stb
+search --no-floppy --root-dev-only --fs-uuid --set=dev ${BOOT_UUID}
+set prefix=(\$dev)${GRUB_DIR}
+export \$prefix
+configfile \$prefix/grub.cfg
+EOF
+
+mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
+chmod 0600 ${EFI_HOME}/grub.cfg
diff --git a/gitignore b/gitignore
index f6a1bd05..4d0dfb70 100644
--- a/gitignore
+++ b/gitignore
@@ -11,11 +11,13 @@
 *.img
 *.log
 *.lst
+!/grub-core/extra_deps.lst
 *.marker
 *.mod
 *.o
 *.pf2
 *.pp
+*.pyc
 *.trs
 *~
 .deps-core/
@@ -230,6 +232,8 @@ widthspec.bin
 /lib/libgcrypt-grub
 /libgrub_a_init.c
 /lzocompress_test
+/luks1_test
+/luks2_test
 /m4/
 /minixfs_test
 /missing
diff --git a/grub.macros b/grub.macros
index 2ab40944..dd06d94c 100644
--- a/grub.macros
+++ b/grub.macros
@@ -1,6 +1,12 @@
 # vim:filetype=spec
 # Modules always contain just 32-bit code
+%global evr %{epoch}:%{version}-%{release}
 %global _libdir %{_exec_prefix}/lib
+
+%global os_id %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
+%global grub_evr_dir %{_libdir}/efi/grub2/%{evr}
+%global grub_efi_dir %{grub_evr_dir}/EFI/%{os_id}
+
 %global _binaries_in_noarch_packages_terminate_build 0
 #%%undefine _missing_build_ids_terminate_build
 %{expand:%%{!?buildsubdir:%%global buildsubdir grub-%{tarversion}}}
@@ -15,7 +21,12 @@
 %endif
 
 # gnulib actively ignores CFLAGS because it's terrible
-%global cc_equals "CC=%{ccpath} -fPIE"
+# build aarch64 gnulib with branch protection
+%ifarch aarch64
+%global cc_equals "CC=%{ccpath} -fPIE -Wl,-z,noexecstack -Wl,--no-warn-rwx-segments -mbranch-protection=standard"
+%else
+%global cc_equals "CC=%{ccpath} -fPIE -Wl,-z,noexecstack -Wl,--no-warn-rwx-segments"
+%endif
 
 %global cflags_sed						\\\
 	sed							\\\
@@ -23,7 +34,7 @@
 		-e 's/-fplugin=annobin//g'			\\\
 		-e 's,-specs=[[:alnum:]/_-]*annobin[[:alnum:]_-]*,,g' \\\
 		-e 's/-fstack-protector[[:alpha:]-]\\+//g'	\\\
-		-e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g'	\\\
+		-e 's/-[^ ]*D_FORTIFY_SOURCE=[[:digit:]][^ ]*\\+//g'	\\\
 		-e 's/--param=ssp-buffer-size=4//g'		\\\
 		-e 's/-mregparm=3/-mregparm=4/g'		\\\
 		-e 's/-fexceptions//g'				\\\
@@ -32,14 +43,21 @@
 		-e 's/^/ -fno-strict-aliasing /'		\\\
 		%{nil}
 
-%global host_cflags %{expand:%%(echo %{build_cflags} %{?_hardening_cflags} | %{cflags_sed})}
+%global host_cflags_ %{expand:%%(echo %{build_cflags} %{?_hardening_cflags} | %{cflags_sed})} -fstack-protector-strong
+%ifarch x86_64
+%global host_cflags %{host_cflags_} -fcf-protection
+%else
+%global host_cflags %{host_cflags_}
+%endif
 %global legacy_host_cflags					\\\
 	%{expand:%%(echo %{host_cflags} |			\\\
-	%{cflags_sed}						\\\
+	sed							\\\
 		-e 's/-m64//g'					\\\
 		-e 's/-mcpu=power[[:alnum:]]\\+/-mcpu=power6/g'	\\\
 	)}
 %global efi_host_cflags %{expand:%%(echo %{host_cflags})}
+%global xen_host_cflags %{expand:%%(echo %{host_cflags})}
+%global xen_pvh_host_cflags %{expand:%%(echo %{host_cflags})}
 
 %global target_cflags %{expand:%%(echo %{build_cflags} | %{cflags_sed})}
 %global legacy_target_cflags					\\\
@@ -49,6 +67,8 @@
 		-e 's/-mcpu=power[[:alnum:]]\\+/-mcpu=power6/g'	\\\
 	)}
 %global efi_target_cflags %{expand:%%(echo %{target_cflags})}
+%global xen_target_cflags %{expand:%%(echo %{target_cflags})}
+%global xen_pvh_target_cflags %{expand:%%(echo %{target_cflags})}
 
 %global ldflags_sed						\\\
 	sed							\\\
@@ -62,21 +82,30 @@
 	%{ldflags_sed}						\\\
 	)}
 %global efi_host_ldflags %{expand:%%(echo %{host_ldflags})}
+%global xen_host_ldflags %{expand:%%(echo %{host_ldflags})}
+%global xen_pvh_host_ldflags %{expand:%%(echo %{host_ldflags})}
 
-%global target_ldflags %{expand:%%(echo %{build_ldflags} -static | %{ldflags_sed})}
+%global target_ldflags %{expand:%%(echo %{build_ldflags} -Wl,--no-warn-rwx-segments -static | %{ldflags_sed})}
 %global legacy_target_ldflags					\\\
 	%{expand:%%(echo %{target_ldflags} | 			\\\
 	%{ldflags_sed}						\\\
 	)}
 %global efi_target_ldflags %{expand:%%(echo %{target_ldflags})}
+%global xen_target_ldflags %{expand:%%(echo %{target_ldflags})}
+%global xen_pvh_target_ldflags %{expand:%%(echo %{target_ldflags})}
 
 %global with_efi_arch 0
 %global with_alt_efi_arch 0
 %global with_legacy_arch 0
 %global with_emu_arch 1
+%global with_xen_arch 0
+%global with_xen_pvh_arch 0
 %global emuarch %{_arch}
 %global grubefiarch %{nil}
 %global grublegacyarch %{nil}
+%global grubelfname %{nil}
+%global xen_package_arch %{nil}
+%global xen_pvh_package_arch %{nil}
 
 # sparc is always compiled 64 bit
 %ifarch %{sparc}
@@ -116,11 +145,38 @@
 %{!?with_efi_only:%global without_efi_only 0}
 %{?with_efi_only:%global without_efi_only 1}
 
-### fixme
-%ifarch aarch64 %{arm} riscv64
-%global efi_modules " "
+%ifarch %{efi_arch}
+%global efi_modules " efi_netfs efifwsetup efinet lsefi lsefimmap connectefi bli "
+%endif
+
+%global xen_arch x86_64
+%ifarch %{xen_arch}
+%global with_xen_arch 1
 %else
-%global efi_modules " backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard connectefi "
+%global with_xen_arch 0
+%endif
+%{!?with_xen_arch:%global without_xen_arch 0}
+%{?with_xen_arch:%global without_xen_arch 1}
+
+%global xen_pvh_arch x86_64
+%ifarch %{xen_pvh_arch}
+%global with_xen_pvh_arch 1
+%else
+%global with_xen_pvh_arch 0
+%endif
+%{!?with_xen_pvh_arch:%global without_xen_pvh_arch 0}
+%{?with_xen_pvh_arch:%global without_xen_pvh_arch 1}
+
+%ifarch x86_64 %{ix86}
+%global platform_modules " backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard "
+%endif
+
+%ifarch ppc64le
+%global platform_modules " appendedsig tpm ofnet "
+%endif
+
+%ifarch aarch64 %{arm} riscv64
+%global platform_modules " "
 %endif
 
 %ifarch aarch64 %{arm} riscv64
@@ -143,11 +199,18 @@
 %global target_cpu_name %{_arch}
 %global grub_target_name %{_arch}-efi
 %global package_arch efi-x64
+%global xen_package_arch xen-x64
+%global xen_pvh_package_arch xen_pvh-i386
 
 %global legacy_target_cpu_name i386
 %global legacy_package_arch pc
 %global platform pc
 
+%global xen_grub_target_name %{_arch}-xen
+%global xen_pvh_grub_target_name i386-xen_pvh
+%global grubxenarch %{xen_grub_target_name}
+%global grubxenpvharch %{xen_pvh_grub_target_name}
+
 %global alt_efi_arch ia32
 %global alt_target_cpu_name i386
 %global alt_grub_target_name i386-efi
@@ -220,10 +283,9 @@
 %global with_legacy_arch 1
 %global grublegacyarch %{legacy_target_cpu_name}-%{platform}
 %global moduledir %{legacy_target_cpu_name}-%{platform}
+%global grubelfname core.elf
 %endif
 
-%global evr %{epoch}:%{version}-%{release}
-
 %ifarch x86_64
 %global with_efi_common 1
 %global with_legacy_modules 1
@@ -242,7 +304,7 @@ Obsoletes:	grub2 < %{evr}					\
 Requires:	grub2-common = %{evr}					\
 Requires:	grub2-tools-minimal = %{evr}				\
 Requires:	grub2-%{1}-modules = %{evr}				\
-Requires:	gettext which file					\
+Requires:	gettext-runtime which file				\
 Requires:	grub2-tools = %{evr}					\
 Requires(pre):	dracut							\
 Requires(post): dracut							\
@@ -265,11 +327,10 @@ This subpackage provides support for rebuilding your own grub.efi.	\
 %{expand:%%{?!buildsubdir:%%define buildsubdir grub-%%{1}-%{tarversion}}}\
 %{expand:%%package %%{1}-tools}						\
 Summary:	Support tools for GRUB.					\
-Requires:	gettext os-prober which file system-logos		\
+Requires:	gettext-runtime os-prober file system-logos	\
 Requires:	grub2-common = %{evr}					\
 Requires:	grub2-tools-minimal = %{evr}				\
 Requires:	os-prober >= 1.58-11					\
-Requires:	gettext which file					\
 									\
 %{expand:%%description %%{1}-tools}					\
 %{desc}									\
@@ -313,6 +374,32 @@ Provides:	grub2-efi-cdboot = %{evr}				\
 This subpackage provides optional components of grub used with removeable media on %{1} systems.\
 %{nil}
 
+%define define_xen_variant(o)						\
+%{expand:%%{?!buildsubdir:%%define buildsubdir grub-%{1}-%{tarversion}}}\
+%{expand:%%package %{1}-modules}					\
+Summary:	Modules used to build custom grub-%{xen_grub_target_name}.bin images		\
+BuildArch:	noarch							\
+Requires:	grub2-tools = %{evr}					\
+Provides:	grub2-xen-modules = %{evr}				\
+Obsoletes:	grub2-xen-modules < %{evr}				\
+%{expand:%%description %{1}-modules}					\
+%{desc}									\
+This subpackage provides support for rebuilding your own grub-%{xen_grub_target_name}.bin.	\
+%{nil}
+
+%define define_xen_pvh_variant(o)						\
+%{expand:%%{?!buildsubdir:%%define buildsubdir grub-%{1}-%{tarversion}}}\
+%{expand:%%package %{1}-modules}					\
+Summary:	Modules used to build custom grub-%{xen_pvh_grub_target_name}.bin images		\
+BuildArch:	noarch							\
+Requires:	grub2-tools = %{evr}					\
+Provides:	grub2-xen_pvh-modules = %{evr}				\
+Obsoletes:	grub2-xen_pvh-modules < %{evr}				\
+%{expand:%%description %{1}-modules}					\
+%{desc}									\
+This subpackage provides support for rebuilding your own grub-%{xen_pvh_grub_target_name}.bin.	\
+%{nil}
+
 %global do_common_setup()					\
 %setup -q -n grub-%{tarversion}					\
 rm -fv docs/*.info						\
@@ -358,6 +445,46 @@ git add .							\
 git commit -m "After efi configure"				\
 %{nil}
 
+%define do_xen_configure()					\
+%configure							\\\
+	%{cc_equals}						\\\
+	HOST_CFLAGS="%{3}"					\\\
+	HOST_CPPFLAGS="-I$(pwd)"				\\\
+	HOST_LDFLAGS="%{xen_host_ldflags}"			\\\
+	TARGET_CFLAGS="%{2}"					\\\
+	TARGET_CPPFLAGS="-I$(pwd)"				\\\
+	TARGET_LDFLAGS="%{xen_target_ldflags}"			\\\
+	--with-rpm-version=%{version}-%{release}		\\\
+	--with-platform=xen					\\\
+	--with-utils=host					\\\
+	--target=%{1}						\\\
+	--with-grubdir=grub2					\\\
+	--program-transform-name=s,grub,grub2,		\\\
+	--disable-werror || ( cat config.log ; exit 1 )		\
+git add .							\
+git commit -m "After xen configure"				\
+%{nil}
+
+%define do_xen_pvh_configure()					\
+%configure							\\\
+	%{cc_equals}						\\\
+	HOST_CFLAGS="%{3}"					\\\
+	HOST_CPPFLAGS="-I$(pwd)"				\\\
+	HOST_LDFLAGS="%{xen_pvh_host_ldflags}"			\\\
+	TARGET_CFLAGS="%{2}"					\\\
+	TARGET_CPPFLAGS="-I$(pwd)"				\\\
+	TARGET_LDFLAGS="%{xen_pvh_target_ldflags}"			\\\
+	--with-rpm-version=%{version}-%{release}		\\\
+	--with-platform=xen_pvh					\\\
+	--with-utils=host					\\\
+	--target=%{1}						\\\
+	--with-grubdir=grub2					\\\
+	--program-transform-name=s,grub,grub2,		\\\
+	--disable-werror || ( cat config.log ; exit 1 )		\
+git add .							\
+git commit -m "After xen_pvh configure"				\
+%{nil}
+
 %define do_efi_build_modules()					\
 make %{?_smp_mflags} ascii.h widthspec.h			\
 make %{?_smp_mflags} -C grub-core				\
@@ -373,6 +500,16 @@ for x in grub-mkimage ; do					\\\
 done								\
 %{nil}
 
+%define do_xen_build_modules()					\
+make %{?_smp_mflags} ascii.h widthspec.h			\
+make %{?_smp_mflags} -C grub-core				\
+%{nil}
+
+%define do_xen_pvh_build_modules()					\
+make %{?_smp_mflags} ascii.h widthspec.h			\
+make %{?_smp_mflags} -C grub-core				\
+%{nil}
+
 %define do_install_protected_file()				\
 touch %{1}.conf							\
 echo %{1} > %{1}.conf						\
@@ -381,14 +518,42 @@ install -m 644 %{1}.conf ${RPM_BUILD_ROOT}/etc/dnf/protected.d/ \
 rm -f %{1}.conf							\
 %{nil}
 
-%ifarch x86_64 aarch64 %{arm} riscv64
-%define mkimage()						\
+%global grub_modules  " all_video boot blscfg btrfs blsuki	\\\
+			cat configfile cryptodisk		\\\
+			echo ext2 f2fs fat font			\\\
+			gcry_rijndael gcry_rsa gcry_serpent	\\\
+			gcry_sha256 gcry_twofish gcry_whirlpool	\\\
+			gfxmenu gfxterm gzio			\\\
+			halt hfsplus http increment iso9660	\\\
+			jpeg loadenv loopback linux lvm luks	\\\
+			luks2					\\\
+			memdisk					\\\
+			mdraid09 mdraid1x minicmd net		\\\
+			normal part_apple part_msdos part_gpt	\\\
+			password_pbkdf2 pgp png reboot regexp	\\\
+			search search_fs_uuid search_fs_file	\\\
+			search_label serial sleep		\\\
+			squash4					\\\
+			syslinuxcfg				\\\
+			test tftp version video xfs zstd "	\
+
+%ifarch %{efi_arch}
+%define efi_mkimage()						\
+mkdir -p memdisk/fonts						\
+cp %{4}/unicode.pf2 memdisk/fonts				\
+mksquashfs memdisk memdisk.squashfs -comp lzo			\
 %{4}./grub-mkimage -O %{1} -o %{2}.orig				\\\
-	-p /EFI/%{efi_vendor} -d grub-core ${GRUB_MODULES}	\\\
-	--sbat %{4}./sbat.csv					\
+	-d grub-core						\\\
+	--sbat %{4}./sbat.csv					\\\
+	-m memdisk.squashfs					\\\
+	-p /EFI/%{efi_vendor}					\\\
+	${GRUB_MODULES}						\
 %{4}./grub-mkimage -O %{1} -o %{3}.orig				\\\
-	-p /EFI/BOOT -d grub-core ${GRUB_MODULES}		\\\
-	--sbat %{4}./sbat.csv					\
+	-d grub-core						\\\
+	--sbat %{4}./sbat.csv					\\\
+	-m memdisk.squashfs					\\\
+	-p /EFI/BOOT						\\\
+	${GRUB_MODULES}						\
 %{expand:%%define ___pesign_client_cert %{?___pesign_client_cert}%{!?___pesign_client_cert:%{__pesign_client_cert}}} \
 %{?__pesign_client_cert:%{expand:%%define __pesign_client_cert %{___pesign_client_cert}}} \
 %{expand:%%{pesign -s -i %%{2}.orig -o %%{2}.onesig -a %%{5} -c %%{6} -n %%{7}}}	\
@@ -397,32 +562,64 @@ rm -f %{1}.conf							\
 %{expand:%%{pesign -s -i %%{2}.onesig -o %%{2} -a %%{5} -c %%{6} -n %%{7}}}	\
 %{expand:%%{pesign -s -i %%{3}.onesig -o %%{3} -a %%{5} -c %%{6} -n %%{7}}}	\
 %{nil}
-%else
-%define mkimage()						\
-%{4}./grub-mkimage -O %{1} -o %{2}				\\\
-	-p /EFI/%{efi_vendor} -d grub-core ${GRUB_MODULES}	\
-%{4}./grub-mkimage -O %{1} -o %{3}				\\\
-	-p /EFI/BOOT -d grub-core ${GRUB_MODULES}		\
+%endif
+
+%ifarch ppc64le
+# RHEL signs, Fedora + ELN don't (but ELN defines rhel)
+%if 0%{?fedora} || 0%{?eln}
+%define ieee1275_mkimage()					\
+mkdir -p memdisk/fonts						\
+cp %{5}/unicode.pf2 memdisk/fonts				\
+mksquashfs memdisk memdisk.squashfs -comp lzo			\
+./grub-mkimage -O %{1} -o %{2} -p '/grub2' -d grub-core ${GRUB_MODULES} \
 %{nil}
+%else
+%define ieee1275_mkimage()					\
+mkdir -p memdisk/fonts						\
+cp %{5}/unicode.pf2 memdisk/fonts				\
+mksquashfs memdisk memdisk.squashfs -comp lzo			\
+APPENDED_SIG_SIZE=0						\
+if [ -x /usr/bin/rpm-sign ]; then				\
+	touch empty.unsigned					\
+	rpm-sign --key %{4}					\\\
+		 --lkmsign empty.unsigned			\\\
+		 --output empty.signed				\
+	APPENDED_SIG_SIZE="$(stat -c '%s' empty.signed)"	\
+	rm empty.{un,}signed					\
+fi								\
+# FIXME: using this prefix is fragile, must be done properly	\
+./grub-mkimage -O %{1} -o %{2}.orig				\\\
+	-d grub-core						\\\
+	-m memdisk.squashfs					\\\
+	-p '/grub2'						\\\
+	-x %{3}							\\\
+	--appended-signature-size ${APPENDED_SIG_SIZE}		\\\
+	${GRUB_MODULES}						\
+if [ -x /usr/bin/rpm-sign ]; then				\
+	truncate -s -${APPENDED_SIG_SIZE} %{2}.orig		\
+	rpm-sign --key %{4}					\\\
+		 --lkmsign %{2}.orig				\\\
+		 --output %{2}					\
+else								\
+	mv %{2}.orig %{2}					\
+fi								\
+%{nil}
+%endif
 %endif
 
 %define do_efi_build_images()					\
-GRUB_MODULES="	all_video boot blscfg btrfs			\\\
-		cat configfile cryptodisk			\\\
-		echo efi_netfs efifwsetup efinet ext2 f2fs	\\\
-		fat font gcry_rijndael gcry_rsa gcry_serpent 	\\\
-		gcry_sha256 gcry_twofish gcry_whirlpool   	\\\
-		gfxmenu gfxterm gzio				\\\
-		halt hfsplus http increment iso9660 jpeg	\\\
-		loadenv loopback linux lvm lsefi lsefimmap luks	\\\
-		luks2 mdraid09 mdraid1x minicmd net		\\\
-		normal part_apple part_msdos part_gpt		\\\
-		password_pbkdf2 pgp png read reboot		\\\
-		regexp search search_fs_uuid search_fs_file	\\\
-		search_label serial sleep syslinuxcfg test tftp	\\\
-		version video xfs zstd "			\
+GRUB_MODULES+=%{grub_modules}					\
 GRUB_MODULES+=%{efi_modules}					\
-%{expand:%%{mkimage %{1} %{2} %{3} %{4}}}			\
+GRUB_MODULES+=%{platform_modules}				\
+%{expand:%%{efi_mkimage %{1} %{2} %{3} %{4}}}			\
+%{nil}
+
+%define do_ieee1275_build_images()			\
+GRUB_MODULES+=%{grub_modules}				\
+GRUB_MODULES+=%{platform_modules}			\
+cd grub-%{1}-%{tarversion}				\
+%{expand:%%ieee1275_mkimage %%{1} %%{2} %%{3} %%{4} ./ }\
+cd ..							\
 %{nil}
 
 %define do_primary_efi_build()					\
@@ -483,6 +680,20 @@ make %{?_smp_mflags} -C grub-core				\
 cd ..								\
 %{nil}
 
+%define do_xen_build()					\
+cd grub-%{1}-%{tarversion}					\
+%{expand:%%do_xen_configure %%{2} %%{3} %%{4}}			\
+%do_xen_build_modules						\
+cd ..								\
+%{nil}
+
+%define do_xen_pvh_build()					\
+cd grub-%{1}-%{tarversion}					\
+%{expand:%%do_xen_pvh_configure %%{2} %%{3} %%{4}}			\
+%do_xen_pvh_build_modules						\
+cd ..								\
+%{nil}
+
 %define do_alt_efi_install()					\
 cd grub-%{1}-%{tarversion}					\
 install -d -m 755 $RPM_BUILD_ROOT/usr/lib/grub/%{grubaltefiarch}/ \
@@ -497,8 +708,9 @@ find . '(' -iname gdb_grub					\\\
 	')'							\\\
 	-exec cp {} $RPM_BUILD_ROOT/usr/lib/grub/%{grubaltefiarch}/ \\\; \
 find $RPM_BUILD_ROOT -type f -iname "*.mod*" -exec chmod a-x {} '\;'	\
-install -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_dir}/%{2}	\
-install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3} \
+install -d -m 0700 ${RPM_BUILD_ROOT}%{grub_efi_dir}/		\
+install -m 700 %{2} $RPM_BUILD_ROOT%{grub_efi_dir}/%{2} \
+install -m 700 %{3} $RPM_BUILD_ROOT%{grub_efi_dir}/%{3} \
 %{expand:%%do_install_protected_file grub2-%{alt_package_arch}} \
 cd ..								\
 %{nil}
@@ -515,11 +727,14 @@ fi								\
 find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;'	\
 ln -s ../boot/grub2/grub.cfg					\\\
 	$RPM_BUILD_ROOT%{_sysconfdir}/grub2-efi.cfg		\
-install -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_dir}/%{2}		\
-install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3}		\
+install -d -m 0700 ${RPM_BUILD_ROOT}%{grub_efi_dir}/		\
+install -m 700 %{2} $RPM_BUILD_ROOT%{grub_efi_dir}/%{2}	\
+install -m 700 %{3} $RPM_BUILD_ROOT%{grub_efi_dir}/%{3}	\
 %ifarch %{arm}							\
 install -D -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_boot}/BOOTARM.EFI \
 %endif								\
+install -D -m 700 %{SOURCE13}					\\\
+    ${RPM_BUILD_ROOT}/usr/bin/gen_grub_cfgstub		\
 install -D -m 700 unicode.pf2					\\\
 	${RPM_BUILD_ROOT}/boot/grub2/fonts/unicode.pf2		\
 ${RPM_BUILD_ROOT}/%{_bindir}/grub2-editenv			\\\
@@ -537,6 +752,9 @@ fi								\
 if [ -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info ]; then	\
 	rm -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info		\
 fi								\
+%{expand:%ifarch ppc64le					\
+	install -m 700 %{grubelfname} $RPM_BUILD_ROOT/%{_libdir}/grub/%{1} \
+%endif}								\
 if [ -f $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub2.chrp ]; then \
 	mv $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub2.chrp	\\\
 	   $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub.chrp	\
@@ -545,6 +763,18 @@ if [ %{3} -eq 0 ]; then						\
 	${RPM_BUILD_ROOT}/%{_bindir}/grub2-editenv		\\\
 		${RPM_BUILD_ROOT}/boot/grub2/grubenv create	\
 fi								\
+%{expand:%ifnarch ppc64le					\
+mkdir pxe							\
+./grub-mknetdir							\\\
+	--directory ./grub-core					\\\
+	--fonts=""						\\\
+	--locales=""						\\\
+	--themes=""						\\\
+	--modules="configfile gzio linux reboot test"		\\\
+	--net-directory=pxe					\\\
+	--subdir .						\
+mv pxe/*/core.0 $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/		\
+%endif}								\
 %{expand:%%do_install_protected_file grub2-%{legacy_package_arch}} \
 cd ..								\
 %{nil}
@@ -565,6 +795,32 @@ fi								\
 cd ..								\
 %{nil}
 
+%define do_xen_install()					\
+cd grub-%{1}-%{tarversion}					\
+make DESTDIR=$RPM_BUILD_ROOT install				\
+if [ -f $RPM_BUILD_ROOT%{_infodir}/grub.info ]; then		\
+	rm -f $RPM_BUILD_ROOT%{_infodir}/grub.info		\
+fi								\
+if [ -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info ]; then	\
+	rm -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info		\
+fi								\
+find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;'	\
+cd ..								\
+%{nil}
+
+%define do_xen_pvh_install()					\
+cd grub-%{1}-%{tarversion}					\
+make DESTDIR=$RPM_BUILD_ROOT install				\
+if [ -f $RPM_BUILD_ROOT%{_infodir}/grub.info ]; then		\
+	rm -f $RPM_BUILD_ROOT%{_infodir}/grub.info		\
+fi								\
+if [ -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info ]; then	\
+	rm -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info		\
+fi								\
+find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;'	\
+cd ..								\
+%{nil}
+
 %define do_common_install()					\
 install -d -m 0755 						\\\
 	$RPM_BUILD_ROOT%{_datarootdir}/locale/en\@quot		\\\
@@ -584,7 +840,8 @@ install -d -m 0700 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig	\
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/default/grub		\
 ln -sf ../default/grub						\\\
 	${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/grub		\
-touch ${RPM_BUILD_ROOT}/boot/grub2/grub.cfg			\
+touch grub.cfg							\
+install -m 0600 grub.cfg ${RPM_BUILD_ROOT}/boot/grub2/		\
 ln -s ../boot/grub2/grub.cfg					\\\
 	${RPM_BUILD_ROOT}%{_sysconfdir}/grub2.cfg		\
 %{nil}
@@ -593,15 +850,22 @@ ln -s ../boot/grub2/grub.cfg					\\\
 %{expand:%%files %{1}}						\
 %defattr(-,root,root,-)						\
 %config(noreplace) %{_sysconfdir}/grub2.cfg			\
-%ghost %config(noreplace) %attr(0700,root,root)/boot/grub2/grub.cfg	\
+%ghost %config(noreplace) %attr(0600,root,root)/boot/grub2/grub.cfg	\
 %dir %attr(0700,root,root)/boot/loader/entries			\
 %attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/grub2-%{1}.conf \
+%ifarch ppc64le							\
+%dir %{_libdir}/grub/%{2}/					\
+%{_libdir}/grub/%{2}/%{grubelfname}				\
+%endif								\
 								\
 %{expand:%if 0%{?with_legacy_modules}				\
 %{expand:%%files %{1}-modules}					\
 %defattr(-,root,root)						\
 %dir %{_libdir}/grub/%{2}/					\
 %{_libdir}/grub/%{2}/*						\
+%ifarch ppc64le							\
+%exclude %{_libdir}/grub/%{2}/%{grubelfname}			\
+%endif								\
 %exclude %{_libdir}/grub/%{2}/*.module				\
 %exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.image \
 %exclude %{_libdir}/grub/%{2}/*.o				\
@@ -615,14 +879,18 @@ ln -s ../boot/grub2/grub.cfg					\\\
 %defattr(-,root,root,-)						\
 %config(noreplace) %{_sysconfdir}/grub2.cfg			\
 %config(noreplace) %{_sysconfdir}/grub2-efi.cfg		\
-%attr(0700,root,root) %verify(not mtime) %{efi_esp_dir}/%{2} 	\
+%ghost %attr(0700,root,root) %{efi_esp_dir}/%{2} \
+%dir %attr(0700,root,root) %{grub_efi_dir}                      \
+%attr(0700,root,root) %{grub_efi_dir}/%{2} 	\
 %ifarch %{arm}							\
 %attr(0700,root,root) %verify(not mtime) %{efi_esp_boot}/BOOTARM.EFI \
 %endif								\
 %attr(0700,root,root)/boot/grub2/fonts			\
+%attr(0700,root,root)/usr/bin/gen_grub_cfgstub			\
 %dir %attr(0700,root,root)/boot/loader/entries			\
-%ghost %config(noreplace) %attr(0700,root,root)/boot/grub2/grub.cfg	\
-%ghost %config(noreplace) %verify(not mtime) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg	\
+%ghost %config(noreplace) %attr(0600,root,root)/boot/grub2/grub.cfg	\
+%ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg	\
+%ghost %config(noreplace) %attr(0600,root,root)%{grub_efi_dir}/grub.cfg	\
 %config(noreplace) %verify(not size mode md5 mtime) /boot/grub2/grubenv	\
 %attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/grub2-%{1}.conf \
 %{expand:%if 0%{?without_efi_modules}				\
@@ -640,6 +908,23 @@ ln -s ../boot/grub2/grub.cfg					\\\
 								\
 %{expand:%%files %{1}-cdboot}					\
 %defattr(-,root,root,-)						\
-%attr(0700,root,root) %verify(not mtime) %{efi_esp_dir}/%{3}	\
+%ghost %attr(0700,root,root) %{efi_esp_dir}/%{3}	\
+%attr(0700,root,root) %{grub_efi_dir}/%{3}	\
 %attr(0700,root,root)/boot/grub2/fonts			\
 %{nil}
+
+%define define_xen_variant_files()				\
+%{expand:%%files %{1}-modules}					\
+%defattr(-,root,root,-)						\
+%dir %{_libdir}/grub/%{2}/					\
+%{_libdir}/grub/%{2}/*						\
+%exclude %{_libdir}/grub/%{2}/*.module				\
+%{nil}
+
+%define define_xen_pvh_variant_files()				\
+%{expand:%%files %{1}-modules}					\
+%defattr(-,root,root,-)						\
+%dir %{_libdir}/grub/%{2}/					\
+%{_libdir}/grub/%{2}/*						\
+%exclude %{_libdir}/grub/%{2}/*.module				\
+%{nil}
diff --git a/grub.patches b/grub.patches
index b0acec4a..67c06e16 100644
--- a/grub.patches
+++ b/grub.patches
@@ -1,280 +1,406 @@
 Patch0001: 0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch
 Patch0002: 0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch
 Patch0003: 0003-Revert-templates-Disable-the-os-prober-by-default.patch
-Patch0004: 0004-Add-support-for-Linux-EFI-stub-loading.patch
-Patch0005: 0005-Rework-linux-command.patch
-Patch0006: 0006-Rework-linux16-command.patch
-Patch0007: 0007-Add-secureboot-support-on-efi-chainloader.patch
-Patch0008: 0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
-Patch0009: 0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
-Patch0010: 0010-re-write-.gitignore.patch
-Patch0011: 0011-IBM-client-architecture-CAS-reboot-support.patch
-Patch0012: 0012-for-ppc-reset-console-display-attr-when-clear-screen.patch
-Patch0013: 0013-Disable-GRUB-video-support-for-IBM-power-machines.patch
-Patch0014: 0014-Move-bash-completion-script-922997.patch
-Patch0015: 0015-Allow-fallback-to-include-entries-by-title-not-just-.patch
-Patch0016: 0016-Make-exit-take-a-return-code.patch
-Patch0017: 0017-Make-efi-machines-load-an-env-block-from-a-variable.patch
-Patch0018: 0018-Migrate-PPC-from-Yaboot-to-Grub2.patch
-Patch0019: 0019-Add-fw_path-variable-revised.patch
-Patch0020: 0020-Pass-x-hex-hex-straight-through-unmolested.patch
-Patch0021: 0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
-Patch0022: 0022-Add-devicetree-loading.patch
-Patch0023: 0023-Enable-pager-by-default.-985860.patch
-Patch0024: 0024-Don-t-say-GNU-Linux-in-generated-menus.patch
-Patch0025: 0025-Add-.eh_frame-to-list-of-relocations-stripped.patch
-Patch0026: 0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
-Patch0027: 0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
-Patch0028: 0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
-Patch0029: 0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
-Patch0030: 0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
-Patch0031: 0031-Try-prefix-if-fw_path-doesn-t-work.patch
-Patch0032: 0032-Use-rpm-s-sort-for-grub2-mkconfig.patch
-Patch0033: 0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
-Patch0034: 0034-Add-friendly-grub2-password-config-tool-985962.patch
-Patch0035: 0035-tcp-add-window-scaling-support.patch
-Patch0036: 0036-efinet-and-bootp-add-support-for-dhcpv6.patch
-Patch0037: 0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
-Patch0038: 0038-bz1374141-fix-incorrect-mask-for-ppc64.patch
-Patch0039: 0039-Make-grub_fatal-also-backtrace.patch
-Patch0040: 0040-Make-our-info-pages-say-grub2-where-appropriate.patch
-Patch0041: 0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch
-Patch0042: 0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
-Patch0043: 0043-export-btrfs_subvol-and-btrfs_subvolid.patch
-Patch0044: 0044-grub2-btrfs-03-follow_default.patch
-Patch0045: 0045-grub2-btrfs-04-grub2-install.patch
-Patch0046: 0046-grub2-btrfs-05-grub2-mkconfig.patch
-Patch0047: 0047-grub2-btrfs-06-subvol-mount.patch
-Patch0048: 0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
-Patch0049: 0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
-Patch0050: 0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
-Patch0051: 0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch
-Patch0052: 0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
-Patch0053: 0053-don-t-use-int-for-efi-status.patch
-Patch0054: 0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
-Patch0055: 0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
-Patch0056: 0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
-Patch0057: 0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
-Patch0058: 0058-align-struct-efi_variable-better.patch
-Patch0059: 0059-Add-BLS-support-to-grub-mkconfig.patch
-Patch0060: 0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
-Patch0061: 0061-Add-linux-and-initrd-commands-for-grub-emu.patch
-Patch0062: 0062-Add-grub2-switch-to-blscfg.patch
-Patch0063: 0063-make-better-backtraces.patch
-Patch0064: 0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
-Patch0065: 0065-Work-around-some-minor-include-path-weirdnesses.patch
-Patch0066: 0066-Make-it-possible-to-enabled-build-id-sha1.patch
-Patch0067: 0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
-Patch0068: 0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
-Patch0069: 0069-Fixup-for-newer-compiler.patch
-Patch0070: 0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
-Patch0071: 0071-Fixup-for-newer-compiler.patch
-Patch0072: 0072-Add-support-for-non-Ethernet-network-cards.patch
-Patch0073: 0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
-Patch0074: 0074-bootp-New-net_bootp6-command.patch
-Patch0075: 0075-efinet-UEFI-IPv6-PXE-support.patch
-Patch0076: 0076-grub.texi-Add-net_bootp6-doument.patch
-Patch0077: 0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
-Patch0078: 0078-efinet-Setting-network-from-UEFI-device-path.patch
-Patch0079: 0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch
-Patch0080: 0080-Support-UEFI-networking-protocols.patch
-Patch0081: 0081-AUDIT-0-http-boot-tracker-bug.patch
-Patch0082: 0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch
-Patch0083: 0083-Add-auto-hide-menu-support.patch
-Patch0084: 0084-Add-grub-set-bootflag-utility.patch
-Patch0085: 0085-docs-Add-grub-boot-indeterminate.service-example.patch
-Patch0086: 0086-gentpl-add-disable-support.patch
-Patch0087: 0087-gentpl-add-pc-firmware-type.patch
-Patch0088: 0088-efinet-also-use-the-firmware-acceleration-for-http.patch
-Patch0089: 0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
-Patch0090: 0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
-Patch0091: 0091-module-verifier-make-it-possible-to-run-checkers-on-.patch
-Patch0092: 0092-Rework-how-the-fdt-command-builds.patch
-Patch0093: 0093-Disable-non-wordsize-allocations-on-arm.patch
-Patch0094: 0094-Prepend-prefix-when-HTTP-path-is-relative.patch
-Patch0095: 0095-Make-grub_error-more-verbose.patch
-Patch0096: 0096-Make-reset-an-alias-for-the-reboot-command.patch
-Patch0097: 0097-Add-a-version-command.patch
-Patch0098: 0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
-Patch0099: 0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch
-Patch0100: 0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch
-Patch0101: 0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
-Patch0102: 0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
-Patch0103: 0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
-Patch0104: 0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
-Patch0105: 0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
-Patch0106: 0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
-Patch0107: 0107-Fix-getroot.c-s-trampolines.patch
-Patch0108: 0108-Do-not-allow-stack-trampolines-anywhere.patch
-Patch0109: 0109-Reimplement-boot_counter.patch
-Patch0110: 0110-Fix-menu-entry-selection-based-on-ID-and-title.patch
-Patch0111: 0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch
-Patch0112: 0112-Add-efi-export-env-and-efi-load-env-commands.patch
-Patch0113: 0113-Make-it-possible-to-subtract-conditions-from-debug.patch
-Patch0114: 0114-Export-all-variables-from-the-initial-context-when-c.patch
-Patch0115: 0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
-Patch0116: 0116-Fix-systemctl-kexec-exit-status-check.patch
-Patch0117: 0117-Print-grub-emu-linux-loader-messages-as-debug.patch
-Patch0118: 0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch
-Patch0119: 0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch
-Patch0120: 0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
-Patch0121: 0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
-Patch0122: 0122-Add-start-symbol-for-RISC-V.patch
-Patch0123: 0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
-Patch0124: 0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch
-Patch0125: 0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
-Patch0126: 0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
-Patch0127: 0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
-Patch0128: 0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch
-Patch0129: 0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
-Patch0130: 0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
-Patch0131: 0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
-Patch0132: 0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
-Patch0133: 0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
-Patch0134: 0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
-Patch0135: 0135-efi-dhcp-fix-some-allocation-error-checking.patch
-Patch0136: 0136-efi-http-fix-some-allocation-error-checking.patch
-Patch0137: 0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
-Patch0138: 0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
-Patch0139: 0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch
-Patch0140: 0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
-Patch0141: 0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
-Patch0142: 0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
-Patch0143: 0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
-Patch0144: 0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
-Patch0145: 0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch
-Patch0146: 0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
-Patch0147: 0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
-Patch0148: 0148-grub-install-disable-support-for-EFI-platforms.patch
-Patch0149: 0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch
-Patch0150: 0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
-Patch0151: 0151-Introduce-function-grub_debug_is_enabled-void-return.patch
-Patch0152: 0152-Don-t-clear-screen-when-debugging-is-enabled.patch
-Patch0153: 0153-grub_file_-instrumentation-new-file-debug-tag.patch
-Patch0154: 0154-ieee1275-Avoiding-many-unecessary-open-close.patch
-Patch0155: 0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
-Patch0156: 0156-ieee1275-powerpc-enables-device-mapper-discovery.patch
-Patch0157: 0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
-Patch0158: 0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch
-Patch0159: 0159-docs-grub-Document-signing-grub-under-UEFI.patch
-Patch0160: 0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch
-Patch0161: 0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
-Patch0162: 0162-pgp-factor-out-rsa_pad.patch
-Patch0163: 0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
-Patch0164: 0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
-Patch0165: 0165-libtasn1-import-libtasn1-4.16.0.patch
-Patch0166: 0166-libtasn1-disable-code-not-needed-in-grub.patch
-Patch0167: 0167-libtasn1-changes-for-grub-compatibility.patch
-Patch0168: 0168-libtasn1-compile-into-asn1-module.patch
-Patch0169: 0169-test_asn1-test-module-for-libtasn1.patch
-Patch0170: 0170-grub-install-support-embedding-x509-certificates.patch
-Patch0171: 0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
-Patch0172: 0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
-Patch0173: 0173-appended-signatures-support-verifying-appended-signa.patch
-Patch0174: 0174-appended-signatures-verification-tests.patch
-Patch0175: 0175-appended-signatures-documentation.patch
-Patch0176: 0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
-Patch0177: 0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
-Patch0178: 0178-ieee1275-claim-more-memory.patch
-Patch0179: 0179-ieee1275-request-memory-with-ibm-client-architecture.patch
-Patch0180: 0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
-Patch0181: 0181-ieee1275-ofdisk-retry-on-open-failure.patch
-Patch0182: 0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch
-Patch0183: 0183-efinet-Add-DHCP-proxy-support.patch
-Patch0184: 0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
-Patch0185: 0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
-Patch0186: 0186-Suppress-gettext-error-message.patch
-Patch0187: 0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
-Patch0188: 0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch
-Patch0189: 0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
-Patch0190: 0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch
-Patch0191: 0191-normal-main-Discover-the-device-to-read-the-config-f.patch
-Patch0192: 0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
-Patch0193: 0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
-Patch0194: 0194-Print-module-name-on-license-check-failure.patch
-Patch0195: 0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
-Patch0196: 0196-grub-mkconfig-restore-umask-for-grub.cfg.patch
-Patch0197: 0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch
-Patch0198: 0198-Add-Fedora-location-of-DejaVu-SANS-font.patch
-Patch0199: 0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch
-Patch0200: 0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch
-Patch0201: 0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch
-Patch0202: 0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch
-Patch0203: 0203-Use-visual-indentation-in-config.h.in.patch
-Patch0204: 0204-Where-present-ensure-config-util.h-precedes-config.h.patch
-Patch0205: 0205-Drop-gnulib-fix-base64.patch.patch
-Patch0206: 0206-Drop-gnulib-no-abort.patch.patch
-Patch0207: 0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch
-Patch0208: 0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
-Patch0209: 0209-search-new-efidisk-only-option-on-EFI-systems.patch
-Patch0210: 0210-efi-new-connectefi-command.patch
-Patch0211: 0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
-Patch0212: 0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch
-Patch0213: 0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
-Patch0214: 0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
-Patch0215: 0215-powerpc-do-CAS-in-a-more-compatible-way.patch
-Patch0216: 0216-powerpc-prefix-detection-support-device-names-with-c.patch
-Patch0217: 0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch
-Patch0218: 0218-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
-Patch0219: 0219-make-ofdisk_retries-optional.patch
-Patch0220: 0220-loader-efi-chainloader-grub_load_and_start_image-doe.patch
-Patch0221: 0221-loader-efi-chainloader-simplify-the-loader-state.patch
-Patch0222: 0222-commands-boot-Add-API-to-pass-context-to-loader.patch
-Patch0223: 0223-loader-efi-chainloader-Use-grub_loader_set_ex.patch
-Patch0224: 0224-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch
-Patch0225: 0225-loader-i386-efi-linux-Use-grub_loader_set_ex.patch
-Patch0226: 0226-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch
-Patch0227: 0227-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch
-Patch0228: 0228-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch
-Patch0229: 0229-video-readers-png-Abort-sooner-if-a-read-operation-f.patch
-Patch0230: 0230-video-readers-png-Refuse-to-handle-multiple-image-he.patch
-Patch0231: 0231-video-readers-png-Drop-greyscale-support-to-fix-heap.patch
-Patch0232: 0232-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch
-Patch0233: 0233-video-readers-png-Sanity-check-some-huffman-codes.patch
-Patch0234: 0234-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch
-Patch0235: 0235-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch
-Patch0236: 0236-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch
-Patch0237: 0237-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch
-Patch0238: 0238-normal-charset-Fix-array-out-of-bounds-formatting-un.patch
-Patch0239: 0239-net-netbuff-Block-overly-large-netbuff-allocs.patch
-Patch0240: 0240-net-ip-Do-IP-fragment-maths-safely.patch
-Patch0241: 0241-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch
-Patch0242: 0242-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch
-Patch0243: 0243-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch
-Patch0244: 0244-net-tftp-Avoid-a-trivial-UAF.patch
-Patch0245: 0245-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch
-Patch0246: 0246-net-http-Fix-OOB-write-for-split-http-headers.patch
-Patch0247: 0247-net-http-Error-out-on-headers-with-LF-without-CR.patch
-Patch0248: 0248-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch
-Patch0249: 0249-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch
-Patch0250: 0250-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch
-Patch0251: 0251-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch
-Patch0252: 0252-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch
-Patch0253: 0253-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch
-Patch0254: 0254-misc-Make-grub_min-and-grub_max-more-resilient.patch
-Patch0255: 0255-ReiserFS-switch-to-using-grub_min-grub_max.patch
-Patch0256: 0256-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch
-Patch0257: 0257-modules-make-.module_license-read-only.patch
-Patch0258: 0258-modules-strip-.llvm_addrsig-sections-and-similar.patch
-Patch0259: 0259-modules-Don-t-allocate-space-for-non-allocable-secti.patch
-Patch0260: 0260-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch
-Patch0261: 0261-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch
-Patch0262: 0262-modules-load-module-sections-at-page-aligned-address.patch
-Patch0263: 0263-nx-add-memory-attribute-get-set-API.patch
-Patch0264: 0264-nx-set-page-permissions-for-loaded-modules.patch
-Patch0265: 0265-nx-set-attrs-in-our-kernel-loaders.patch
-Patch0266: 0266-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch
-Patch0267: 0267-grub-probe-document-the-behavior-of-multiple-v.patch
-Patch0268: 0268-grub_fs_probe-dprint-errors-from-filesystems.patch
-Patch0269: 0269-fs-fat-don-t-error-when-mtime-is-0.patch
-Patch0270: 0270-Make-debug-file-show-which-file-filters-get-run.patch
-Patch0271: 0271-efi-make-the-default-arena-most-of-ram.patch
-Patch0272: 0272-efi-use-enumerated-array-positions-for-our-allocatio.patch
-Patch0273: 0273-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
-Patch0274: 0274-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
-Patch0275: 0275-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
-Patch0276: 0276-BLS-create-etc-kernel-cmdline-during-mkconfig.patch
-Patch0277: 0277-Try-reserving-less-ram.patch
-Patch0278: 0278-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
-Patch0279: 0279-squish-give-up-on-rhgb-quiet.patch
-Patch0280: 0280-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
+Patch0004: 0004-Rework-linux-command.patch
+Patch0005: 0005-Rework-linux16-command.patch
+Patch0006: 0006-re-write-.gitignore.patch
+Patch0007: 0007-IBM-client-architecture-CAS-reboot-support.patch
+Patch0008: 0008-for-ppc-reset-console-display-attr-when-clear-screen.patch
+Patch0009: 0009-Disable-GRUB-video-support-for-IBM-power-machines.patch
+Patch0010: 0010-Move-bash-completion-script-922997.patch
+Patch0011: 0011-Allow-fallback-to-include-entries-by-title-not-just-.patch
+Patch0012: 0012-Make-exit-take-a-return-code.patch
+Patch0013: 0013-Make-efi-machines-load-an-env-block-from-a-variable.patch
+Patch0014: 0014-Migrate-PPC-from-Yaboot-to-Grub2.patch
+Patch0015: 0015-Add-fw_path-variable-revised.patch
+Patch0016: 0016-Pass-x-hex-hex-straight-through-unmolested.patch
+Patch0017: 0017-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+Patch0018: 0018-Add-devicetree-loading.patch
+Patch0019: 0019-Enable-pager-by-default.-985860.patch
+Patch0020: 0020-Don-t-say-GNU-Linux-in-generated-menus.patch
+Patch0021: 0021-Add-.eh_frame-to-list-of-relocations-stripped.patch
+Patch0022: 0022-Don-t-require-a-password-to-boot-entries-generated-b.patch
+Patch0023: 0023-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+Patch0024: 0024-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+Patch0025: 0025-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+Patch0026: 0026-Try-prefix-if-fw_path-doesn-t-work.patch
+Patch0027: 0027-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+Patch0028: 0028-Add-friendly-grub2-password-config-tool-985962.patch
+Patch0029: 0029-tcp-add-window-scaling-support.patch
+Patch0030: 0030-efinet-and-bootp-add-support-for-dhcpv6.patch
+Patch0031: 0031-bootp-New-net_bootp6-command.patch
+Patch0032: 0032-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+Patch0033: 0033-Make-grub_fatal-also-backtrace.patch
+Patch0034: 0034-Make-our-info-pages-say-grub2-where-appropriate.patch
+Patch0035: 0035-macos-just-build-chainloader-entries-don-t-try-any-x.patch
+Patch0036: 0036-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
+Patch0037: 0037-btrfs-fix-a-bad-null-check.patch
+Patch0038: 0038-export-btrfs_subvol-and-btrfs_subvolid.patch
+Patch0039: 0039-grub2-btrfs-03-follow_default.patch
+Patch0040: 0040-grub2-btrfs-04-grub2-install.patch
+Patch0041: 0041-grub2-btrfs-05-grub2-mkconfig.patch
+Patch0042: 0042-grub2-btrfs-06-subvol-mount.patch
+Patch0043: 0043-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
+Patch0044: 0044-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+Patch0045: 0045-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
+Patch0046: 0046-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+Patch0047: 0047-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+Patch0048: 0048-don-t-use-int-for-efi-status.patch
+Patch0049: 0049-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
+Patch0050: 0050-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
+Patch0051: 0051-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
+Patch0052: 0052-align-struct-efi_variable-better.patch
+Patch0053: 0053-Add-BLS-support-to-grub-mkconfig.patch
+Patch0054: 0054-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
+Patch0055: 0055-Add-grub2-switch-to-blscfg.patch
+Patch0056: 0056-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
+Patch0057: 0057-Work-around-some-minor-include-path-weirdnesses.patch
+Patch0058: 0058-Make-it-possible-to-enabled-build-id-sha1.patch
+Patch0059: 0059-make-better-backtraces.patch
+Patch0060: 0060-Fixup-for-newer-compiler.patch
+Patch0061: 0061-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
+Patch0062: 0062-Fixup-for-newer-compiler.patch
+Patch0063: 0063-Add-support-for-non-Ethernet-network-cards.patch
+Patch0064: 0064-efinet-UEFI-IPv6-PXE-support.patch
+Patch0065: 0065-grub.texi-Add-net_bootp6-doument.patch
+Patch0066: 0066-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
+Patch0067: 0067-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
+Patch0068: 0068-efinet-Setting-network-from-UEFI-device-path.patch
+Patch0069: 0069-efinet-Setting-DNS-server-from-UEFI-protocol.patch
+Patch0070: 0070-Support-UEFI-networking-protocols.patch
+Patch0071: 0071-AUDIT-0-http-boot-tracker-bug.patch
+Patch0072: 0072-grub-editenv-Add-incr-command-to-increment-integer-v.patch
+Patch0073: 0073-Add-auto-hide-menu-support.patch
+Patch0074: 0074-Add-grub-set-bootflag-utility.patch
+Patch0075: 0075-docs-Add-grub-boot-indeterminate.service-example.patch
+Patch0076: 0076-gentpl-add-disable-support.patch
+Patch0077: 0077-gentpl-add-pc-firmware-type.patch
+Patch0078: 0078-efinet-also-use-the-firmware-acceleration-for-http.patch
+Patch0079: 0079-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
+Patch0080: 0080-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
+Patch0081: 0081-Rework-how-the-fdt-command-builds.patch
+Patch0082: 0082-Disable-non-wordsize-allocations-on-arm.patch
+Patch0083: 0083-Prepend-prefix-when-HTTP-path-is-relative.patch
+Patch0084: 0084-Make-grub_error-more-verbose.patch
+Patch0085: 0085-Make-reset-an-alias-for-the-reboot-command.patch
+Patch0086: 0086-Add-a-version-command.patch
+Patch0087: 0087-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
+Patch0088: 0088-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
+Patch0089: 0089-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
+Patch0090: 0090-Fix-getroot.c-s-trampolines.patch
+Patch0091: 0091-Do-not-allow-stack-trampolines-anywhere.patch
+Patch0092: 0092-Reimplement-boot_counter.patch
+Patch0093: 0093-Fix-menu-entry-selection-based-on-ID-and-title.patch
+Patch0094: 0094-Make-the-menu-entry-users-option-argument-to-be-opti.patch
+Patch0095: 0095-Add-efi-export-env-and-efi-load-env-commands.patch
+Patch0096: 0096-Export-all-variables-from-the-initial-context-when-c.patch
+Patch0097: 0097-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
+Patch0098: 0098-Don-t-assume-that-boot-commands-will-only-return-on-.patch
+Patch0099: 0099-grub-set-bootflag-Update-comment-about-running-as-ro.patch
+Patch0100: 0100-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
+Patch0101: 0101-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
+Patch0102: 0102-Add-start-symbol-for-RISC-V.patch
+Patch0103: 0103-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
+Patch0104: 0104-efi-http-Export-fw-http-_path-variables-to-make-them.patch
+Patch0105: 0105-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
+Patch0106: 0106-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
+Patch0107: 0107-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
+Patch0108: 0108-efi-net-Print-a-debug-message-if-parsing-the-address.patch
+Patch0109: 0109-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
+Patch0110: 0110-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
+Patch0111: 0111-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
+Patch0112: 0112-efi-dhcp-fix-some-allocation-error-checking.patch
+Patch0113: 0113-efi-http-fix-some-allocation-error-checking.patch
+Patch0114: 0114-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
+Patch0115: 0115-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
+Patch0116: 0116-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
+Patch0117: 0117-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
+Patch0118: 0118-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
+Patch0119: 0119-Add-systemd-integration-scripts-to-make-systemctl-re.patch
+Patch0120: 0120-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
+Patch0121: 0121-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
+Patch0122: 0122-grub-install-disable-support-for-EFI-platforms.patch
+Patch0123: 0123-New-with-debug-timestamps-configure-flag-to-prepend-.patch
+Patch0124: 0124-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
+Patch0125: 0125-Introduce-function-grub_debug_is_enabled-void-return.patch
+Patch0126: 0126-Don-t-clear-screen-when-debugging-is-enabled.patch
+Patch0127: 0127-grub_file_-instrumentation-new-file-debug-tag.patch
+Patch0128: 0128-ieee1275-Avoiding-many-unecessary-open-close.patch
+Patch0129: 0129-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
+Patch0130: 0130-ieee1275-powerpc-enables-device-mapper-discovery.patch
+Patch0131: 0131-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
+Patch0132: 0132-Add-suport-for-signing-grub-with-an-appended-signatu.patch
+Patch0133: 0133-docs-grub-Document-signing-grub-under-UEFI.patch
+Patch0134: 0134-docs-grub-Document-signing-grub-with-an-appended-sig.patch
+Patch0135: 0135-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
+Patch0136: 0136-pgp-factor-out-rsa_pad.patch
+Patch0137: 0137-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
+Patch0138: 0138-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
+Patch0139: 0139-libtasn1-import-libtasn1-4.16.0.patch
+Patch0140: 0140-libtasn1-disable-code-not-needed-in-grub.patch
+Patch0141: 0141-libtasn1-changes-for-grub-compatibility.patch
+Patch0142: 0142-libtasn1-compile-into-asn1-module.patch
+Patch0143: 0143-test_asn1-test-module-for-libtasn1.patch
+Patch0144: 0144-grub-install-support-embedding-x509-certificates.patch
+Patch0145: 0145-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
+Patch0146: 0146-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
+Patch0147: 0147-appended-signatures-support-verifying-appended-signa.patch
+Patch0148: 0148-appended-signatures-verification-tests.patch
+Patch0149: 0149-appended-signatures-documentation.patch
+Patch0150: 0150-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
+Patch0151: 0151-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
+Patch0152: 0152-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
+Patch0153: 0153-ieee1275-ofdisk-retry-on-open-failure.patch
+Patch0154: 0154-efinet-Add-DHCP-proxy-support.patch
+Patch0155: 0155-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
+Patch0156: 0156-Suppress-gettext-error-message.patch
+Patch0157: 0157-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
+Patch0158: 0158-normal-main-Discover-the-device-to-read-the-config-f.patch
+Patch0159: 0159-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
+Patch0160: 0160-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
+Patch0161: 0161-Add-Fedora-location-of-DejaVu-SANS-font.patch
+Patch0162: 0162-efi-new-connectefi-command.patch
+Patch0163: 0163-powerpc-prefix-detection-support-device-names-with-c.patch
+Patch0164: 0164-make-ofdisk_retries-optional.patch
+Patch0165: 0165-misc-Make-grub_min-and-grub_max-more-resilient.patch
+Patch0166: 0166-ReiserFS-switch-to-using-grub_min-grub_max.patch
+Patch0167: 0167-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch
+Patch0168: 0168-modules-make-.module_license-read-only.patch
+Patch0169: 0169-modules-strip-.llvm_addrsig-sections-and-similar.patch
+Patch0170: 0170-modules-Don-t-allocate-space-for-non-allocable-secti.patch
+Patch0171: 0171-modules-load-module-sections-at-page-aligned-address.patch
+Patch0172: 0172-nx-add-memory-attribute-get-set-API.patch
+Patch0173: 0173-nx-set-page-permissions-for-loaded-modules.patch
+Patch0174: 0174-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch
+Patch0175: 0175-grub_fs_probe-dprint-errors-from-filesystems.patch
+Patch0176: 0176-Make-debug-file-show-which-file-filters-get-run.patch
+Patch0177: 0177-BLS-create-etc-kernel-cmdline-during-mkconfig.patch
+Patch0178: 0178-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
+Patch0179: 0179-squish-give-up-on-rhgb-quiet.patch
+Patch0180: 0180-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
+Patch0181: 0181-blscfg-Don-t-root-device-in-emu-builds.patch
+Patch0182: 0182-ppc64le-signed-boot-media-changes.patch
+Patch0183: 0183-core-Fix-several-implicit-function-declarations.patch
+Patch0184: 0184-ieee1275-request-memory-with-ibm-client-architecture.patch
+Patch0185: 0185-hostdisk-work-around-proc-not-reporting-size.patch
+Patch0186: 0186-blscfg-check-for-mounted-boot-in-emu.patch
+Patch0187: 0187-grub_dl_set_mem_attrs-fix-format-string.patch
+Patch0188: 0188-grub_dl_set_mem_attrs-add-self-check-for-the-tramp-G.patch
+Patch0189: 0189-grub_dl_load_segments-page-align-the-tramp-GOT-areas.patch
+Patch0190: 0190-emu-Add-switch-root-to-grub-emu.patch
+Patch0191: 0191-util-Enable-default-kernel-for-updates.patch
+Patch0192: 0192-efi-http-change-uint32_t-to-uintn_t.patch
+Patch0193: 0193-Add-Install-section-to-aux-systemd-units.patch
+Patch0194: 0194-Fix-missing-include-in-ofdisk.c.patch
+Patch0195: 0195-add-flag-to-only-search-root-dev.patch
+Patch0196: 0196-cryptdisk-fix-incorrect-sign-comparison.patch
+Patch0197: 0197-grub-install-fix-a-sign-comparison-error.patch
+Patch0198: 0198-grub-mount-work-around-bad-integer-comparison.patch
+Patch0199: 0199-power-Fix-use-after-free-in-get_slave_from_dm.patch
+Patch0200: 0200-Fix-some-sign-comparison-errors.patch
+Patch0201: 0201-normal-Fix-a-discarded-const.patch
+Patch0202: 0202-at_keyboard-mark-grub_keyboard_controller_write-unus.patch
+Patch0203: 0203-Fix-another-minor-sign-comparison-error.patch
+Patch0204: 0204-Track-explicit-module-dependencies-in-Makefile.core..patch
+Patch0205: 0205-Revert-mm-Assert-that-we-preserve-header-vs-region-a.patch
+Patch0206: 0206-make-use-the-_CPU-variety-of-build-flags-for-PROGRAM.patch
+Patch0207: 0207-Work-around-extra_deps.lst-issue.patch
+Patch0208: 0208-include-proper-attribute-for-an-EFI-API-call-definit.patch
+Patch0209: 0209-cast-grub_error-status-parameter.patch
+Patch0210: 0210-remove-unused-varible.patch
+Patch0211: 0211-cast-grub_net_bootp_packet-pointer.patch
+Patch0212: 0212-libtasn1-fix-string-overflow-warning.patch
+Patch0213: 0213-Add-support-for-Linux-EFI-stub-loading.patch
+Patch0214: 0214-fix-i386_pc-on-legacycfg-module.patch
+Patch0215: 0215-Add-secureboot-support-on-efi-chainloader.patch
+Patch0216: 0216-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+Patch0217: 0217-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+Patch0218: 0218-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
+Patch0219: 0219-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
+Patch0220: 0220-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
+Patch0221: 0221-Try-to-pick-better-locations-for-kernel-and-initrd.patch
+Patch0222: 0222-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
+Patch0223: 0223-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
+Patch0224: 0224-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
+Patch0225: 0225-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
+Patch0226: 0226-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
+Patch0227: 0227-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
+Patch0228: 0228-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+Patch0229: 0229-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+Patch0230: 0230-Allow-chainloading-EFI-apps-from-loop-mounts.patch
+Patch0231: 0231-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
+Patch0232: 0232-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
+Patch0233: 0233-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
+Patch0234: 0234-loader-efi-chainloader-grub_load_and_start_image-doe.patch
+Patch0235: 0235-loader-efi-chainloader-simplify-the-loader-state.patch
+Patch0236: 0236-loader-efi-chainloader-Use-grub_loader_set_ex.patch
+Patch0237: 0237-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch
+Patch0238: 0238-loader-i386-efi-linux-Use-grub_loader_set_ex.patch
+Patch0239: 0239-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch
+Patch0240: 0240-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch
+Patch0241: 0241-efi-use-enumerated-array-positions-for-our-allocatio.patch
+Patch0242: 0242-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
+Patch0243: 0243-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
+Patch0244: 0244-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
+Patch0245: 0245-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch
+Patch0246: 0246-grub-install-on-EFI-if-forced.patch
+Patch0247: 0247-Remove-Install-section-from-aux-systemd-units.patch
+Patch0248: 0248-chainloader-remove-device-path-debug-message.patch
+Patch0249: 0249-grub-set-bootflag-Conservative-partial-fix-for-CVE-2.patch
+Patch0250: 0250-grub-set-bootflag-More-complete-fix-for-CVE-2024-104.patch
+Patch0251: 0251-grub-set-bootflag-Exit-calmly-when-not-running-as-ro.patch
+Patch0252: 0252-Makefile.core.def-fix-linux-module.patch
+Patch0253: 0253-Add-support-for-Linux-EFI-stub-loading-on-arm-archit.patch
+Patch0254: 0254-arm-arm64-loader-Better-memory-allocation-and-error-.patch
+Patch0255: 0255-arm64-Fix-EFI-loader-kernel-image-allocation.patch
+Patch0256: 0256-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch
+Patch0257: 0257-Correct-BSS-zeroing-on-aarch64.patch
+Patch0258: 0258-arm64-Use-proper-memory-type-for-kernel-allocation.patch
+Patch0259: 0259-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch
+Patch0260: 0260-fs-xfs-Handle-non-continuous-data-blocks-in-director.patch
+Patch0261: 0261-Ignore-warnings-for-incompatible-types.patch
+Patch0262: 0262-cmd-search-Rework-of-CVE-2023-4001-fix.patch
+Patch0263: 0263-loader-efi-linux.c-read-the-kernel-image-before-head.patch
+Patch0264: 0264-nx-set-attrs-in-our-kernel-loaders.patch
+Patch0265: 0265-efi-Provide-wrappers-for-load_image-start_image.patch
+Patch0266: 0266-efi-Disallow-fallback-to-legacy-Linux-loader-when-sh.patch
+Patch0267: 0267-Set-non-executable-stack-sections-on-EFI-assembly-fi.patch
+Patch0268: 0268-grub-mkconfig.in-turn-off-executable-owner-bit.patch
+Patch0269: 0269-kern-ieee1275-init-Add-IEEE-1275-Radix-support-for-K.patch
+Patch0270: 0270-grub2-mkconfig-Ensure-grub-cfg-stub-is-not-overwritt.patch
+Patch0271: 0271-grub2-mkconfig-Simplify-os_name-detection.patch
+Patch0272: 0272-grub-mkconfig-Remove-check-for-mount-point-for-grub-.patch
+Patch0273: 0273-efi-api.h-include-missing-__grub_efi_api-macros-on-E.patch
+Patch0274: 0274-grub-core-net-arp.c-fix-variable-name.patch
+Patch0275: 0275-load-EFI-commands-inside-test-expressions.patch
+Patch0276: 0276-efi-loader-Check-if-NX-is-required-in-grub_efi_linux.patch
+Patch0277: 0277-Stop-grub.efi-from-always-printing-dynamic_load_symb.patch
+Patch0278: 0278-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch
+Patch0279: 0279-cmd-search-Fix-a-possible-NULL-ptr-dereference.patch
+Patch0280: 0280-Enable-building-blscfg-module-on-xen-and-xen_pvh.patch
+Patch0281: 0281-loader-efi-Fix-RISC-V-build.patch
+Patch0282: 0282-kern-riscv-efi-init-Use-time-register-in-grub_efi_ge.patch
+Patch0283: 0283-Use-medany-instead-of-large-model-for-RISCV.patch
+Patch0284: 0284-fs-xfs-Fix-large-extent-counters-incompat-feature-su.patch
+Patch0285: 0285-term-nns8250-spcr-return-if-redirection-is-disabled.patch
+Patch0286: 0286-commands-legacycfg-Avoid-closing-file-twice.patch
+Patch0287: 0287-disk-ahci.c-remove-conditional-operator-for-endtime.patch
+Patch0288: 0288-commands-bli-Fix-crash-in-get_part_uuid.patch
+Patch0289: 0289-misc-Implement-grub_strlcpy.patch
+Patch0290: 0290-fs-ufs-Fix-a-heap-OOB-write.patch
+Patch0291: 0291-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch
+Patch0292: 0292-fs-tar-Initialize-name-in-grub_cpio_find_file.patch
+Patch0293: 0293-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch
+Patch0294: 0294-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch
+Patch0295: 0295-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch
+Patch0296: 0296-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch
+Patch0297: 0297-fs-iso9660-Fix-invalid-free.patch
+Patch0298: 0298-fs-jfs-Fix-OOB-read-in-jfs_getent.patch
+Patch0299: 0299-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch
+Patch0300: 0300-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch
+Patch0301: 0301-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch
+Patch0302: 0302-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch
+Patch0303: 0303-fs-ntfs-Fix-out-of-bounds-read.patch
+Patch0304: 0304-fs-ntfs-Track-the-end-of-the-MFT-attribute-buffer.patch
+Patch0305: 0305-fs-ntfs-Use-a-helper-function-to-access-attributes.patch
+Patch0307: 0307-fs-xfs-Fix-out-of-bounds-read.patch
+Patch0308: 0308-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch
+Patch0309: 0309-kern-file-Ensure-file-data-is-set.patch
+Patch0310: 0310-kern-file-Implement-filesystem-reference-counting.patch
+Patch0311: 0311-cli_lock-Add-build-option-to-block-command-line-inte.patch
+Patch0312: 0312-disk-cryptodisk-Require-authentication-after-TPM-unl.patch
+Patch0313: 0313-disk-loopback-Reference-tracking-for-the-loopback.patch
+Patch0314: 0314-kern-disk-Limit-recursion-depth.patch
+Patch0315: 0315-kern-partition-Limit-recursion-in-part_iterate.patch
+Patch0316: 0316-script-execute-Limit-the-recursion-depth.patch
+Patch0317: 0317-net-Unregister-net_default_ip-and-net_default_mac-va.patch
+Patch0318: 0318-net-Remove-variables-hooks-when-interface-is-unregis.patch
+Patch0319: 0319-net-Fix-OOB-write-in-grub_net_search_config_file.patch
+Patch0320: 0320-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch
+Patch0321: 0321-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch
+Patch0322: 0322-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch
+Patch0323: 0323-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch
+Patch0324: 0324-commands-extcmd-Missing-check-for-failed-allocation.patch
+Patch0325: 0325-commands-ls-Fix-NULL-dereference.patch
+Patch0326: 0326-commands-pgp-Unregister-the-check_signatures-hooks-o.patch
+Patch0327: 0327-normal-Remove-variables-hooks-on-module-unload.patch
+Patch0328: 0328-gettext-Remove-variables-hooks-on-module-unload.patch
+Patch0329: 0329-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch
+Patch0330: 0330-gettext-Integer-overflow-leads-to-heap-OOB-write.patch
+Patch0331: 0331-commands-read-Fix-an-integer-overflow-when-supplying.patch
+Patch0332: 0332-commands-test-Stack-overflow-due-to-unlimited-recurs.patch
+Patch0333: 0333-commands-minicmd-Block-the-dump-command-in-lockdown-.patch
+Patch0334: 0334-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch
+Patch0335: 0335-commands-hexdump-Disable-memory-reading-in-lockdown-.patch
+Patch0336: 0336-fs-bfs-Disable-under-lockdown.patch
+Patch0337: 0337-fs-Disable-many-filesystems-under-lockdown.patch
+Patch0338: 0338-disk-Use-safe-math-macros-to-prevent-overflows.patch
+Patch0339: 0339-disk-Prevent-overflows-when-allocating-memory-for-ar.patch
+Patch0340: 0340-disk-Check-if-returned-pointer-for-allocated-memory-.patch
+Patch0341: 0341-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch
+Patch0342: 0342-fs-Use-safe-math-macros-to-prevent-overflows.patch
+Patch0343: 0343-fs-Prevent-overflows-when-allocating-memory-for-arra.patch
+Patch0344: 0344-fs-Prevent-overflows-when-assigning-returned-values-.patch
+Patch0345: 0345-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch
+Patch0346: 0346-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch
+Patch0347: 0347-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch
+Patch0348: 0348-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch
+Patch0349: 0349-net-Use-safe-math-macros-to-prevent-overflows.patch
+Patch0350: 0350-net-Prevent-overflows-when-allocating-memory-for-arr.patch
+Patch0351: 0351-net-Check-if-returned-pointer-for-allocated-memory-i.patch
+Patch0352: 0352-fs-sfs-Check-if-allocated-memory-is-NULL.patch
+Patch0353: 0353-script-execute-Fix-potential-underflow-and-NULL-dere.patch
+Patch0354: 0354-osdep-unix-getroot-Fix-potential-underflow.patch
+Patch0355: 0355-misc-Ensure-consistent-overflow-error-messages.patch
+Patch0356: 0356-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch
+Patch0357: 0357-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch
+Patch0358: 0358-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch
+Patch0359: 0359-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch
+Patch0360: 0360-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch
+Patch0361: 0361-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch
+Patch0362: 0362-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch
+Patch0363: 0363-powerpc-increase-MIN-RMA-size-for-CAS-negotiation.patch
+Patch0364: 0364-script-execute-Don-t-let-trailing-blank-lines-determ.patch
+Patch0365: 0365-normal-menu-Check-return-code-of-the-script-when-exe.patch
+Patch0366: 0366-ieee1275-ofnet-Fix-grub_malloc-removed-after-added-s.patch
+Patch0367: 0367-grub-mkimage-Create-new-ELF-note-for-SBAT.patch
+Patch0368: 0368-grub-mkimage-Add-SBAT-metadata-into-ELF-note-for-Pow.patch
+Patch0369: 0369-10_linux.in-escape-kernel-option-characters-properly.patch
+Patch0370: 0370-blscfg-check-if-variable-is-escaped-before-consideri.patch
+Patch0371: 0371-kern-rescue_reader-Block-the-rescue-mode-until-the-C.patch
+Patch0372: 0372-commands-search-Introduce-the-cryptodisk-only-argume.patch
+Patch0373: 0373-disk-diskfilter-Introduce-the-cryptocheck-command.patch
+Patch0374: 0374-commands-search-Add-the-diskfilter-support.patch
+Patch0375: 0375-docs-Document-available-crypto-disks-checks.patch
+Patch0376: 0376-disk-cryptodisk-Add-the-erase-secrets-function.patch
+Patch0377: 0377-disk-cryptodisk-Wipe-the-passphrase-from-memory.patch
+Patch0378: 0378-cryptocheck-Add-quiet-option.patch
+Patch0379: 0379-loader-efi-chainloader-Fix-double-free.patch
+Patch0380: 0380-loader-efi-chainloader-Fix-null-pointer-dereference.patch
+Patch0381: 0381-osdep-linux-getroot-Detect-DDF-container-similar-to-.patch
+Patch0382: 0382-Set-correctly-the-memory-attributes-for-the-kernel-P.patch
+Patch0383: 0383-Include-function-name-on-debug-print-function.patch
+Patch0384: 0384-kern-misc-Implement-grub_strtok.patch
+Patch0385: 0385-blsuki-Add-blscfg-command-to-parse-Boot-Loader-Speci.patch
+Patch0386: 0386-util-misc.c-Change-offset-type-for-grub_util_write_i.patch
+Patch0387: 0387-blsuki-Check-for-mounted-boot-in-emu.patch
+Patch0388: 0388-blsuki-Add-uki-command-to-load-Unified-Kernel-Image-.patch
+Patch0389: 0389-posix_wrap-Tweaks-in-preparation-for-libtasn1.patch
+Patch0390: 0390-blsuki-do-not-register-blscfg-command.patch
+Patch0391: 0391-misc-add-z-length-modifier-support.patch
+Patch0392: 0392-tests-add-z-modifier-printf-tests.patch
+Patch0393: 0393-util-grub-editenv-add-fs_envblk-open-helper.patch
+Patch0394: 0394-util-grub-editenv-add-fs_envblk-write-helper.patch
+Patch0395: 0395-util-grub-editenv-wire-set_variables-to-optional-fs_.patch
+Patch0396: 0396-util-grub-editenv-wire-unset_variables-to-optional-f.patch
+Patch0397: 0397-util-grub-editenv-wire-list_variables-to-optional-fs.patch
+Patch0398: 0398-util-grub-editenv-add-probe-call-for-external-envblk.patch
+Patch0399: 0399-btrfs-add-environment-block-to-reserved-header-area.patch
+Patch0400: 0400-00_header.in-wire-grub.cfg-to-use-env_block-when-pre.patch
+Patch0401: 0401-btrfs-update-doc-link-for-bootloader-support.patch
+Patch0402: 0402-docs-add-Btrfs-env-block-and-special-env-vars.patch
+Patch0403: 0403-kern-fs-Honour-file-read_hook-in-grub_fs_blocklist_r.patch
+Patch0404: 0404-util-grub.d-00_header.in-Prefer-dev-instead-of-root-.patch
+Patch0405: 0405-grub.d-Support-the-external-environment-block-for-au.patch
+Patch0406: 0406-grub-editenv-Make-automatic-hidden-menu-and-boot-cou.patch
+Patch0407: 0407-Increase-EFI-max-allocation-to-max-usable-address.patch
diff --git a/grub2.spec b/grub2.spec
index b9e4543a..8f73768c 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -6,7 +6,7 @@
 %undefine _hardened_build
 %undefine _package_note_file
 
-%global tarversion 2.06
+%global tarversion 2.12
 %undefine _missing_build_ids_terminate_build
 %global _configure_gnuconfig_hack 0
 
@@ -16,10 +16,10 @@
 
 Name:		grub2
 Epoch:		1
-Version:	2.06
-Release:	52%{?dist}
+Version:	2.12
+Release:	50%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
-License:	GPLv3+
+License:	GPL-3.0-or-later
 URL:		http://www.gnu.org/software/grub/
 Obsoletes:	grub < 1:0.98
 Source0:	https://ftp.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz
@@ -35,25 +35,42 @@ Source9:	strtoull_test.c
 Source10:	20-grub.install
 Source11:	grub.patches
 Source12:	sbat.csv.in
+Source13:	gen_grub_cfgstub
+Source14:	95-set-boot-entry.install
 
 %include %{SOURCE1}
 
-BuildRequires:	gcc efi-srpm-macros
-BuildRequires:	flex bison binutils python3
-BuildRequires:	ncurses-devel xz-devel bzip2-devel
-BuildRequires:	freetype-devel
-BuildRequires:	fuse-devel
-BuildRequires:	rpm-devel rpm-libs
-BuildRequires:	autoconf automake device-mapper-devel
-BuildRequires:	freetype-devel gettext-devel git
-BuildRequires:	texinfo
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	binutils
+BuildRequires:	bison
+BuildRequires:	bzip2-devel
 BuildRequires:	dejavu-sans-fonts
+BuildRequires:	device-mapper-devel
+BuildRequires:	efi-srpm-macros
+BuildRequires:	flex
+BuildRequires:	freetype-devel
+BuildRequires:	freetype-devel
+BuildRequires:	fuse3-devel
+BuildRequires:	gcc
+BuildRequires:	gettext-devel
+BuildRequires:	git
 BuildRequires:	help2man
-# For %%_userunitdir macro
-BuildRequires:	systemd
+BuildRequires:	ncurses-devel
+BuildRequires:	python3
+BuildRequires:	rpm-devel
+BuildRequires:	rpm-libs
+BuildRequires:	squashfs-tools
+BuildRequires:	texinfo
+BuildRequires:	xz-devel
+
+# For %%_userunitdir and %%systemd_* macros
+BuildRequires:	systemd-rpm-macros
+
 %ifarch %{efi_arch}
 BuildRequires:	pesign >= 0.99-8
 %endif
+
 %if %{?_with_ccache: 1}%{?!_with_ccache: 0}
 BuildRequires:	ccache
 %endif
@@ -94,12 +111,12 @@ subpackages.
 
 %package tools
 Summary:	Support tools for GRUB.
-Obsoletes:	grub2-tools < %{evr}
 Requires:	grub2-common = %{epoch}:%{version}-%{release}
-Requires:	gettext os-prober file
+Requires:	gettext-runtime os-prober file
 Requires(pre):	dracut
 Requires(pre):	grep
 Requires(pre):	sed
+%{?systemd_requires}
 
 %description tools
 %{desc}
@@ -108,9 +125,8 @@ This subpackage provides tools for support of all platforms.
 %ifarch x86_64
 %package tools-efi
 Summary:	Support tools for GRUB.
-Requires:	gettext os-prober file
+Requires:	gettext-runtime os-prober file
 Requires:	grub2-common = %{epoch}:%{version}-%{release}
-Obsoletes:	grub2-tools < %{evr}
 
 %description tools-efi
 %{desc}
@@ -119,9 +135,8 @@ This subpackage provides tools for support of EFI platforms.
 
 %package tools-minimal
 Summary:	Support tools for GRUB.
-Requires:	gettext
+Requires:	gettext-runtime
 Requires:	grub2-common = %{epoch}:%{version}-%{release}
-Obsoletes:	grub2-tools < %{evr}
 
 %description tools-minimal
 %{desc}
@@ -129,11 +144,10 @@ This subpackage provides tools for support of all platforms.
 
 %package tools-extra
 Summary:	Support tools for GRUB.
-Requires:	gettext os-prober file
+Requires:	gettext-runtime os-prober file
 Requires:	grub2-tools-minimal = %{epoch}:%{version}-%{release}
 Requires:	grub2-common = %{epoch}:%{version}-%{release}
 Requires:	mtools
-Obsoletes:	grub2-tools < %{evr}
 
 %description tools-extra
 %{desc}
@@ -148,6 +162,12 @@ This subpackage provides tools for support of all platforms.
 %if 0%{with_legacy_arch}
 %{expand:%define_legacy_variant %%{legacy_package_arch}}
 %endif
+%if 0%{with_xen_arch}
+%{expand:%define_xen_variant %%{xen_package_arch} -o}
+%endif
+%if 0%{with_xen_pvh_arch}
+%{expand:%define_xen_pvh_variant %%{xen_pvh_package_arch} -o}
+%endif
 
 %if 0%{with_emu_arch}
 %package emu
@@ -195,6 +215,22 @@ grep -A100000 '# stuff "make" creates' .gitignore > grub-emu-%{tarversion}/.giti
 cp %{SOURCE4} grub-emu-%{tarversion}/unifont.pcf.gz
 git add grub-emu-%{tarversion}
 %endif
+%if 0%{with_xen_arch}
+mkdir grub-%{grubxenarch}-%{tarversion}
+grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grubxenarch}-%{tarversion}/.gitignore
+cp %{SOURCE4} grub-%{grubxenarch}-%{tarversion}/unifont.pcf.gz
+sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" \
+    %{SOURCE12} > grub-%{grubxenarch}-%{tarversion}/sbat.csv
+git add grub-%{grubxenarch}-%{tarversion}
+%endif
+%if 0%{with_xen_pvh_arch}
+mkdir grub-%{grubxenpvharch}-%{tarversion}
+grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grubxenpvharch}-%{tarversion}/.gitignore
+cp %{SOURCE4} grub-%{grubxenpvharch}-%{tarversion}/unifont.pcf.gz
+sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" \
+    %{SOURCE12} > grub-%{grubxenpvharch}-%{tarversion}/sbat.csv
+git add grub-%{grubxenpvharch}-%{tarversion}
+%endif
 git commit -m "After making subdirs"
 
 %build
@@ -210,6 +246,15 @@ git commit -m "After making subdirs"
 %if 0%{with_emu_arch}
 %{expand:%do_emu_build}
 %endif
+%if 0%{with_xen_arch}
+%{expand:%do_xen_build %%{grubxenarch} %%{_target_platform} %%{xen_target_cflags} %%{xen_host_cflags}}
+%endif
+%if 0%{with_xen_pvh_arch}
+%{expand:%do_xen_pvh_build %%{grubxenpvharch} %%{_target_platform} %%{xen_pvh_target_cflags} %%{xen_pvh_host_cflags}}
+%endif
+%ifarch ppc64le
+%{expand:%do_ieee1275_build_images %%{grublegacyarch} %{grubelfname} %{sb_cer} %{sb_key}}
+%endif
 makeinfo --info --no-split -I docs -o docs/grub-dev.info \
 	docs/grub-dev.texi
 makeinfo --info --no-split -I docs -o docs/grub.info \
@@ -236,6 +281,12 @@ rm -fr $RPM_BUILD_ROOT
 %if 0%{with_emu_arch}
 %{expand:%do_emu_install %%{package_arch}}
 %endif
+%if 0%{with_xen_arch}
+%{expand:%do_xen_install %%{grubxenarch}}
+%endif
+%if 0%{with_xen_pvh_arch}
+%{expand:%do_xen_pvh_install %%{grubxenpvharch}}
+%endif
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 ln -s grub2-set-password ${RPM_BUILD_ROOT}/%{_sbindir}/grub2-setpassword
 echo '.so man8/grub2-set-password.8' > ${RPM_BUILD_ROOT}/%{_datadir}/man/man8/grub2-setpassword.8
@@ -251,14 +302,12 @@ rm -vf ${RPM_BUILD_ROOT}/%{_sbindir}/grub2-macbless
 # Install kernel-install scripts
 install -d -m 0755 %{buildroot}%{_prefix}/lib/kernel/install.d/
 install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE10}
+install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE14}
 install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE3}
 install -d -m 0755 %{buildroot}%{_sysconfdir}/kernel/install.d/
 # Install systemd user service to set the boot_success flag
 install -D -m 0755 -t %{buildroot}%{_userunitdir} \
 	docs/grub-boot-success.{timer,service}
-install -d -m 0755 %{buildroot}%{_userunitdir}/timers.target.wants
-ln -s ../grub-boot-success.timer \
-	%{buildroot}%{_userunitdir}/timers.target.wants
 # Install systemd system-update unit to set boot_indeterminate for offline-upd
 install -D -m 0755 -t %{buildroot}%{_unitdir} docs/grub-boot-indeterminate.service
 install -d -m 0755 %{buildroot}%{_unitdir}/system-update.target.wants
@@ -275,8 +324,9 @@ ln -s ../grub2-systemd-integration.service \
 %global dip RPM_BUILD_ROOT=%{finddebugroot} %{__debug_install_post}
 %define __debug_install_post (						\
 	mkdir -p %{finddebugroot}/usr					\
-	mv ${RPM_BUILD_ROOT}/usr/bin %{finddebugroot}/usr/bin		\
-	mv ${RPM_BUILD_ROOT}/usr/sbin %{finddebugroot}/usr/sbin		\
+	mv %{buildroot}/usr/bin %{finddebugroot}/usr/bin		\
+	[ "%{_sbindir}" != "%{_bindir}" ] &&				\\\
+		mv %{buildroot}/usr/sbin %{finddebugroot}/usr/sbin	\
 	%{dip}								\
 	install -m 0755 -d %{buildroot}/usr/lib/ %{buildroot}/usr/src/	\
 	cp -al %{finddebugroot}/usr/lib/debug/				\\\
@@ -284,7 +334,8 @@ ln -s ../grub2-systemd-integration.service \
 	cp -al %{finddebugroot}/usr/src/debug/				\\\
 		%{buildroot}/usr/src/debug/ )				\
 	mv %{finddebugroot}/usr/bin %{buildroot}/usr/bin		\
-	mv %{finddebugroot}/usr/sbin %{buildroot}/usr/sbin		\
+	[ "%{_sbindir}" != "%{_bindir}" ] &&				\\\
+		mv %{finddebugroot}/usr/sbin %{buildroot}/usr/sbin	\
 	%{nil}
 
 %undefine buildsubdir
@@ -316,11 +367,27 @@ elif [ -f /etc/grub.d/01_users ] && \
 	    > /boot/grub2/user.cfg
     fi
 fi
+# ensure we exit 0
+:
+
+%post tools
+%systemd_user_post grub-boot-success.timer
+
+%preun tools
+%systemd_user_preun grub-boot-success.timer
+
+%postun tools
+%systemd_user_postun_with_restart grub-boot-success.timer
+
+%triggerpostun tools -- grub2-tools < 1:2.06-107
+# grub-boot-success.timer was moved from a hard symlink under /lib/systemd
+# to a preset, apply the preset when upgrading from pre-preset versions
+/usr/lib/systemd/systemd-update-helper install-user-units grub-boot-success.timer
 
 %posttrans common
 set -eu
 
-EFI_HOME=%{efi_esp_dir}
+EFI_HOME=%{grub_efi_dir}
 GRUB_HOME=/boot/grub2
 ESP_PATH=/boot/efi
 
@@ -328,40 +395,49 @@ if ! mountpoint -q ${ESP_PATH}; then
     exit 0 # no ESP mounted, nothing to do
 fi
 
-if test ! -f ${EFI_HOME}/grub.cfg; then
-    # there's no config in ESP, create one
-    grub2-mkconfig -o ${EFI_HOME}/grub.cfg
+if test ! -f ${GRUB_HOME}/grub.cfg; then
+    # there's no config in GRUB home, create one
+    grub2-mkconfig -o ${GRUB_HOME}/grub.cfg
+else
+    GRUB_CFG_MODE=$(stat --format="%a" ${GRUB_HOME}/grub.cfg)
+    if ! test "${GRUB_CFG_MODE}" = "600"; then
+        # when upgrading from <=2.06-126 to newer versions, the grub config stub
+        # may have different mode than 0600, so set the latter if this is the case
+        chmod 0600 ${GRUB_HOME}/grub.cfg
+    fi
 fi
 
-if grep -q "configfile" ${EFI_HOME}/grub.cfg; then
-    exit 0 # already unified, nothing to do
+if test -f ${EFI_HOME}/grub.cfg; then
+    if (((grep -q "configfile" ${EFI_HOME}/grub.cfg && grep -q "root-dev-only" ${EFI_HOME}/grub.cfg) || grep -q "source" ${EFI_HOME}/grub.cfg) && ! grep -q "# It is automatically generated by grub2-mkconfig using templates" ${EFI_HOME}/grub.cfg); then
+        exit 0 #Already unified
+    fi
 fi
 
 # create a stub grub2 config in EFI
-BOOT_UUID=$(grub2-probe --target=fs_uuid ${GRUB_HOME})
-GRUB_DIR=$(grub2-mkrelpath ${GRUB_HOME})
-
-cat << EOF > ${EFI_HOME}/grub.cfg.stb
-search --no-floppy --fs-uuid --set=dev ${BOOT_UUID}
-set prefix=(\$dev)${GRUB_DIR}
-export \$prefix
-configfile \$prefix/grub.cfg
-EOF
+gen_grub_cfgstub $GRUB_HOME $EFI_HOME || :
 
 if test -f ${EFI_HOME}/grubenv; then
     cp -a ${EFI_HOME}/grubenv ${EFI_HOME}/grubenv.rpmsave
     mv --force ${EFI_HOME}/grubenv ${GRUB_HOME}/grubenv
 fi
 
-cp -a ${EFI_HOME}/grub.cfg ${EFI_HOME}/grub.cfg.rpmsave
-cp -a ${EFI_HOME}/grub.cfg ${GRUB_HOME}/
-mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
+%if 0%{with_efi_arch}
+%posttrans efi-%{efiarch}
+set -eu
+
+# On image mode, bootupd takes care of installing bootloader updates to the ESP
+if [[ ! -e "/run/ostree-booted" ]]; then
+    cp -a %{grub_efi_dir}/. %{efi_esp_dir} || :
+fi
+
+%endif
 
 %files common -f grub.lang
 %dir %{_libdir}/grub/
 %dir %{_datarootdir}/grub/
 %attr(0700,root,root) %dir %{_sysconfdir}/grub.d
 %{_prefix}/lib/kernel/install.d/20-grub.install
+%{_prefix}/lib/kernel/install.d/95-set-boot-entry.install
 %{_prefix}/lib/kernel/install.d/99-grub-mkconfig.install
 %dir %{_datarootdir}/grub
 %exclude %{_datarootdir}/grub/*
@@ -370,8 +446,7 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %dir /boot/grub2/themes/system
 %attr(0700,root,root) %dir /boot/grub2
 %exclude /boot/grub2/*
-%dir %attr(0700,root,root) %{efi_esp_dir}
-%exclude %{efi_esp_dir}/*
+%exclude %{grub_efi_dir}/*
 %ghost %config(noreplace) %verify(not size mode md5 mtime) /boot/grub2/grubenv
 %license COPYING
 %doc THANKS
@@ -412,7 +487,6 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %{_sysconfdir}/grub.d/README
 %{_userunitdir}/grub-boot-success.timer
 %{_userunitdir}/grub-boot-success.service
-%{_userunitdir}/timers.target.wants
 %{_unitdir}/grub-boot-indeterminate.service
 %{_unitdir}/system-update.target.wants
 %{_unitdir}/grub2-systemd-integration.service
@@ -426,7 +500,6 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %{_datarootdir}/bash-completion/completions/grub
 %{_sbindir}/grub2-mkconfig
 %{_sbindir}/grub2-switch-to-blscfg
-%{_sbindir}/grub2-rpm-sort
 %{_sbindir}/grub2-reboot
 %{_bindir}/grub2-file
 %{_bindir}/grub2-menulst2cfg
@@ -458,7 +531,6 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %exclude %{_datadir}/man/man1/grub2-render-label*
 
 %if %{with_legacy_arch}
-%{_sbindir}/grub2-install
 %ifarch x86_64
 %{_sbindir}/grub2-bios-setup
 %else
@@ -518,6 +590,12 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %if 0%{with_legacy_arch}
 %{expand:%define_legacy_variant_files %%{legacy_package_arch} %%{grublegacyarch}}
 %endif
+%if 0%{with_xen_arch}
+%{expand:%define_xen_variant_files %%{xen_package_arch} %%{xen_grub_target_name}}
+%endif
+%if 0%{with_xen_pvh_arch}
+%{expand:%define_xen_pvh_variant_files %%{xen_pvh_package_arch} %%{xen_pvh_grub_target_name}}
+%endif
 
 %if 0%{with_emu_arch}
 %files emu
@@ -530,6 +608,466 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Wed Dec 10 2025 Joel Capitao <jcapitao@redhat.com> - 2.12-50
+- Do not include EFI dir in common subpackage
+- Resolves: rhbz#2420430
+
+* Thu Nov 27 2025 Leo Sandoval <lsandova@redhat.com> - 2.12-49
+- Increase EFI max allocation to max usable address
+- Resolves: #2263643
+
+* Fri Nov 21 2025 Leo Sandoval <lsandova@redhat.com> - 2.12-48
+- Add support for external environment block on Btrfs
+
+* Thu Nov 13 2025 Leo Sandoval <lsandova@redhat.com> - 2.12-47
+- blsuki: do not register blscfg command
+
+* Tue Nov  4 2025 Tom Callaway <spot@fedoraproject.org> - 2.12-46
+- rebuild for new fuse3
+
+* Wed Oct 15 2025 Leo Sandoval <lsandova@redhat.com> - 2.12-45
+- Include upstream blsuki related patches
+
+* Mon Sep 15 2025 Leo Sandoval <lsandova@redhat.com> - 2.12-44
+- Include function name on debug print function
+
+* Fri Aug 29 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-43
+- gen_grub_cfgstub: Removed output messages
+
+* Wed Aug 20 2025 Jan Stancek <jstancek@redhat.com> - 2.12-42
+- move 55-set-boot-entry.install to 95
+- Related: #2389020
+
+* Mon Aug 11 2025 Marta Lewandowska <mlewando@redhat.com> - 2.12-41
+- Phase 1 of the bootloader updates proposal implementation
+- https://fedoraproject.org/wiki/Changes/BootLoaderUpdatesPhase1
+
+* Wed Aug 6 2025 Jan Stancek <jstancek@redhat.com> - 2.12-40
+- 55-set-boot-entry.install: fix initrd check
+- Resolves: #2386118
+
+* Fri Aug 1 2025 FeRD (Frank Dana) <ferdnyc@gmail.com> - 2.12-39
+- kernel-install: Suppress warnings about missing /etc/default/grub
+  file when attempting to grep its contents
+
+* Tue Jul 29 2025 Leo Sandoval <lsandova@redhat.com> 2.12-38
+- Set correctly the memory attributes for the kernel PE sections
+
+* Tue Jul 8 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-37
+- spec: fix grub stub cfg creation script
+
+* Thu Jun 12 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-36
+- spec: moved grub stub cfg creation into a script
+
+* Thu Jun 5 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-35
+- osdep/linux/getroot: Detect DDF container similar to IMSM
+
+* Wed May 28 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-34
+- Some fixes addressing memory freeing and dereferencing
+- Resolves: #2368939
+- Resolves: #2368945
+
+* Fri May 16 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-33
+- sbat: bump grub sbat
+
+* Tue May 06 2025 Leo Sandoval <lsandova@redhat.com> - 2.12-32
+- Fix several cryptodisk vulnerabilities
+- Resolves: CVE-2025-4382
+
+* Tue May 6 2025 Leo Sandoval <lsandova@redhat.com> 2.12-31
+- Handle special kernel parameter characters properly
+- Resolves: #2362821
+
+* Fri Apr 18 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-30
+- ppc/mkimage: SBAT support on powerpc
+
+* Tue Mar 25 2025 Nicolas Frayer <nfrayer@redhat.com> 2.12-29
+- ieee1275/ofnet: Fix grub_malloc() removed after added safe
+
+* Tue Mar 25 2025 Nicolas Frayer <nfrayer@redhat.com> 2.12-28
+- Fix the fallback mechanism when menu entries fail to boot
+
+* Wed Mar 19 2025 Nicolas Frayer <nfrayer@redhat.com> 2.12-27
+- powerpc: increase MIN RMA size for CAS negotiation
+
+* Mon Mar 10 2025 Leo Sandoval <lsandova@redhat.com> 2.12-26
+- Remove 'fs/ntfs: Implement attribute verification' patch
+- Resolves: #2350327
+
+* Tue Feb 25 2025 Nicolas Frayer <nfrayer@redhat.com> 2.12-25
+- fs/ext2: Rework out-of-bounds read for inline and external extents
+- Resolves: #2346804
+
+* Tue Feb 18 2025 Leo Sandoval <lsandova@redhat.com> - 2.02-24
+- Add Several CVE fixes
+- Resolves: CVE-2024-45781 CVE-2024-45783 CVE-2024-45778
+- Resolves: CVE-2024-45775 CVE-2024-45780 CVE-2024-45774
+- Resolves: CVE-2025-0690 CVE-2025-1118 CVE-2024-45782
+- Resolves: CVE-2025-0624 CVE-2024-45779 CVE-2024-45776
+- Resolves: CVE-2025-0622 CVE-2025-0677
+- Related: #RHEL-79703
+- Related: #RHEL-79708
+- Related: #RHEL-79340
+- Related: #RHEL-73786
+- Related: #RHEL-79701
+- Related: #RHEL-73784
+- Related: #RHEL-79856
+- Related: #RHEL-79874
+- Related: #RHEL-79706
+- Related: #RHEL-79836
+- Related: #RHEL-79699
+- Related: #RHEL-75736
+- Related: #RHEL-79712
+- Related: #RHEL-79848
+
+* Tue Feb 11 2025 Nicolas Frayer <nfrayer@redhat.com> 2.12-23
+- Revert commit for bootloader update proposal for now as not all components are ready
+
+* Tue Feb 4 2025 Marta Lewandowska <mlewando@redhat.com> - 2.12-22
+- Phase 1 of the bootloader updates proposal implementation
+- https://fedoraproject.org/wiki/Changes/BootLoaderUpdatesPhase1
+
+* Tue Jan 28 2025 Nicolas Frayer <nfrayer@redhat.com> 2.12-21
+- commands/bli: Fix crash in get_part_uuid()
+- Resolves: #2339164
+
+* Wed Jan 22 2025 Leo Sandoval <lsandova@redhat.com> 2.12-20
+- fix pending SAST issues
+- Related: #RHEL-50504
+
+* Mon Jan 13 2025 Leo Sandoval <lsandova@redhat.com> 2.12-19
+- term/nns8250-spcr: return if redirection is disabled
+
+* Thu Jan 9 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-18
+- fs/xfs: fix large extent counters incompat feature support
+
+* Wed Nov 27 2024 Marta Lewandowska <mlewando@redhat.com> - 2.12-17
+- 99-grub-mkconfig.install: on PPC systems, remove petiboot's version checks
+
+* Wed Nov 27 2024 Marta Lewandowska <mlewando@redhat.com> - 2.12-16
+- 99-grub-mkconfig.install: Disable BLS and run grub2-mkconfig when GRUB_ENABLE_BLSCFG is disable
+- Resolves: #2325960
+
+* Thu Nov 21 2024 Andrea Bolognani <abologna@redhat.com> 2.12-15
+- Add riscv64 support (thanks Jason Montleon)
+
+* Wed Nov 20 2024 Nicolas Frayer <nfrayer@redhat.com> 2.12-14
+- Build modules for Xen PV and PVH
+
+* Fri Nov 15 2024 Nicolas Frayer <nfrayer@redhat.com> 2.12-13
+- posttrans: added check for efi_home/grub.cfg
+- Resolves: #2326502
+
+* Wed Oct 23 2024 Leo Sandoval <lsandova@redhat.com> 2.12-12
+- do-rebase: refactor command line parameters
+
+* Wed Oct 23 2024 Nicolas Frayer <nfrayer@redhat.com> 2.12-11
+- cmd/search: Fix a possible NULL ptr dereference
+
+* Thu Oct 17 2024 Nicolas Frayer <nfrayer@redhat.com> 2.12-10
+- acpi: Fix out of bounds access in grub_acpi_xsdt_find_table()
+- Resolves: #2317048
+
+* Thu Oct 3 2024 Nicolas Frayer <nfrayer@redhat.com> 2.12-9
+- Stop grub.efi from always printing "dynamic_load_symbols %p\n" during boot
+- Resolves: #2316279
+
+* Wed Sep 25 2024 Nicolas Frayer <nfrayer@redhat.com> 2.12-8
+- NX: efi/loader, add a call to grub_efi_check_nx_required()
+
+* Tue Sep 17 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.12-7
+- aarch64/macros: Build gnulib with -mbranch-protection=standard
+
+* Thu Sep 5 2024 Leo Sandoval <lsandova@redhat.com> - 2.12-6
+- load EFI commands inside test expressions
+- Resolves: #2305291
+
+* Thu Aug 29 2024 Leo Sandoval <lsandova@redhat.com> - 2.12-5
+- Fix netbooting regressions introduced at 2.12-1
+- Resolves: #2303727
+
+* Thu Aug 08 2024 Peter Robinson <pbrobinson@fedoraproject.org> 2.12-4
+- Build using fuse3
+
+* Tue Aug 6 2024 Leo Sandoval <lsandova@redhat.com> - 2.12-3
+- Remove 'efi: Use shim's loader protocol for EFI image verification'
+
+* Tue Aug 6 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.12-2
+- mkconfig: More hardening to prevent overwriting grub cfg stub
+
+* Mon Aug 5 2024 Leo Sandoval <lsandova@redhat.com> - 2.12-1
+- Rebased to release grub2-2.12
+
+* Fri Aug 2 2024 Leo Sandoval <lsandova@redhat.com> - 2.06-127
+- Set /boot/grub2/grub.cfg to 0600 mode if present
+
+* Mon Jul 22 2024 Leo Sandoval <lsandova@redhat.com> - 2.06.126
+- grub.cfg: Fix rpm grub.cfg verification issues
+
+* Tue Jul 16 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-125
+- grub2-mkconfig: Prevent mkconfig from overwriting grub cfg stub
+
+* Tue Jul 2 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-124
+- KVM/PowerVM: Add support for KVM on PowerVM
+- Resolved: #2294883
+
+* Tue May 28 2024 Leo Sandoval <lsandova@redhat.com> - 2.06.123
+- grub-mkconfig.in: turn off executable owner bit
+- Resolves: #2281464
+
+* Thu May 23 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-122
+- cmd/search: Rework of CVE-2023-4001 fix
+- Related: #2224951
+- Resolved: #2263369
+
+* Fri Apr 12 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-121
+- fs/xfs: Handle non-continuous data blocks in directory extents
+- Related: #2254370
+
+* Fri Mar 8 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-120
+- GRUB2 NTFS driver vulnerabilities
+- (CVE-2023-4692)
+- (CVE-2023-4693)
+- Resolves: #2236613
+- Resolves: #2241978
+- Resolves: #2241976
+- Resolves: #2238343
+
+* Wed Feb 7 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-119
+- grub-set-bootflag: Fix for CVE-2024-1048
+- (CVE-2024-1048)
+- Resolves: #2256678
+
+* Tue Jan 23 2024 Leo Sandoval <lsandova@redhat.com> - 2.06-118
+- xfs: include the 'directory extent parsing patch', otherwise
+XFS-formatted partitions do not boot. This change effectively
+reverts 2.06-115
+- Resolves: #2259266
+
+* Wed Jan 17 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-117
+- Compiler flags: ignore incompatible types for now as it prevents
+CI builds
+
+* Wed Jan 17 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-116
+- grub-core/commands: add flag to only search root dev
+- Resolves: #2223437
+- Resolves: #2224951
+- Resolves: #2258096
+- Resolves: CVE-2023-4001
+
+* Wed Jan 17 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-115
+- xfs: some bios systems can't boot with one of the xfs upstream patches
+- Resolves: #2254370
+
+* Sat Jan 13 2024 Hector Martin <marcan@fedoraproject.org> - 2.06-114
+- Switch memdisk compression to lzop
+
+* Thu Jan 11 2024 Daan De Meyer <daan.j.demeyer@gmail.com> - 2.06-113
+-  Don't obsolete the tools package with minimal
+
+* Tue Dec 19 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-112
+- normal: fix prefix when loading modules
+- Resolves: #2209435
+- Resolves: #2173015
+
+* Tue Dec 12 2023 leo sandoval <lsandova@redhat.com> - 2.06-111
+- chainloader: remove device path debug message
+
+* Fri Dec 1 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-110
+- fs/xfs: Add several fixes/improvements to xfs fs from upstream
+- Resolves: #2247926
+
+* Wed Nov 15 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-109
+- Linker: added --no-warn-rwx-segments as build will fail after
+ld.bfd default options have been changed.
+https://fedoraproject.org/wiki/Changes/Linker_Error_On_Security_Issues
+
+* Tue Nov 14 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-108
+- Remove [Install] section from aux systemd units
+- Related: #2247635
+
+* Tue Nov 14 2023 Hans de Goede <hdegoede@redhat.com> - 2.06-107
+- spec: Switch back to static enablement for grub services in tools package
+- spec: Add %%triggerpostun to apply grub-boot-success.timer preset
+  when upgrading from older versions where this was not a preset
+- Resolves: #2247635
+
+* Mon Nov 6 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-106
+- util: grub-install on EFI if forced
+- Resolves: #1917213
+- Resolves: #2240994
+
+* Fri Oct 20 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-105
+- kern/ieee1275/init: ppc64: Restrict high memory in presence
+  of fadump
+
+* Wed Oct 11 2023 Janne Grunau <j@jannau.net> - 2.06-104
+- 20-grub.install: Copy device-tree directory recursively
+- Resolves: #2243060
+
+* Fri Sep 29 2023 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 1:2.06-103
+- Rename installed kernel to match name used in boot entry
+- Resolves: #2239008
+
+* Fri Sep 29 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-102
+- ofdisk: Fix missing #include in ofdisk.c
+
+* Thu Sep 28 2023 Christian Glombek <cglombek@redhat.com> - 2.06-101
+- spec: Fix grub2-systemd-integration.service name
+
+* Wed Sep 13 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-100
+- arm64: Use proper memory type for kernel allocation
+- Resolves: #2149020
+
+* Fri Sep 01 2023 Christian Glombek <cglombek@redhat.com> - 2.06-99
+- spec: Use systemd presets and macros for units in tools package
+- Resolves: #2230575
+
+* Thu Aug 31 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-98
+- spec: Modified posttrans to harden grub config detection
+- Resolves: #2235692
+
+* Tue Aug 22 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-97
+- efi/http: change uint32_t to uintn_t
+
+* Tue Aug 22 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-96
+- util: Enable default kernel for updates
+
+* Wed Apr 12 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-95
+- Add switch-root support to grub-emu
+
+* Mon Apr 10 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-94
+- Fix aa64 page fault with EFI_MEMORY_ATTRIBUTE_PROTOCOL
+
+* Fri Mar 31 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-93
+- Add legacy pxe core.0 (cmadams)
+
+* Thu Mar 30 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-92
+- Disable the tpm verifier if the TPM device is not present 
+
+* Thu Mar 30 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-91
+- ppc64le: more cas vec5 shenanigans
+
+* Wed Mar 22 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-90
+- emu: work around systemctl bad behavior
+
+* Thu Mar 09 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-89
+- emu: handle BLS /boot weirdness
+
+* Mon Feb 20 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-88
+- Update mm fixes from upstream
+
+* Thu Feb 16 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-87
+- Fix disk sector size computation
+
+* Fri Feb 10 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-86
+- Override the linker and force nonexecutable stacks
+
+* Wed Feb 08 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-85
+- ppc64le: sync cas/tpm patchset with upstream
+
+* Mon Feb 06 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-84
+- emu: support newer kexec syscall
+
+* Mon Feb 06 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-83
+- ppc64le: cas5, take 3
+
+* Mon Feb 06 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-82
+- Fix implicit function declaration warnings
+
+* Wed Feb 01 2023 Javier Martinez Canillas <javierm@redhat.com> - 2.06-81
+- 20-grub-install: Explicitly check '+debug' suffix for debug kernels
+- Resolves: #2148351
+
+* Wed Feb 01 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-80
+- Bump to re-run signing
+
+* Tue Jan 31 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-79
+- Disable mdraid < 1.1 on ppc64le
+
+* Fri Jan 27 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-78
+- Fix grub2-probe issue with previous commit
+- Resolves: #2165136
+
+* Fri Jan 27 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-77
+- ppc64le: update signed media fixes
+
+* Fri Jan 13 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-76
+- ppc64le: fix issues using core.elf on boot media
+
+* Wed Jan 11 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-75
+- Pull allocator improvements from upstream
+
+* Wed Jan 11 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-74
+- Apply more hardening to host binaries
+
+* Tue Jan 10 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-73
+- Allow internal grub allocations over 4GB
+
+* Wed Dec 21 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-72
+- Fix prefix setting with memdisk creation for network boot
+
+* Mon Dec 19 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-71
+- Attempt to fix eln build
+
+* Wed Dec 14 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-70
+- ppc64le: fix lpar cas5
+- Resolves: #2152547
+
+* Tue Dec 06 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-69
+- Fix error handling in grub_file_open()
+
+* Mon Dec 05 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-68
+- Allow for xz'd symvers file (prarit)
+
+* Wed Nov 23 2022 Tomas Hrcka <thrcka@redhat.com> - 1:2.06-67
+- install unicode.pf2 into place so lorax works
+
+* Tue Nov 22 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-66
+- Bundle unicode.pf2 with images
+- Resolves: #2143725
+- Resolves: #2144113
+
+* Tue Nov 22 2022 Robbie Harwood <rharwood@redhat.com> - 1:2.06-65
+- Don't obsolete the tools package with extra/efi (pbrobinson)
+
+* Mon Nov 21 2022 Robbie Harwood <rharwood@redhat.com> - 1:2.06-64
+- Forward-port ppc64le image creation (with nerfed signing)
+
+* Tue Nov 08 2022 Robbie Harwood <rharwood@redhat.com> - 1:2.06-63
+- Font fixes (CVE-2022-2601 batch)
+
+* Tue Nov 01 2022 Robbie Harwood <rharwood@redhat.com> - 1:2.06-62
+- Try dropping custom sort again
+- See-also: https://github.com/rpm-software-management/rpm/pull/2249
+
+* Fri Oct 28 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-61
+- TDX measurements to RTMR
+
+* Wed Oct 12 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-60
+- x86-efi: Fix an incorrect array size in kernel allocation
+
+* Tue Oct 04 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-59
+- Flush instruction cache before starting aa64 kernel
+
+* Fri Sep 09 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-58
+- Bump spec for grub.macros gettext changes from Jens
+
+* Thu Sep 08 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-57
+- aa64: support pe/coff decompressor
+
+* Wed Sep 07 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-56
+- Revert patches to claim more memory for the arena
+
+* Thu Aug 25 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-55
+- Fix root definition for blscfg in emu
+
+* Thu Aug 25 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-54
+- gettext to gettext-runtime migration from Jens
+
+* Thu Aug 25 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-53
+- ieee1275: implement vec5 for cas negotiation
+
 * Wed Aug 17 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-52
 - Handle ostree's non-writable /etc/kernel
 
diff --git a/rpminspect.dson b/rpminspect.dson
new file mode 100644
index 00000000..8c98989c
--- /dev/null
+++ b/rpminspect.dson
@@ -0,0 +1,10 @@
+such "inspections" is such "javabytecode" is "off",
+                           "changedfiles" is "off".
+                           "filesize" is "off"?
+                           "patches" is "off"!
+                           "upstream" is "off"?
+                           "permissions" is "off".
+                           "debuginfo" is "off" wow,
+     "elf" is such "ignore" is so
+         "/usr/lib/grub/i386-pc/kernel.*" and
+         "/usr/lib/grub/i386-pc/lnxboot.image" many wow wow
diff --git a/rpminspect.yaml b/rpminspect.yaml
deleted file mode 100644
index e05d04c4..00000000
--- a/rpminspect.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-inspections:
-  # Not a Java package
-  javabytecode: off
-  
-  # These just flag when things change "too much"
-  changedfiles: off
-  filesize: off
-  patches: off
-  upstream: off
-
-  # https://bugzilla.redhat.com/show_bug.cgi?id=2007428
-  elf: off
-
-  # https://bugzilla.redhat.com/show_bug.cgi?id=1961250
-  annocheck: off
-
-  # https://bugzilla.redhat.com/show_bug.cgi?id=2007431
-  permissions: off
-
-  # https://bugzilla.redhat.com/show_bug.cgi?id=2007431
-  addedfiles: off
diff --git a/sbat.csv.in b/sbat.csv.in
index 55b3d10d..f8372dfd 100755
--- a/sbat.csv.in
+++ b/sbat.csv.in
@@ -1,3 +1,3 @@
 sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-grub,2,Free Software Foundation,grub,@@VERSION@@,https//www.gnu.org/software/grub/
+grub,5,Free Software Foundation,grub,@@VERSION@@,https//www.gnu.org/software/grub/
 grub.rh,2,Red Hat,grub2,@@VERSION_RELEASE@@,mailto:secalert@redhat.com
diff --git a/sources b/sources
index 5f2ba311..d510fb5f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (unifont-13.0.06.pcf.gz) = 25f1ea4e316cd77b65cf4f60aa10ed054db6df2195be7344216673dee6628ab055ebcdeea186996d931fd1e9e4f519f4a2e4b4544b8a9ad2fe410aadc4eecd2d
 SHA512 (theme.tar.bz2) = 0f6f914d5f801509403094b28b8cfe5169cb56ae9bdd808ae21a6780a8236b434161a068351508dd78729c25ee2fed066c124c1eef9e15102750b409b4576a5c
-SHA512 (grub-2.06.tar.xz) = 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
+SHA512 (grub-2.12.tar.xz) = 761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3
 SHA512 (gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.gz) = 6887dede2d4a403422ea045329ee9bd7ca4c1561bcaf39e805e1d1ce8f4c050a65ce286e7d8362fb8e815b5fab0b405730a3f93194e343e2aedcf9b4411a285e