diff -Nru glibc-2.31/debian/changelog glibc-2.31/debian/changelog
--- glibc-2.31/debian/changelog	2022-03-17 21:37:00.000000000 +0000
+++ glibc-2.31/debian/changelog	2022-03-29 22:11:31.000000000 +0000
@@ -1,3 +1,20 @@
+glibc (2.31-13+rpi1+deb11u3) 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.
+
+  [changes introduced in 2.31-13+rpi1+deb11u3 by Peter Michael Green]
+  * Change mode on sysdeps/x86_64/configure to 644, same dgit issue
+    as above.
+ 
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 29 Mar 2022 22:11:31 +0000
+
 glibc (2.31-13+deb11u3) bullseye; urgency=medium
 
   [ Aurelien Jarno ]
diff -Nru glibc-2.31/debian/patches/git-updates.diff glibc-2.31/debian/patches/git-updates.diff
--- glibc-2.31/debian/patches/git-updates.diff	2022-03-17 21:32:12.000000000 +0000
+++ glibc-2.31/debian/patches/git-updates.diff	2022-03-29 22:11:31.000000000 +0000
@@ -9134,8 +9134,6 @@
 @@ -0,0 +1 @@
 +#include <setjmp/tst-setjmp.c>
 diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure
-old mode 100644
-new mode 100755
 index 84f82c2406..fc1840e23f
 --- a/sysdeps/x86_64/configure
 +++ b/sysdeps/x86_64/configure
diff -Nru glibc-2.31/debian/rules glibc-2.31/debian/rules
--- glibc-2.31/debian/rules	2022-03-17 21:32:12.000000000 +0000
+++ glibc-2.31/debian/rules	2022-03-29 22:11:31.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.