Merge version 4.0.3-9+rpi1 and 4.0.4-1 to produce 4.0.4-1+rpi1

diff --cc debian/changelog
index 085d4e9771fb498c0623eb26b4aad9b16c141ca6,292b9b2f26f570a7305b132e0409e74d2d88fae1..9d259a535fe53f3ec952f2b1f598d9bcdc52fdd8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,23 @@@
- openmpi (4.0.3-9+rpi1) bullseye-staging; urgency=medium
++openmpi (4.0.4-1+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>  Thu, 18 Jun 2020 15:01:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 04 Jul 2020 02:50:33 +0000
++
+ openmpi (4.0.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Update libversions:
+     libmpi.so 40.20.3 -> 40.20.4
+     libopen-pal.so 40.20.3 -> 40.20.4
+     libopen-rte.so 40.20.3 -> 40.20.4
+     libmpi_usempif08: 40.21.0 -> 40.21.1
+   * Updated build config for ia64, thanks to John Paul Adrian Glaubitz.
+     Closes: #963729
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Thu, 02 Jul 2020 08:42:05 +0100
  
  openmpi (4.0.3-9) unstable; urgency=medium
  

diff --cc debian/patches/series
index 50b1f7a5fac44c5f3508399f4aa5422dd9861ee8,6599071e4a5d6f813a3628a5e5b6a9bfea2e66ed..2b929e8006f0645a6f433941016aa71b209d3e9d
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -10,4 -10,4 +10,5 @@@ fix-underlinking.patc
  #version-script.patch
  no-warning-unused.patch
  use-openib.patch
+ ia64.patch
 +raspbian.diff

diff --cc debian/rules
Simple merge