Merge remote-tracking branch 'upstream/master' into wip-8438-master

Conflicts:
	src/osd/ECMsgTypes.cc

diff --cc src/messages/MOSDSubOp.h
Simple merge

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

diff --cc src/osd/ECMsgTypes.cc
index 47ef3533f33740c1e23ee42fe0f96e627f4206da,ad434b296c1b3c055e57cdfb08971681722abe22..282355fe21e34ca158e84762f469f073a9bcb5a9
--- 1/src/osd/ECMsgTypes.cc
--- 2/src/osd/ECMsgTypes.cc
+++ b/src/osd/ECMsgTypes.cc
@@@ -77,9 -70,8 +77,9 @@@ void ECSubWrite::dump(Formatter *f) con
    f->dump_stream("reqid") << reqid;
    f->dump_stream("at_version") << at_version;
    f->dump_stream("trim_to") << trim_to;
-   f->dump_stream("has_updated_hit_set_history")
-     << static_cast<bool>(updated_hit_set_history);
 +  f->dump_stream("trim_rollback_to") << trim_rollback_to;
+   f->dump_bool("has_updated_hit_set_history",
+       static_cast<bool>(updated_hit_set_history));
  }
  
  void ECSubWrite::generate_test_instances(list<ECSubWrite*> &o)

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

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

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

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

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

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

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

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

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