)]}'
{
  "commit": "7bc8e0c967a4ef77657174d28af775691e18b4ce",
  "tree": "eb44098ade96974f811b5861135cdd8a9746b587",
  "parents": [
    "331c5e2091009f170554fed4ef884aeea871e4bb",
    "3f1e1478db2d67098d98f2c3acf5a4946b7fb643"
  ],
  "author": {
    "name": "Peter Maydell",
    "email": "peter.maydell@linaro.org",
    "time": "Thu Oct 29 09:49:52 2015 +0000"
  },
  "committer": {
    "name": "Peter Maydell",
    "email": "peter.maydell@linaro.org",
    "time": "Thu Oct 29 09:49:52 2015 +0000"
  },
  "message": "Merge remote-tracking branch \u0027remotes/mst/tags/for_upstream\u0027 into staging\n\nvirtio, pc, memory: fixes+features for 2.5\n\nNew features:\n    This enables hotplug for multifunction devices.\n    Patches are very small, so I think it\u0027s OK to merge\n    at this stage.\n\n    There\u0027s also some new infrastructure for vhost-user testing\n    not enabled yet so it\u0027s harmless to merge.\n\nI\u0027ve reverted the \"gap between DIMMs\" workaround, as it seems too risky, and\napplied my own patch in virtio, but not in dataplane code.  This means that\ndataplane is broken for some complex DIMM configurations for now.  Waiting for\nStefan to review the dataplane fix.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\n\n# gpg: Signature made Thu 29 Oct 2015 09:36:16 GMT using RSA key ID D28D5469\n# gpg: Good signature from \"Michael S. Tsirkin \u003cmst@kernel.org\u003e\"\n# gpg:                 aka \"Michael S. Tsirkin \u003cmst@redhat.com\u003e\"\n\n* remotes/mst/tags/for_upstream:\n  enable multi-function hot-add\n  remove function during multi-function hot-add\n  tests/vhost-user-bridge: add vhost-user bridge application\n  Revert \"memhp: extend address auto assignment to support gaps\"\n  Revert \"pc: memhp: force gaps between DIMM\u0027s GPA\"\n  virtio: drop virtqueue_map_sg\n  virtio-scsi: convert to virtqueue_map\n  virtio-serial: convert to virtio_map\n  virtio-blk: convert to virtqueue_map\n  virtio: switch to virtio_map\n  virtio: introduce virtio_map\n  mmap-alloc: fix error handling\n  pc: memhp: do not emit inserting event for coldplugged DIMMs\n  vhost-user-test: fix up rhel6 build\n  vhost-user: cleanup msg size math\n  vhost-user: cleanup struct size math\n\nSigned-off-by: Peter Maydell \u003cpeter.maydell@linaro.org\u003e\n",
  "tree_diff": []
}