(virtualenv)loic@fold:~/software/ceph/ceph-rw$ git reset --hard ceph/hammer

HEAD is now at e3d17e4 Merge pull request #5248 from ceph/wip-11833-hammer

(virtualenv)loic@fold:~/software/ceph/ceph-rw$ pr=5296 ; git --no-pager merge --no-ff -m "$(echo -e "Merge pull request #$pr: $title\n\nReviewed-by: $reviewer")" ceph/pull/$pr/head

Auto-merging src/librbd/internal.cc

Auto-merging src/librbd/ObjectMap.h

Merge made by the 'recursive' strategy.

configure.ac | 13 +++++

src/common/Makefile.am | 3 +-

src/common/Mutex.cc | 10 ++--

src/common/Mutex.h | 12 ++---

src/common/RWLock.h | 26 +++++----

src/common/WorkQueue.h | 23 ++++----

src/common/config_opts.h | 1 +

src/common/lockdep.cc | 79 ++++++++++++++++++++++------

src/common/lockdep.h | 3 +-

src/common/valgrind.h | 15 ++++++

src/librbd/AioCompletion.cc | 14 +++++

src/librbd/AioCompletion.h | 10 ++--

src/librbd/AioRequest.cc | 449 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------

src/librbd/AioRequest.h | 145 ++++++++++++++++++++++----------------------------

src/librbd/AsyncFlattenRequest.cc | 166 +++++++++++++++++++++++----------------------------------

src/librbd/AsyncObjectThrottle.cc | 24 ++++++---

src/librbd/AsyncObjectThrottle.h | 21 ++++----

src/librbd/AsyncRequest.cc | 5 ++

src/librbd/AsyncRequest.h | 2 +

src/librbd/AsyncResizeRequest.cc | 146 +++++++++++++++++++++------------------------------

src/librbd/AsyncTrimRequest.cc | 211 ++++++++++++++++++++++++++++++++-----------------------------------------

src/librbd/AsyncTrimRequest.h | 5 +-

src/librbd/CopyupRequest.cc | 119 +++++++++++++++++++++++------------------

src/librbd/CopyupRequest.h | 30 ++++++-----

src/librbd/ImageCtx.cc | 52 +++++++++---------

src/librbd/ImageCtx.h | 1 +

src/librbd/ImageWatcher.cc | 17 +++---

src/librbd/LibrbdWriteback.cc | 29 ++++------

src/librbd/LibrbdWriteback.h | 3 ++

src/librbd/ObjectMap.cc | 18 ++++---

src/librbd/ObjectMap.h | 2 +

src/librbd/internal.cc | 160 ++++++++++++++++++++++++++-----------------------------

src/librbd/internal.h | 3 +-

src/log/Log.cc | 4 ++

src/osdc/ObjectCacher.cc | 10 ++++

src/osdc/WritebackHandler.h | 3 ++

src/test/librados_test_stub/TestClassHandler.cc | 5 +-

src/test/librados_test_stub/TestIoCtxImpl.cc | 5 ++

src/test/librados_test_stub/TestMemRadosClient.cc | 1 +

src/test/librados_test_stub/TestWatchNotify.cc | 45 ++++++++++++----

src/test/librados_test_stub/TestWatchNotify.h | 4 ++

src/test/librbd/test_ImageWatcher.cc | 6 +--

src/test/librbd/test_main.cc | 2 +

43 files changed, 978 insertions(+), 924 deletions(-)

create mode 100644 src/common/valgrind.h

(virtualenv)loic@fold:~/software/ceph/ceph-rw$ pr=5319 ; git --no-pager merge --no-ff -m "$(echo -e "Merge pull request #$pr: $title\n\nReviewed-by: $reviewer")" ceph/pull/$pr/head

Auto-merging src/test/librbd/test_ImageWatcher.cc

Auto-merging src/test/librados_test_stub/TestWatchNotify.h

Auto-merging src/test/librados_test_stub/TestWatchNotify.cc

Auto-merging src/test/librados_test_stub/TestIoCtxImpl.cc

Auto-merging src/librbd/ImageWatcher.cc

CONFLICT (content): Merge conflict in src/librbd/ImageWatcher.cc

Auto-merging src/common/Mutex.cc

CONFLICT (content): Merge conflict in src/common/Mutex.cc

Automatic merge failed; fix conflicts and then commit the result.