• P
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · f67c9b69
    Peter Maydell 提交于
    acpi, vhost, misc: fixes, features
    
    vDPA support, fix to vhost blk RO bit handling, some include path
    cleanups, NFIT ACPI table.
    Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Fri 01 Jun 2018 17:25:19 BST
    # gpg:                using RSA key 281F0DB8D28D5469
    # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
    # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
    # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
    #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469
    
    * remotes/mst/tags/for_upstream: (31 commits)
      vhost-blk: turn on pre-defined RO feature bit
      ACPI testing: test NFIT platform capabilities
      nvdimm, acpi: support NFIT platform capabilities
      tests/.gitignore: add entry for generated file
      arch_init: sort architectures
      ui: use local path for local headers
      qga: use local path for local headers
      colo: use local path for local headers
      migration: use local path for local headers
      usb: use local path for local headers
      sd: fix up include
      vhost-scsi: drop an unused include
      ppc: use local path for local headers
      rocker: drop an unused include
      e1000e: use local path for local headers
      ioapic: fix up includes
      ide: use local path for local headers
      display: use local path for local headers
      trace: use local path for local headers
      migration: drop an unused include
      ...
    Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
    f67c9b69
pc.c 74.2 KB