From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 5 Jun 2018 14:22:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
X-Git-Tag: qemu-xen-4.12.0-rc1~187
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1d889f2a8baaa265939b339d2f52ec57f5b8a09c;p=qemu-xen.git

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

# gpg: Signature made Tue 05 Jun 2018 15:17:18 BST
# gpg:                using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  sheepdog: remove huge BSS object
  sheepdog: cleanup repeated expression

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

1d889f2a8baaa265939b339d2f52ec57f5b8a09c