Merge version 4.0.3-8+rpi1 and 4.0.3-9 to produce 4.0.3-9+rpi1

diff --cc debian/changelog
index 2802c965431c42ace4a3c2114336931fcfbdd83c,a8cc629e04fd927514511900360ae9fa0ee2f703..085d4e9771fb498c0623eb26b4aad9b16c141ca6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- openmpi (4.0.3-8+rpi1) bullseye-staging; urgency=medium
++openmpi (4.0.3-9+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.1.1-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Jul 2017 00:52:53 +0000]
 +  * Modify arm "detection" for Raspbian.
 +  * Partially fix clean target
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Jun 2020 23:43:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jun 2020 15:01:48 +0000
++
+ openmpi (4.0.3-9) unstable; urgency=medium
+ 
+   * Add config to use Infiniband on 4.0+. Closes: #962180
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 09 Jun 2020 17:09:51 +0100
  
  openmpi (4.0.3-8) unstable; urgency=medium
  

diff --cc debian/patches/series
index 0da1c8963a1b34975355adbf6ef98738e7d7936e,c2d1ffd527c2f5ee7b26a18866f864b74fe91a41..50b1f7a5fac44c5f3508399f4aa5422dd9861ee8
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -9,4 -9,4 +9,5 @@@ verbose-ompi-rules.patc
  fix-underlinking.patch
  #version-script.patch
  no-warning-unused.patch
+ use-openib.patch
 +raspbian.diff