diff -Nru glibc-2.31/debian/changelog glibc-2.31/debian/changelog
--- glibc-2.31/debian/changelog	2021-05-01 20:56:06.000000000 +0000
+++ glibc-2.31/debian/changelog	2021-05-27 20:01:29.000000000 +0000
@@ -1,3 +1,16 @@
+glibc (2.31-12+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 2.25-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 29 Nov 2017 03:00:21 +0000]
+  * Disable testsuite.
+
+  [changes introduced in 2.29-9+rpi1 by Peter Michale Green]
+  * Change mode on scripts/check-obsolete-constructs.py to 644, 
+    dgit does not like mode 755 files created by patches and the
+    script does not seem to be used for anything in the Debian
+    package.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 27 May 2021 20:01:29 +0000
+
 glibc (2.31-12) unstable; urgency=medium
 
   * debian/po/de.po: fix encoding declaration.  Closes: #986450.
diff -Nru glibc-2.31/debian/rules glibc-2.31/debian/rules
--- glibc-2.31/debian/rules	2021-01-03 16:11:31.000000000 +0000
+++ glibc-2.31/debian/rules	2021-05-27 20:01:29.000000000 +0000
@@ -97,7 +97,7 @@
 BASE_MIG = mig
 DEB_GCC_VERSION ?= -10
 
-RUN_TESTSUITE = yes
+RUN_TESTSUITE = no
 TIMEOUTFACTOR = 25
 
 # Set cross and native compiler names, including version.