diff -Nru hwloc-2.1.0+dfsg/debian/changelog hwloc-2.1.0+dfsg/debian/changelog
--- hwloc-2.1.0+dfsg/debian/changelog	2020-03-03 11:32:28.000000000 +0000
+++ hwloc-2.1.0+dfsg/debian/changelog	2020-03-05 11:56:01.000000000 +0000
@@ -1,3 +1,10 @@
+hwloc (2.1.0+dfsg-4+rpi1) bullseye-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, 05 Mar 2020 11:56:01 +0000
+
 hwloc (2.1.0+dfsg-4) unstable; urgency=medium
 
   [ Steve Langasek ]
diff -Nru hwloc-2.1.0+dfsg/debian/rules hwloc-2.1.0+dfsg/debian/rules
--- hwloc-2.1.0+dfsg/debian/rules	2020-01-01 14:11:18.000000000 +0000
+++ hwloc-2.1.0+dfsg/debian/rules	2020-03-05 11:56:01.000000000 +0000
@@ -18,5 +18,5 @@
 	dh_makeshlibs -V
 
 override_dh_auto_test:
-	HWLOC_TEST_DONTCHECK_PROC_CPULOCATION=1 dh_auto_test -- -k || \
-		( cat $$(find . -name \*.log) ; false )
+	#HWLOC_TEST_DONTCHECK_PROC_CPULOCATION=1 dh_auto_test -- -k || \
+	#	( cat $$(find . -name \*.log) ; false )