Merge tag 'v9.2.0'

v9.2.0

diff --cc ceph.spec.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc doc/release-notes.rst
Simple merge

diff --cc src/init-rbdmap
index bb2bf2d7e641053d124b7433afe574854435bfbe,bad2754fa535255461af9f70f5476762b9752377..8650ed4cd3a5f71c5c019fec0cdef337842ec1a6
--- 1/src/init-rbdmap
--- 2/src/init-rbdmap
+++ b/src/init-rbdmap
@@@ -42,13 -43,11 +43,12 @@@ do_map() 
                        DEV=rbd/$DEV
                        ;;
                esac
-               log_action_begin_msg "${DESC} '${DEV}'"
+               logger -p "daemon.debug" -t init-rbdmap "Mapping '${DEV}'"
                newrbd=""
                MAP_RV=""
-               RET_OP=0
                OIFS=$IFS
                IFS=','
 +              CMDPARAMS=""
                for PARAM in ${PARAMS[@]}; do
                        CMDPARAMS="$CMDPARAMS --$(echo $PARAM | tr '=' ' ')"
                done

diff --cc src/os/FileStore.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge

diff --cc src/tools/ceph_objectstore_tool.cc
Simple merge