From: Stefan Hajnoczi Date: Wed, 23 Nov 2016 11:44:29 +0000 (+0000) Subject: Merge remote-tracking branch 'bonzini/tags/for-upstream' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~9^2~14^2~5^2~33 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0c10c392fc23d4bfeca0afe0de80d5036ed92ed;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'bonzini/tags/for-upstream' into staging Small fixes for rc1. # gpg: Signature made Tue 22 Nov 2016 10:26:56 PM GMT # gpg: using RSA key 0xBFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini " # gpg: aka "Paolo Bonzini " # 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 * bonzini/tags/for-upstream: scsi/esp: do not raise an interrupt when reading the FIFO register nbd: Allow unmap and fua during write zeroes cpu_ldst.h: use correct guest address parameter Message-id: 1479853676-35995-1-git-send-email-pbonzini@redhat.com Signed-off-by: Stefan Hajnoczi --- f0c10c392fc23d4bfeca0afe0de80d5036ed92ed