Merge version 16.2.9+ds-1+rpi1 and 16.2.10+ds-2 to produce 16.2.10+ds-2+rpi1

diff --cc debian/changelog
index 61b3448cd7a2f26ccbdd7079794182367622014f,84c571724e241fab69eb994307ae80380e08e0d5..272a600f785681277141f921eefe2f19e171861a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,23 +1,36 @@@
- ceph (16.2.9+ds-1+rpi1) bookworm-staging; urgency=medium
++ceph (16.2.10+ds-2+rpi1) bookworm-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>  Sat, 23 Jul 2022 15:22:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Aug 2022 17:43:48 +0000
++
+ ceph (16.2.10+ds-2) unstable; urgency=medium
+ 
+   * Replace Fix-build-with-fmt-8.1.1.patch by Fix-build-with-fmt-8-9.patch
+     thanks to Shengjing Zhu <zhushengjing@cambricon.com> (Closes: #1014549).
+ 
+  -- Thomas Goirand <zigo@debian.org>  Sun, 31 Jul 2022 21:59:55 +0200
+ 
+ ceph (16.2.10+ds-1) unstable; urgency=high
+ 
+   * New upstream hotfix release:
+     - CVE-2022-0670: Users who were running OpenStack Manila to export native
+       CephFS, who upgraded their Ceph cluster from Nautilus (or earlier) to a
+       later major version, were vulnerable to an attack by malicious users
+       (Closes: #1016069).
+     - A regression made it possible to dereference a null pointer for for
+       s3website requests that don’t refer to a bucket resulting in an RGW
+       segfault.
+   * Add fix-FTBFS-include-memory.h.patch to address FTBFS under GCC 12.
+ 
+  -- Thomas Goirand <zigo@debian.org>  Wed, 27 Jul 2022 09:30:47 +0200
  
  ceph (16.2.9+ds-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 8a75ca8a66af4ff2875c87aa329df043904bcf80,37f0a389f955ecddb4ebc128f84bba485ed9a42f..dd98f4dc98ccd7cbad772fea003479e7c5399195
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -18,6 -18,5 +18,7 @@@ bug1914584.patc
  bug1917414.patch
  cmake-test-for-16-bytes-atomic-support-on-mips-also.patch
  only-yied-under-armv7-and-above.patch
- fix-build-with-fmt-8.1.1.patch
+ Fix-build-with-fmt-8-9.patch
+ fix-FTBFS-include-memory.h.patch
 +detect-raspbian.diff
 +remove-problematic-gitattributes-files.patch

diff --cc debian/rules
Simple merge