• Peter Maydell's avatar
    Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · c503a855
    Peter Maydell authored
    * max-ram-below-4g improvement (Gerd)
    * escc fix (xiaoqiang)
    * ESP fix (Prasad)
    * scsi-disk tweaks/fix (me)
    * Makefile dependency fixes (me)
    * PKGVERSION improvement (Fam)
    * -vnc man improvement (Robert)
    
    # gpg: Signature made Tue 07 Jun 2016 18:06:22 BST
    # gpg:                using RSA key 0xBFFBD25F78C7AE83
    # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
    # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
    
    * remotes/bonzini/tags/for-upstream:
      vnc: list the 'to' parameter of '-vnc' in the qemu man page
      scsi-disk: add missing break
      Makefile: Derive "PKGVERSION" from "git describe" by default
      Makefile: add dependency on scripts/hxtool
      Makefile: add dependency on scripts/make_device_config.sh
      Makefile: add dependency on scripts/create_config
      Makefile: Add a "FORCE" target
      scsi: megasas: null terminate bios version buffer
      scsi: mark TYPE_SCSI_DISK_BASE as abstract
      scsi: esp: check TI buffer index before read/write
      hw/char: QOM'ify escc.c (fix)
      pc: allow raising low memory via max-ram-below-4g option
      tests: Rename tests/Makefile to tests/Makefile.include
    Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
    c503a855
rules.mak 12.9 KB