Merge version 3.1.2-4+rpi1 and 3.1.2-6 to produce 3.1.2-6+rpi1

diff --cc debian/changelog
index 91a3011c8d394a7d8248c8931b79ebd1cb4597c1,6884740183cfd04f1d7e52ba5e14a47a8f73d471..14de3cb2f134d54868998cee7cd6614be283843c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,18 +1,26 @@@
- openmpi (3.1.2-4+rpi1) buster-staging; urgency=medium
++openmpi (3.1.2-6+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, 23 Sep 2018 15:56:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 14 Oct 2018 08:34:49 +0000
++
+ openmpi (3.1.2-6) unstable; urgency=medium
+ 
+   * Fixes for regression (segfaults in liggghts, etc) due to btl patch.
+     Closes: #905418, #910263
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 08 Oct 2018 11:44:08 +0100
+ 
+ openmpi (3.1.2-5) unstable; urgency=medium
+ 
+   * Fx by Nathan Hjelm for hangs on archs with 32-bit atomics tags
+     Closes: #905418, #907267, #907407
+   * make openmpi-bin depend on libopenmpi-dev, as its needed for mpicc,etc.
+   * Drop link-libfabric.patch as obsolete
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 03 Oct 2018 13:15:03 +0100
  
  openmpi (3.1.2-4) unstable; urgency=medium
  

diff --cc debian/patches/series
index 4da8366ce01df77d64d601d27b635810fba046c9,8d94354f267424461dbe0211ec5baeba70124c5a..d91658e4c6a233647312cb45cf54e7f2d9ce8af9
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -8,5 -7,4 +7,5 @@@ opal_fifo.patc
  verbose-ompi-rules.patch
  openjdk10.patch
  fix-underlinking.patch
- # force-pmix-3.patch
+ btl.patch
 +raspbian.diff