]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-06-13' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 14 Jun 2018 10:35:22 +0000 (11:35 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 14 Jun 2018 10:35:22 +0000 (11:35 +0100)
Miscellaneous patches for 2018-06-13

# gpg: Signature made Wed 13 Jun 2018 13:51:51 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2018-06-13:
  Purge uses of banned g_assert_FOO()
  coverity-model: replay data is considered trusted
  Revert "Makefile: add target to print generated files"

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
Makefile

diff --cc Makefile
Simple merge