Patches applied successfully (
tree,
apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210401112223.55711-1-pbonzini@redhat.com
Maintainers: "Daniel P. Berrangé" <berrange@redhat.com>, Eric Blake <eblake@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>, Markus Armbruster <armbru@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>, Taylor Simpson <tsimpson@quicinc.com>, Stafford Horne <shorne@gmail.com>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>
configure | 2 +-
docs/devel/code-of-conduct.rst | 60 ++++++++++++++++++++++++++++
docs/devel/conflict-resolution.rst | 80 ++++++++++++++++++++++++++++++++++++++
docs/devel/index.rst | 2 +
migration/meson.build | 2 +-
qapi/qom.json | 10 ++---
qom/object_interfaces.c | 1 -
replay/replay-events.c | 2 +
replay/replay.c | 11 +++---
softmmu/cpu-timers.c | 5 ++-
softmmu/icount.c | 9 ++---
softmmu/timers-state.h | 2 +
target/hexagon/meson.build | 36 ++++++-----------
target/i386/tcg/translate.c | 6 +++
target/openrisc/translate.c | 15 +++++++
15 files changed, 197 insertions(+), 46 deletions(-)
create mode 100644 docs/devel/code-of-conduct.rst
create mode 100644 docs/devel/conflict-resolution.rst