Merge version 2.12-9+rpi1+deb13u1 and 2.12-9+deb13u2 to produce 2.12-9+rpi1+deb13u2

diff --cc debian/changelog
index c172cc73ab07b24b1525eb7c592a4f130f933f99,71aed466923ddcc0e214be7c01a25b62f8995391..77b6b16ee3453b70c2428327400979f272e926f3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,19 @@@
- grub2 (2.12-9+rpi1+deb13u1) trixie-staging; urgency=medium
++grub2 (2.12-9+rpi1+deb13u2) trixie-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>  Wed, 18 Mar 2026 05:28:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 21 May 2026 04:58:28 +0000
++
+ grub2 (2.12-9+deb13u2) trixie; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Apply patch from upstream to fix an illegal instruction on riscv64 in
+     grub.efi (Closes: #1108898)
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Thu, 30 Apr 2026 21:02:01 +0200
  
  grub2 (2.12-9+deb13u1) trixie; urgency=medium