Merge version 2021.01+dfsg-5+rpi1+deb11u1 and 2021.01+dfsg-5+deb11u2 to produce 2021...

diff --cc debian/changelog
index 0f1f32073a49261d3b0aa3e3fb2cab20ca75cf21,7c0857293811136fbfed2513fe37ffe65aa696a5..e7849bfb821a4d3324ba074c70a1c92bc2ff267b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,15 +1,26 @@@
- u-boot (2021.01+dfsg-5+rpi1+deb11u1) bullseye-staging; urgency=medium
++u-boot (2021.01+dfsg-5+rpi1+deb11u2) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2014.10+dfsg1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 06:00:07 +0000]
 +  * Don't build versions for various armv7 devices, build rpi version instead.
 +
 +  [changes introduced in 2021.01+dfsg-4+rpi1 by Peter Michael Green]
 +  * Don't build powerpc targets for qemu, my attempts to build the nessacery
 +    cross-compiler in raspbian failed.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 04 May 2025 21:27:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Oct 2025 20:02:32 +0000
++
+ u-boot (2021.01+dfsg-5+deb11u2) bullseye-security; urgency=medium
+ 
+   * Non-maintainer upload by the Debian LTS team.
+   * d/patches/CVE-2021-27097-1.patch, d/patches/CVE-2021-27097-2.patch,
+     d/patches/CVE-2021-27097-3.patch, d/patches/CVE-2021-27097-4.patch: Add
+     patches to fix CVE-2021-27097.
+     - Fix mishandling of a modified FIT (closes: #983270).
+   * d/patches/CVE-2021-27138-1.patch, d/patches/CVE-2021-27138-2.patch: Add
+     patches to fix CVE-2021-27138.
+     - Fix mishandled use of unit addresses in a FIT (closes: #983269).
+ 
+  -- Daniel Leidert <dleidert@debian.org>  Sun, 29 Jun 2025 02:33:57 +0200
  
  u-boot (2021.01+dfsg-5+deb11u1) bullseye-security; urgency=medium