On 31 October 2016 at 19:22, Jeff Cody <jc...@redhat.com> wrote: > The following changes since commit 6bc56d317f7b5004ea2d89d264bddc8b4d081700: > > Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-mttcg' into > staging (2016-10-31 15:29:12 +0000) > > are available in the git repository at: > > g...@github.com:codyprime/qemu-kvm-jtc.git tags/block-pull-request > > for you to fetch changes up to 4f5afc7abe382fc22bdf0ca67537d545e1044f2c: > > blockjobs: fix documentation (2016-10-31 15:22:08 -0400) > > ---------------------------------------------------------------- > Block patches for 2.8 > ----------------------------------------------------------------
Sorry, this doesn't apply cleanly to master, and my attempt to fix up the conflict didn't seem to work. Please can you rebase and resend? thanks -- PMM