Merge PR #24098 into master

* refs/pull/24098/head:
	Rename "include/assert.h"

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

diff --cc src/client/Client.cc
Simple merge

diff --cc src/common/buffer.cc
Simple merge

diff --cc src/include/buffer.h
Simple merge

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/Server.cc
Simple merge

diff --cc src/mon/AuthMonitor.cc
Simple merge

diff --cc src/mon/MonCap.cc
Simple merge

diff --cc src/msg/async/dpdk/DPDKStack.cc
Simple merge

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

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

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

diff --cc src/test/librados_test_stub/LibradosTestStub.cc
Simple merge

diff --cc src/test/rbd_mirror/test_mock_fixture.h
Simple merge

diff --cc src/tools/rbd/action/MirrorPool.cc
index 80b3c960f159a2a2256da7fde8727c8d1ead75f5,8044816b8660f4ff90949062ded0e2d465b048f1..db33a20e50cf4a3ed7d32d33df3a4f1d03a1baf3
--- 1/src/tools/rbd/action/MirrorPool.cc
--- 2/src/tools/rbd/action/MirrorPool.cc
+++ b/src/tools/rbd/action/MirrorPool.cc
@@@ -19,9 -17,8 +19,9 @@@
  #include <functional>
  #include <iostream>
  #include <regex>
 +#include <set>
  #include <boost/program_options.hpp>
- #include "include/assert.h"
+ #include "include/ceph_assert.h"
  
  #include <atomic>
  

diff --cc src/tools/rbd_mirror/PoolWatcher.h
index c45e1bcf03f402434e00d5a40f0068109226df8c,c9c17ff66f03619aa6de5da3d5ded89d41488aeb..1136a319fcada93d574f8329f35aa004bb6add5a
--- 1/src/tools/rbd_mirror/PoolWatcher.h
--- 2/src/tools/rbd_mirror/PoolWatcher.h
+++ b/src/tools/rbd_mirror/PoolWatcher.h
@@@ -13,10 -13,10 +13,10 @@@
  #include "common/ceph_context.h"
  #include "common/Mutex.h"
  #include "include/rados/librados.hpp"
 -#include "types.h"
 +#include "tools/rbd_mirror/Types.h"
  #include <boost/functional/hash.hpp>
  #include <boost/optional.hpp>
- #include "include/assert.h"
+ #include "include/ceph_assert.h"
  #include "tools/rbd_mirror/pool_watcher/Types.h"
  
  namespace librbd { struct ImageCtx; }