[Xen-changelog] [qemu-xen master] Merge remote-tracking branch 'bonzini/tags/for-upstream' into staging

[patchbot@xxxxxxx]

commit c5b95f6be72da7f10597f8a5d42ba0ff41901f36
Merge: 5a557602268bd7bdba87f030feec9edb68ece699 
c96f0ee6a67ca6277366e78ce5d84d5c20dd596f
Author:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
AuthorDate: Tue Nov 29 10:05:07 2016 +0000
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Tue Nov 29 10:05:07 2016 +0000

    Merge remote-tracking branch 'bonzini/tags/for-upstream' into staging
    
    Small fixes for rc2.
    
    # gpg: Signature made Mon 28 Nov 2016 03:45:20 PM GMT
    # gpg:                using RSA key 0xBFFBD25F78C7AE83
    # gpg: Good signature from "Paolo Bonzini <bonzini@xxxxxxx>"
    # gpg:                 aka "Paolo Bonzini <pbonzini@xxxxxxxxxx>"
    # 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:
      rules.mak: Use -r instead of -Wl, -r to fix building when PIE is default
      migration/pcspk: Turn migration of pcspk off for 2.7 and older
      migration/pcspk: Add a property to state if pcspk is migrated
      pci-assign: sync MSI/MSI-X cap and table with PCIDevice
      megasas: clean up and fix request completion/cancellation
      megasas: do not call pci_dma_unmap after having freed the frame once
    
    Message-id: 1480372837-109736-1-git-send-email-pbonzini@xxxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>

 hw/audio/pcspk.c         | 10 +++++++++
 hw/i386/kvm/pci-assign.c |  4 ++++
 hw/scsi/megasas.c        | 58 ++++++++++++++++++++++++++----------------------
 include/hw/i386/pc.h     |  5 +++++
 rules.mak                |  2 +-
 5 files changed, 52 insertions(+), 27 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog