Merge version 2.12-9+rpi1 and 2.14~git20250718.0e36779-2 to produce 2.14~git20250718...

diff --cc debian/changelog
index fef8746061b683a09acbdb3e6a220083c0a9df6c,d852988eb75a64ab5c27fda007343cf4bd8ee8fb..3e0d321a86fe77aaa0eeb9b8cb3b38ccff87ef84
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,56 +1,65 @@@
- grub2 (2.12-9+rpi1) trixie-staging; urgency=medium
++grub2 (2.14~git20250718.0e36779-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 2.12-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 28 Jul 2024 22:42:11 +0000]
 +  * Treat system as Debian, since we don't have any specific config for
 +    raspbian.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Aug 2025 21:11:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 01 Feb 2026 12:27:55 +0000
++
+ grub2 (2.14~git20250718.0e36779-2) unstable; urgency=medium
+ 
+   [ Mate Kukri ]
+   * Fix upstream typo in bash-completion Makefile
+   * Bash-completions no longer live in one file, remove symlinks
+   * d/control: Re-add grub-common as dummy transitional package (LP: #2122124)
+ 
+   [ Julian Andres Klode ]
+   * Upload to unstable
+ 
+  -- Julian Andres Klode <jak@debian.org>  Sun, 02 Nov 2025 12:08:11 +0100
+ 
+ grub2 (2.14~git20250718.0e36779-1) experimental; urgency=medium
+ 
+   [ Mate Kukri ]
+   * Import git snapshot of upcoming GRUB 2.14 upstream release
+   * d/patches: rebase patches for 2.14 git snapshot
+   * d/rules: add erofs_test to XFAIL test
+   * peimage: add NX support, fix some bugs (LP: #2104316)
+   * Fix ipconfig2 route table parsing (LP: #2088181)
+ 
+   [ Luca Boccassi ]
+   * efi images: enable 'bli' module
+ 
+   [ Graham Inggs ]
+   * debian/control: mark qemu-system build-dependency <!nocheck>
+ 
+   [ Pascal Hambourg ]
+   * debian/grub.d/05_debian_theme: quote background image pathname in output
+ 
+   [ Mate Kukri ]
+   * Resolve zfs root identification (Closes: #848945)
+   * Check out missing distfiles from upstream git branch
+   * d/build-efi-images: Remove filesystems no longer allowed under lockdown
+   * debian: Remove references to dead ports kfreebsd-* and kopensolaris-*
+   * d/control: Sync dependencies of grub-efi-{riscv64,loong64} with grub-efi-*
+   * d/control: Clean up package relations
+   * debian: Tanglu is a dead distro, drop references to it
+   * debian: Get rid of non-systemd init scripts
+   * debian: Merge grub-common into grub2-common
+   * debian: Get rid of update-grub script for grub-legacy
+   * debian: Remove support for the yeeloong target
+   * Remove support for WUBI (Windows Based Ubuntu Installer)
+   * debian/patches: Drop a number of obsolete patches
+   * Add "noescape" argument to cmdline creation (LP: #2112179)
+   * d/control: Cleanup more package relations
+   * Remove IA64 support
+   * Remove old maintscripts
+   * d/postinst.in: remove grub legacy related functionality
+   * Add Provides grub-common to merged grub2-common
+   * Update Debian specific SBAT line to grub.debian14 for forky
+ 
+  -- Mate Kukri <mate.kukri@canonical.com>  Tue, 12 Aug 2025 11:51:55 +0100
  
  grub2 (2.12-9) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge