Merge branch 'wip-spdk' of git://github.com/yuyuyu101/ceph

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/kv/RocksDBStore.cc
Simple merge

diff --cc src/os/bluestore/BlockDevice.h
Simple merge

diff --cc src/os/bluestore/BlueFS.cc
Simple merge

diff --cc src/os/bluestore/BlueStore.cc
Simple merge

diff --cc src/os/bluestore/BlueStore.h
index 1c4fdc48bd964d0c1664bada5d9ec06c12b495fa,728201f51f1dad6baac189fd9b8d5205ac1c81ef..edb817c7c3c2487a53c4a609c10942525ed534d2
--- 1/src/os/bluestore/BlueStore.h
--- 2/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@@ -296,7 -322,9 +322,9 @@@ public
  
      CollectionRef first_collection;  ///< first referenced collection
  
 -    TransContext(OpSequencer *o)
+     utime_t start;
+ 
 +    explicit TransContext(OpSequencer *o)
        : state(STATE_PREPARE),
        osr(o),
        ops(0),