The following changes since commit 6ee55e1d10c25c2f6bf5ce2084ad2327e17affa5:
Merge remote-tracking branch 'remotes/dg-gitlab/tags/ppc-for-6.0-20210331' into staging (2021-03-31 13:14:18 +0100) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 7dd6acc82fa6fbc2ff99f173635ac6be0c72b1eb: docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document (2021-04-01 10:37:20 +0200) ---------------------------------------------------------------- * Bugfixes * Code of conduct and conflict resolution policy ---------------------------------------------------------------- Jessica Clarke (1): meson: Propagate gnutls dependency to migration Miroslav Rezanina (1): configure: Do not use default_feature for EXESUF Paolo Bonzini (4): qapi: qom: do not use target-specific conditionals hexagon: do not specify executables as inputs hexagon: do not specify Python scripts as inputs docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document Pavel Dovgalyuk (4): replay: fix recursive checkpoints icount: get rid of static variable replay: notify CPU on event target/openrisc: fix icount handling for timer instructions Richard Henderson (1): target/i386: Verify memory operand for lcall and ljmp Thomas Huth (1): Revert "qom: use qemu_printf to print help for user-creatable objects" 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 -- 2.30.1
