diff -Nru binutils-2.31.1/debian/changelog binutils-2.31.1/debian/changelog
--- binutils-2.31.1/debian/changelog	2018-12-14 19:22:21.000000000 +0000
+++ binutils-2.31.1/debian/changelog	2018-12-17 14:17:10.000000000 +0000
@@ -1,3 +1,10 @@
+binutils (2.31.1-11+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
+  * Disable testsuite, it fails on our lxc based autobuilders.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 17 Dec 2018 14:17:10 +0000
+
 binutils (2.31.1-11) unstable; urgency=medium
 
   * Snapshot, taken from the 2.31 branch (20181214).
diff -Nru binutils-2.31.1/debian/rules binutils-2.31.1/debian/rules
--- binutils-2.31.1/debian/rules	2018-09-19 11:56:27.000000000 +0000
+++ binutils-2.31.1/debian/rules	2018-12-17 14:17:09.000000000 +0000
@@ -512,7 +512,7 @@
 
 CONFARGS_TARGET_aarch64		= --enable-targets=aarch64_be-linux-gnu
 
-with_check := yes
+with_check := disabled by plugwash
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
   # override buildd admins to run the testsuite anyway ...
   ifeq (,$(filter $(DEB_HOST_ARCH), m68k powerpcspe sh4))