]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/qemu-xen.git/commitdiff
projects / people / liuw / libxenctrl-split / qemu-xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18f4988 7ea11bf)
Merge remote-tracking branch 'remotes/sstabellini/tags/xsa155' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 18 Dec 2015 15:32:32 +0000 (15:32 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 18 Dec 2015 15:32:32 +0000 (15:32 +0000)
XSA-155 fixes

# gpg: Signature made Fri 18 Dec 2015 15:16:18 GMT using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"

* remotes/sstabellini/tags/xsa155:
  xenfb: avoid reading twice the same fields from the shared page
  xen/blkif: Avoid double access to src->nr_segments

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.