Merge version 4.0.5-7+rpi1 and 4.1.0-7 to produce 4.1.0-7+rpi1

diff --cc config/opal_config_asm.m4
Simple merge

diff --cc debian/changelog
index 9e0c98bb2336f64414047f6ad23a7dc926f2b911,5c0469c037efc212e9c670dec57d720907cf7dc4..df3ef6dc854bcdd4fae722ac23dc2a3eafc9baf2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,62 +1,70 @@@
- openmpi (4.0.5-7+rpi1) bullseye-staging; urgency=medium
++openmpi (4.1.0-7+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>  Sun, 18 Oct 2020 12:36:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Jan 2021 23:29:37 +0000
++
+ openmpi (4.1.0-7) unstable; urgency=medium
+ 
+   * Also disable ofi BTL to avoid libfabric issues
+     (user can re-enable on systems with RDMA hardware)
+     Closes: #979041
+   * Backport grequest fix from 4.1.x. Closes: #979480
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 20 Jan 2021 17:22:18 +0000
+ 
+ openmpi (4.1.0-6) unstable; urgency=medium
+ 
+   * Disable UCX by default to avoid spurious errors on systems
+     without rdmacm hardware. Closes: #90033
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Thu, 14 Jan 2021 11:43:39 +0000
+ 
+ openmpi (4.1.0-5) unstable; urgency=medium
+ 
+   * libfabric-dev now available on all bar hurd, kfreebsd
+   * libnuma-dev now available on all bar hurd, kfreebsd
+   * Exclude openib by default, update README.Debian to explain.
+   * Patch to detect pmix 4.  Closes: #979041
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sat, 09 Jan 2021 19:42:23 +0000
+ 
+ openmpi (4.1.0-4) unstable; urgency=mediuzm
+ 
+   * Rename some scripts to drop language suffix
+     - aggregate_profile.pl -> aggregate_profile
+     - profile2mat.pl -> profile2man
+   * Drop dependencies on libpmix* as we use the internal version
+   * Fix for missing plugin mca_op_avx.so. Closes: #979041, #978496
+   * Update shymlink to jquery.js for version number change
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sun, 03 Jan 2021 22:22:09 +0000
+ 
+ openmpi (4.1.0-3) unstable; urgency=medium
+ 
+   * Set -latomic on some archs for pmix
+   * Fix overreaching find in d/rules
+   * Make install of shmemc++.1 conditional
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 28 Dec 2020 17:17:04 +0000
+ 
+ openmpi (4.1.0-2) unstable; urgency=medium
+ 
+   * Update d/watch file
+   * Use internal pmix until pmix 4.0 supported.
+     Closes: #978022,  #978308, #978203, #978066
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sun, 27 Dec 2020 14:38:05 +0000
+ 
+ openmpi (4.1.0-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - minor lib versions updated to 40.30.0
+   * Standards-Version: 4.5.1
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 21 Dec 2020 10:56:34 +0000
  
  openmpi (4.0.5-7) unstable; urgency=medium
  

diff --cc debian/patches/series
index 70aaa0437a47e22ad7c28e72d067bf93b6d0e300,43c80428140386b7cbbbc3893685be9b2e047767..af933d2fc838298964a5ab15fb3199b13cef0449
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -9,6 -9,7 +9,8 @@@ verbose-ompi-rules.patc
  fix-underlinking.patch
  #version-script.patch
  no-warning-unused.patch
- # use-openib.patch
  ia64.patch
+ missing-symbol.patch
+ external-pmix-fix.patch
+ grequest-fix.patch
 +raspbian.diff

diff --cc debian/rules
Simple merge