diff -Nru hwloc-1.11.12/debian/changelog hwloc-1.11.12/debian/changelog
--- hwloc-1.11.12/debian/changelog	2018-12-14 15:19:49.000000000 +0000
+++ hwloc-1.11.12/debian/changelog	2018-12-20 06:10:04.000000000 +0000
@@ -1,3 +1,10 @@
+hwloc (1.11.12-1+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, 20 Dec 2018 06:10:04 +0000
+
 hwloc (1.11.12-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru hwloc-1.11.12/debian/rules hwloc-1.11.12/debian/rules
--- hwloc-1.11.12/debian/rules	2018-12-14 15:14:25.000000000 +0000
+++ hwloc-1.11.12/debian/rules	2018-12-20 06:10:03.000000000 +0000
@@ -25,3 +25,6 @@
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V
+
+override_dh_auto_test:
+	echo testsuite disabled