Merge version 4.1.4-3+rpi1 and 4.1.6-1 to produce 4.1.6-1+rpi1

diff --cc config/opal_config_asm.m4
Simple merge

diff --cc debian/changelog
index 65566205a4e2fe7d712bf08c4fb7354047526b5c,d1e39e32e68a63bc5e64fdfb0a40ead2a327af8f..02856d060a6f4d109d6da5866de5c0bcc09e7617
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,33 +1,41 @@@
- openmpi (4.1.4-3+rpi1) bookworm-staging; urgency=medium
++openmpi (4.1.6-1+rpi1) trixie-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>  Mon, 31 Oct 2022 01:54:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Oct 2023 23:44:39 +0000
++
+ openmpi (4.1.6-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Minor link change: libmpi.so.40.30.5 -> libmpi.so.40.30.6
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sun, 01 Oct 2023 13:00:06 +0100
+ 
+ openmpi (4.1.5-3) unstable; urgency=medium
+ 
+   * Rebuild against gcc-13. Closes: #1050031
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 21 Aug 2023 09:51:43 +0100
+ 
+ openmpi (4.1.5-2) unstable; urgency=medium
+ 
+   * Standards-Version: 4.6.2
+   * Push to unstable
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sun, 11 Jun 2023 12:13:42 +0100
+ 
+ openmpi (4.1.5-1) experimental; urgency=medium
+ 
+   * New upstream release
+   * Update links:
+     - libmpi.so.40.30.4 -> libmpi.so.40.30.5
+     - libopen-pal.so.40.30.2 -> libopen-pal.so.40.30.3
+     - libopen-rte.so.40.30.2 -> libopen-rte.so.40.30.3
+     - liboshmem.so.40.30.2 -> liboshmem.so.40.30.3
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Sat, 18 Mar 2023 10:06:21 +0000
  
  openmpi (4.1.4-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge