Am 24.04.2018 um 10:52 hat Stefan Hajnoczi geschrieben: > Commit 8119334918e86f45877cfc139192d54f2449a239 ("block: Don't > block_job_pause_all() in bdrv_drain_all()") removed the only callers of > block_job_pause/resume_all(). > > Pausing and resuming now happens in child_job_drained_begin/end() so > it's no longer necessary to globally pause/resume jobs. > > Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
Yes, the same is part of my upcoming huge (non-)block job series. I think git should resolve the conflict fine, so feel free to apply this already while I finish my series. Kevin