Message ID | 20230120122633.84983-1-kwolf@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, 20 Jan 2023 at 12:26, Kevin Wolf <kwolf@redhat.com> wrote: > > The following changes since commit 239b8b0699a222fd21da1c5fdeba0a2456085a47: > > Merge tag 'trivial-branch-for-8.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2023-01-19 15:05:29 +0000) > > are available in the Git repository at: > > https://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to 4711b0a8490827c332b3f9281f689ce9555b7fab: > > qemu-img: Change info key names for protocol nodes (2023-01-20 13:11:01 +0100) > > ---------------------------------------------------------------- > Block layer patches > > - qemu-img info: Show protocol-level information > - Move more functions to coroutines > - Make coroutine annotations ready for static analysis > - qemu-img: Fix exit code for errors closing the image > - qcow2 bitmaps: Fix theoretical corruption in error path > - pflash: Only load non-zero parts of backend image to save memory > - Code cleanup and test case improvements > Hi -- this has a conflict in coroutine.h. Could you rebase and resend, please? thanks -- PMM