From: Peter Maydell Date: Thu, 1 Apr 2021 12:35:36 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=00084bab87c43be20638de7f191d1a1faed134cc;p=qemu.git Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging * Bugfixes * Code of conduct and conflict resolution policy # gpg: Signature made Thu 01 Apr 2021 12:21:10 BST # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini " [full] # gpg: aka "Paolo Bonzini " [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document hexagon: do not specify Python scripts as inputs hexagon: do not specify executables as inputs configure: Do not use default_feature for EXESUF target/openrisc: fix icount handling for timer instructions replay: notify CPU on event icount: get rid of static variable Revert "qom: use qemu_printf to print help for user-creatable objects" replay: fix recursive checkpoints qapi: qom: do not use target-specific conditionals target/i386: Verify memory operand for lcall and ljmp meson: Propagate gnutls dependency to migration Signed-off-by: Peter Maydell --- 00084bab87c43be20638de7f191d1a1faed134cc