Merge version 3.1.0-6+rpi1 and 3.1.0-7 to produce 3.1.0-7+rpi1

diff --cc debian/changelog
index 97f8cb522a0c6204e85488fc7bffca4d87becb9a,10529a0a8caee018a73dae84c38e377f871d6c78..a079fb718f8e6ea98ba31f37eb3e0b504587687c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- openmpi (3.1.0-6+rpi1) buster-staging; urgency=medium
++openmpi (3.1.0-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>  Sun, 03 Jun 2018 23:43:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jun 2018 18:27:04 +0000
++
+ openmpi (3.1.0-7) unstable; urgency=medium
+ 
+   * Enable libpsm2.  Closes: #901132
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sat, 09 Jun 2018 13:36:15 +0100
  
  openmpi (3.1.0-6) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge