Merge version 1.21.6-1+rpi1 and 1.21.7-2 to produce 1.21.7-2+rpi1

diff --cc debian/changelog
index e142ab22a3f6b1c0772a5d59d616b6f60ee40bac,c759b5bb3de7179a98a8ffcf3cf2f455c0a16330..4992c353e58a200092af962011da162dac79b5e8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- golang-1.21 (1.21.6-1+rpi1) trixie-staging; urgency=medium
++golang-1.21 (1.21.7-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.21.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Oct 2023 14:01:26 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 20 Jan 2024 01:01:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 08 Mar 2024 11:41:04 +0000
++
+ golang-1.21 (1.21.7-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Skip flaky TestCrashDumpsAllThreads on mips64le
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Mon, 26 Feb 2024 17:13:31 +0800
+ 
+ golang-1.21 (1.21.7-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 1.21.7
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Wed, 21 Feb 2024 16:35:15 +0800
  
  golang-1.21 (1.21.6-1) unstable; urgency=medium