summary refs log tree commit diff stats
path: root/scripts/update-linux-headers.sh
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-07-15 14:23:58 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-07-15 14:23:58 +0100
commit711dc6f36b74fe65a6e5a1847f1152717d887f8a (patch)
tree364deb4b9f07eaf53b8c0bc716343b8385afd099 /scripts/update-linux-headers.sh
parentf5dec79ee88034b2da52463145a2056500db9ff2 (diff)
parent796a060bc0fab40953997976a2e30d9d6235bc7b (diff)
downloadfocaccia-qemu-711dc6f36b74fe65a6e5a1847f1152717d887f8a.tar.gz
focaccia-qemu-711dc6f36b74fe65a6e5a1847f1152717d887f8a.zip
Merge remote-tracking branch 'remotes/cody/tags/jtc-for-upstream-pull-request' into staging
# gpg: Signature made Wed Jul 15 03:25:16 2015 BST using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/jtc-for-upstream-pull-request:
  block/curl: Don't lose original error when a connection fails.
  mirror: correct buf_size
  block: keep bitmap if incremental backup job is cancelled
  blockdev: no need to drain in qmp_block_commit
  block/mirror: Sleep periodically during bitmap scanning

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/update-linux-headers.sh')
0 files changed, 0 insertions, 0 deletions