Merge version 3.1.1.real-4+rpi1 and 3.1.1.real-7 to produce 3.1.1.real-7+rpi1

diff --cc debian/changelog
index 4cd50a2a77e75fdb63f780a37233c5bc488cacd7,ae6ab8f7a3ce0c72fbdac20a3fa4fd205c44a399..6e7b3fc12c7adf9c3960c90bfcfdc7c11c4975a9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,24 +1,32 @@@
- openmpi (3.1.1.real-4+rpi1) buster-staging; urgency=medium
++openmpi (3.1.1.real-7+rpi1) buster-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, 26 Jul 2018 13:20:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Aug 2018 17:48:56 +0000
++
+ openmpi (3.1.1.real-7) unstable; urgency=medium
+ 
+   * Patch from upstream for OMPI/PMIX hang. Closes: #906118
+   * Change openmpi-common to Arch: all
+   * Standards-VersioN: 4.2.0
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sun, 19 Aug 2018 19:06:13 +0100
+ 
+ openmpi (3.1.1.real-6) unstable; urgency=medium
+ 
+   * Typo on d/control Breaks. pmix-dev -> pmix2
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Thu, 09 Aug 2018 15:02:02 +0100
+ 
+ openmpi (3.1.1.real-5) unstable; urgency=medium
+ 
+   * Include zlib1g-dev to build against
+   * Use internal libpmix, libevent to fix hang on MPI_Abort. 
+     Closes: #904825.
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Thu, 09 Aug 2018 12:55:50 +0100
  
  openmpi (3.1.1.real-4) unstable; urgency=medium
  

diff --cc debian/patches/series
index 7798506a2508ed8e1ef21c74fd220e6c07a4d56d,3b4ae91f7bd483552c1147f3769769558cfec080..8a85bc19bfd02541b2099ff9fa3247e1d87dbf17
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -8,5 -8,5 +8,6 @@@ opal_fifo.patc
  verbose-ompi-rules.patch
  openjdk10.patch
  fix-underlinking.patch
- force-pmix-3.patch
+ # force-pmix-3.patch
+ hang-fix.patch
 +raspbian.diff

diff --cc debian/rules
Simple merge