Merge version 2.1.0+dfsg-3+rpi1 and 2.1.0+dfsg-4 to produce 2.1.0+dfsg-4+rpi1

diff --cc debian/changelog
index dbeabb485fd939f292d1542c20e3305f9b9501b9,75a69249d6353b5d643e640c99999ba25895db92..186b22536c4ca11666760794ed4ae381eb5490f5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- hwloc (2.1.0+dfsg-3+rpi1) bullseye-staging; urgency=medium
++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>  Mon, 06 Jan 2020 23:13:53 +0000
++ -- 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 ]
+   * control: Drop libibverbs-dev build-dependency, only a test needs it, and
+     buildd box most probably don't have ibv set up anyway (Closes: Bug#950067)
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Tue, 03 Mar 2020 12:32:28 +0100
  
  hwloc (2.1.0+dfsg-3) unstable; urgency=medium