Manual merge of version 3.17.2-1+rpi1 and 3.17.2-2 to produce 3.17.2-2+rpi1

diff --cc debian/changelog
index e548218ac36e1c9d78105d0e1618f1bf4a1d3d79,0430c95724257b45337fdcf461fdde91d394d0f6..19de5dbd43a35c71bc41ac1d70c0a8551b59b933
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,16 +1,23 @@@
- fuse3 (3.17.2-1+rpi1) trixie-staging; urgency=medium
++fuse3 (3.17.2-2+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 3.17.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 16 May 2025 19:59:04 +0000]
 +  * Link with libatomic on raspbian too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 16 May 2025 19:59:04 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 03 Jun 2025 11:23:19 +0000
++
+ fuse3 (3.17.2-2) unstable; urgency=medium
+ 
+   [ Laszlo Boszormenyi (GCS) ]
+   * Backport upstream fixes (closes: #1101305):
+     - make conn->want/want_ext conversion non fatal,
+     - add container_of and ROUND_UP macros,
+     - conn->want conversion: fix fuse_apply_conn_info_opts() .
+   * Update symbols file (closes: #1105099).
+ 
+   [ Helmut Grohne <helmut@subdivi.de> ]
+   * Update -latomic architecture list (closes: #1105150).
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Mon, 19 May 2025 20:39:08 +0200
  
  fuse3 (3.17.2-1) unstable; urgency=medium
  

diff --cc debian/rules
index 0a0b24cc959a01da7d1afd96a2323c3947835a76,fcac03136ac8e89136b964f2736b01dc92477a73..ca9a8bba4b9f8db115542f17ceb63c740d24d63a
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -10,7 -10,7 +10,7 @@@ include /usr/share/dpkg/architecture.m
  
  export DEB_BUILD_MAINT_OPTIONS = hardening=+all
  
- ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel m68k powerpc))
 -ifneq (,$(filter $(DEB_HOST_ARCH), arc armel m68k mips mipsel powerpc sh3 sh4 sparc))
++ifneq (,$(filter $(DEB_HOST_ARCH), arc armel armhf m68k mips mipsel powerpc sh3 sh4 sparc))
     export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -latomic
  endif