Merge version 16.2.11+ds-2+rpi1 and 16.2.11+ds-3 to produce 16.2.11+ds-3+rpi1

diff --cc debian/changelog
index 3d9f2307cda733c58aef4ef11859f54efd61bb4f,622b54b4c89d34443f8a799070777faaf8edd0c4..94bf402641c42767a86ab0b3a2665281ce820895
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,13 +1,26 @@@
- ceph (16.2.11+ds-2+rpi1) bookworm-staging; urgency=medium
++ceph (16.2.11+ds-3+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Jul 2017 09:48:17 +0000]
 +  * Add Raspbian to lists of "debian-like" distros.
 +    + Hopefully this will fix site-packages vs dist-packages
 +      build failure in Raspbian.
 + 
 +  [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green]
 +  * Remove problematic gitattributes files.
 +  * Disable neon on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 26 Feb 2023 17:58:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 30 Sep 2023 07:16:59 +0000
++
+ ceph (16.2.11+ds-3) unstable; urgency=medium
+ 
+   * Fix gcc-13 FTBFS. (Closes: #1037602):
+     - fix-gcc-13-issue.patch (thanks to Bo YU).
+     - Add -fpermissive to DEB_CXXFLAGS_MAINT_APPEND.
+     - include-cstdint-in-subsys_types.h.patch.
+   * Fix debian/calc-max-parallel.sh to allow building on more core on
+     (very) big systems.
+ 
+  -- Thomas Goirand <zigo@debian.org>  Tue, 26 Sep 2023 09:41:32 +0200
  
  ceph (16.2.11+ds-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 0715d06eaa7bf80bee2589450b00f02bdb976005,686904b28a8d52098d33792b635b3fb450ed1741..80390093934bb0636bf52fc45c44ce1dc4bc166a
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -23,5 -23,5 +23,7 @@@ fix-CheckCxxAtomic-riscv64.patc
  CVE-2022-3650_1_ceph-crash_drop_privleges_to_run_as_ceph_user_rather_than_root.patch
  CVE-2022-3650_2_ceph-crash_fix_stderr_handling.patch
  CVE-2022-3854_1_rgw_Guard_against_malformed_bucket_URLs.patch
+ include-cstdint-in-subsys_types.h.patch
+ fix-gcc-13-issue.patch
 +detect-raspbian.diff
 +remove-problematic-gitattributes-files.patch

diff --cc debian/rules
Simple merge