Merge version 1.11.11-1+rpi1 and 1.11.11-2 to produce 1.11.11-2+rpi1

diff --cc debian/changelog
index 64c4577bf127132157733d1fde20b8dedbfd02da,d24121b6460d38b612f54a4960b16cbc30398c30..b98ab32dbb770745f5f93190a7383baf92f8f146
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- hwloc (1.11.11-1+rpi1) buster-staging; urgency=medium
++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>  Tue, 18 Sep 2018 12:56:40 +0000
++ -- 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).
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Sat, 22 Sep 2018 11:12:43 +0200
  
  hwloc (1.11.11-1) unstable; urgency=medium