diff -Nru hwloc-1.11.11/debian/changelog hwloc-1.11.11/debian/changelog
--- hwloc-1.11.11/debian/changelog	2018-09-22 09:12:43.000000000 +0000
+++ hwloc-1.11.11/debian/changelog	2018-09-27 14:41:09.000000000 +0000
@@ -1,3 +1,10 @@
+hwloc (1.11.11-2+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 1.11.8-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 17 Sep 2017 01:56:00 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 27 Sep 2018 14:41:09 +0000
+
 hwloc (1.11.11-2) unstable; urgency=medium
 
   * debian/tests/test-util: Automatically get hwloc version (Closes: #908100).
diff -Nru hwloc-1.11.11/debian/rules hwloc-1.11.11/debian/rules
--- hwloc-1.11.11/debian/rules	2018-09-22 09:06:28.000000000 +0000
+++ hwloc-1.11.11/debian/rules	2018-09-27 14:41:09.000000000 +0000
@@ -25,3 +25,6 @@
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V
+
+override_dh_auto_test:
+	echo testsuite disabled